From 985e2b4cb293919ec92708506643acbb385d4bf0 Mon Sep 17 00:00:00 2001
From: Philippe Virouleau <philippe.virouleau@inria.fr>
Date: Tue, 16 Jan 2024 11:05:33 +0100
Subject: [PATCH] Fix spec with new names

---
 spec/input/data.json                          |  16 +-
 spec/input/data_bad_best_effort_property.json |  16 +-
 spec/input/data_graffiti.json                 |  96 ++--
 spec/input/data_graffiti2-missing-gpu.json    | 102 ++--
 spec/input/data_graffiti2.json                | 104 ++---
 .../data_misconfigured_server_with_disk.json  |  32 +-
 .../data_missing_main_network_property.json   |  16 +-
 spec/input/data_round_robin_cpusets.json      |  16 +-
 spec/input/data_wattmeters_nil.json           |  16 +-
 spec/input/data_wattmeters_variations.json    |  16 +-
 spec/input/data_with_disk.json                |  32 +-
 spec/input/data_with_non_reservable_gpus.json |  16 +-
 spec/input/data_without_gpu.json              |  32 +-
 spec/input/oar_but_chassis_unset.json         |  64 +--
 spec/input/oar_configured.json                |  64 +--
 .../input/oar_duplicated_cpus_cores_gpus.json |  64 +--
 spec/input/oar_grue-without-gpus.json         | 416 ++++++++---------
 spec/input/oar_misconfigured_gpu.json         |  64 +--
 .../oar_misconfigured_non_reservable_gpu.json |  64 +--
 spec/input/oar_missing_property.json          |  64 +--
 spec/input/oar_to_test_diff.json              |  64 +--
 spec/input/oar_with_disk.json                 |  64 +--
 ...igured_resources_properties_and_disks.json |  64 +--
 .../input/oar_with_too_few_oar_resources.json |  62 +--
 .../oar_with_too_many_oar_resources.json      |  66 +--
 spec/input/oar_wrong_vartype.json             |  64 +--
 .../bad_best_effort_property_print_stdout.txt |  68 +--
 .../bad_best_effort_property_table_stdout.txt |  64 +--
 spec/output/chassis_unset_print_stdout.txt    |  68 +--
 spec/output/chassis_unset_table_stdout.txt    |  64 +--
 ...igured_misconfigured_cores_diff_stdout.txt |   4 +-
 ...gured_misconfigured_cores_print_stdout.txt |  68 +--
 ...gured_misconfigured_cores_table_stdout.txt |  64 +--
 ...figured_misconfigured_gpu_print_stdout.txt |  68 +--
 ...figured_misconfigured_gpu_table_stdout.txt |  64 +--
 ...issing_network_interfaces_print_stdout.txt |  66 +--
 ...issing_network_interfaces_table_stdout.txt |  64 +--
 .../configured_with_disk_diff_stdout.txt      |   4 +-
 .../configured_with_disk_print_stdout.txt     |  68 +--
 .../configured_with_disk_table_stdout.txt     |  64 +--
 .../configured_without_gpu_diff_stdout.txt    |   4 +-
 .../configured_without_gpu_print_stdout.txt   |  68 +--
 .../configured_without_gpu_table_stdout.txt   |  64 +--
 ...ifferent_value_wattmeters_print_stdout.txt |  68 +--
 ...ifferent_value_wattmeters_table_stdout.txt |  64 +--
 spec/output/empty_diff_stdout.txt             |   4 +-
 spec/output/empty_print_stdout.txt            |  68 +--
 spec/output/empty_round_robin_diff_stdout.txt |   4 +-
 .../output/empty_round_robin_print_stdout.txt |  68 +--
 .../output/empty_round_robin_table_stdout.txt |  64 +--
 spec/output/empty_table_stdout.txt            |  64 +--
 spec/output/empty_with_disk_diff_stdout.txt   |   4 +-
 spec/output/empty_with_disk_print_stdout.txt  |  68 +--
 spec/output/empty_with_disk_table_stdout.txt  |  64 +--
 spec/output/empty_without_gpu_diff_stdout.txt |   4 +-
 .../output/empty_without_gpu_print_stdout.txt |  68 +--
 .../output/empty_without_gpu_table_stdout.txt |  64 +--
 spec/output/graffiti-all-gpus_diff_stdout.txt |   2 +-
 .../output/graffiti-all-gpus_print_stdout.txt | 442 +++++++++---------
 .../output/graffiti-all-gpus_table_stdout.txt | 416 ++++++++---------
 ...d-gpu-re-added-OAR-updated_diff_stdout.txt |   2 +-
 ...-gpu-re-added-OAR-updated_print_stdout.txt | 442 +++++++++---------
 ...-gpu-re-added-OAR-updated_table_stdout.txt | 416 ++++++++---------
 ...d-OAR-updated-gpu-re-added_diff_stdout.txt |   6 +-
 ...-OAR-updated-gpu-re-added_print_stdout.txt | 442 +++++++++---------
 ...-OAR-updated-gpu-re-added_table_stdout.txt | 416 ++++++++---------
 ...ti-gpu-removed-OAR-updated_diff_stdout.txt |   2 +-
 ...i-gpu-removed-OAR-updated_print_stdout.txt | 442 +++++++++---------
 ...i-gpu-removed-OAR-updated_table_stdout.txt | 416 ++++++++---------
 spec/output/graffiti_empty_diff_stdout.txt    |  24 +-
 spec/output/graffiti_empty_print_stdout.txt   | 408 ++++++++--------
 spec/output/graffiti_empty_table_stdout.txt   | 384 +++++++--------
 spec/output/missing_property_print_stdout.txt |  68 +--
 spec/output/missing_property_table_stdout.txt |  64 +--
 .../non_reservable_gpus_print_stdout.txt      |   4 +-
 spec/output/wattmeters_nil_print_stdout.txt   |  68 +--
 spec/output/wattmeters_nil_table_stdout.txt   |  64 +--
 spec/output/with-data_print_stdout.txt        |  68 +--
 spec/output/with-data_table_stdout.txt        |  64 +--
 ...urces_properties_and_disks_diff_stdout.txt |   4 +-
 ...rces_properties_and_disks_print_stdout.txt |  68 +--
 ...rces_properties_and_disks_table_stdout.txt |  64 +--
 ...ith_too_few_oar_resources_print_stdout.txt |  68 +--
 ...ith_too_few_oar_resources_table_stdout.txt |  64 +--
 .../wrong_variable_type_print_stdout.txt      |  68 +--
 .../wrong_variable_type_table_stdout.txt      |  64 +--
 .../load_data_hierarchy_stubbed_data.json     |  16 +-
 87 files changed, 4190 insertions(+), 4190 deletions(-)

diff --git a/spec/input/data.json b/spec/input/data.json
index 1f67404c1c4..8e7fbd97bc0 100644
--- a/spec/input/data.json
+++ b/spec/input/data.json
@@ -34,7 +34,7 @@
                   "cpu_affinity": 0,
                   "device": "/dev/nvidia0",
                   "memory": 10989000000,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.17.00.B2",
                   "vendor": "Nvidia"
@@ -43,7 +43,7 @@
                   "cpu_affinity": 0,
                   "device": "/dev/nvidia1",
                   "memory": 10989000000,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.17.00.B2",
                   "vendor": "Nvidia"
@@ -52,7 +52,7 @@
                   "cpu_affinity": 1,
                   "device": "/dev/nvidia2",
                   "memory": 10989000000,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.0B.40.09",
                   "vendor": "Nvidia"
@@ -61,7 +61,7 @@
                   "cpu_affinity": 1,
                   "device": "/dev/nvidia3",
                   "memory": 10989000000,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.17.00.B2",
                   "vendor": "Nvidia"
@@ -241,7 +241,7 @@
                   "cpu_affinity": 0,
                   "device": "/dev/nvidia0",
                   "memory": 10989000000,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.17.00.B2",
                   "vendor": "Nvidia"
@@ -250,7 +250,7 @@
                   "cpu_affinity": 0,
                   "device": "/dev/nvidia1",
                   "memory": 10989000000,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.0B.40.09",
                   "vendor": "Nvidia"
@@ -259,7 +259,7 @@
                   "cpu_affinity": 1,
                   "device": "/dev/nvidia2",
                   "memory": 10989000000,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.0B.40.09",
                   "vendor": "Nvidia"
@@ -268,7 +268,7 @@
                   "cpu_affinity": 1,
                   "device": "/dev/nvidia3",
                   "memory": 10989000000,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.17.00.AC",
                   "vendor": "Nvidia"
diff --git a/spec/input/data_bad_best_effort_property.json b/spec/input/data_bad_best_effort_property.json
index 6d0dceb36b3..742a47cffbe 100644
--- a/spec/input/data_bad_best_effort_property.json
+++ b/spec/input/data_bad_best_effort_property.json
@@ -34,7 +34,7 @@
                   "cpu_affinity": 0,
                   "device": "/dev/nvidia0",
                   "memory": 10989000000,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.17.00.B2",
                   "vendor": "Nvidia"
@@ -43,7 +43,7 @@
                   "cpu_affinity": 0,
                   "device": "/dev/nvidia1",
                   "memory": 10989000000,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.17.00.B2",
                   "vendor": "Nvidia"
@@ -52,7 +52,7 @@
                   "cpu_affinity": 1,
                   "device": "/dev/nvidia2",
                   "memory": 10989000000,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.0B.40.09",
                   "vendor": "Nvidia"
@@ -61,7 +61,7 @@
                   "cpu_affinity": 1,
                   "device": "/dev/nvidia3",
                   "memory": 10989000000,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.17.00.B2",
                   "vendor": "Nvidia"
@@ -241,7 +241,7 @@
                   "cpu_affinity": 0,
                   "device": "/dev/nvidia0",
                   "memory": 10989000000,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.17.00.B2",
                   "vendor": "Nvidia"
@@ -250,7 +250,7 @@
                   "cpu_affinity": 0,
                   "device": "/dev/nvidia1",
                   "memory": 10989000000,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.0B.40.09",
                   "vendor": "Nvidia"
@@ -259,7 +259,7 @@
                   "cpu_affinity": 1,
                   "device": "/dev/nvidia2",
                   "memory": 10989000000,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.0B.40.09",
                   "vendor": "Nvidia"
@@ -268,7 +268,7 @@
                   "cpu_affinity": 1,
                   "device": "/dev/nvidia3",
                   "memory": 10989000000,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.17.00.AC",
                   "vendor": "Nvidia"
diff --git a/spec/input/data_graffiti.json b/spec/input/data_graffiti.json
index 63b919f6f3c..ab09658c099 100644
--- a/spec/input/data_graffiti.json
+++ b/spec/input/data_graffiti.json
@@ -293,7 +293,7 @@
                   "cpu_affinity": 0,
                   "device": "/dev/nvidia0",
                   "memory": 11554258944,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.17.00.B2",
                   "vendor": "Nvidia"
@@ -302,7 +302,7 @@
                   "cpu_affinity": 0,
                   "device": "/dev/nvidia1",
                   "memory": 11554258944,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.17.00.B2",
                   "vendor": "Nvidia"
@@ -311,7 +311,7 @@
                   "cpu_affinity": 1,
                   "device": "/dev/nvidia2",
                   "memory": 11554258944,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.17.00.B2",
                   "vendor": "Nvidia"
@@ -320,7 +320,7 @@
                   "cpu_affinity": 1,
                   "device": "/dev/nvidia3",
                   "memory": 11554258944,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.17.00.B2",
                   "vendor": "Nvidia"
@@ -557,7 +557,7 @@
                   "cpu_affinity": 0,
                   "device": "/dev/nvidia0",
                   "memory": 11554258944,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.17.00.B2",
                   "vendor": "Nvidia"
@@ -566,7 +566,7 @@
                   "cpu_affinity": 0,
                   "device": "/dev/nvidia1",
                   "memory": 11554258944,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.17.00.B2",
                   "vendor": "Nvidia"
@@ -575,7 +575,7 @@
                   "cpu_affinity": 1,
                   "device": "/dev/nvidia2",
                   "memory": 11554258944,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.17.00.B2",
                   "vendor": "Nvidia"
@@ -584,7 +584,7 @@
                   "cpu_affinity": 1,
                   "device": "/dev/nvidia3",
                   "memory": 11554258944,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.17.00.B2",
                   "vendor": "Nvidia"
@@ -821,7 +821,7 @@
                   "cpu_affinity": 0,
                   "device": "/dev/nvidia0",
                   "memory": 11554258944,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.17.00.B2",
                   "vendor": "Nvidia"
@@ -830,7 +830,7 @@
                   "cpu_affinity": 0,
                   "device": "/dev/nvidia1",
                   "memory": 11554258944,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.17.00.B2",
                   "vendor": "Nvidia"
@@ -839,7 +839,7 @@
                   "cpu_affinity": 1,
                   "device": "/dev/nvidia2",
                   "memory": 11554258944,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.17.00.B2",
                   "vendor": "Nvidia"
@@ -848,7 +848,7 @@
                   "cpu_affinity": 1,
                   "device": "/dev/nvidia3",
                   "memory": 11554258944,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.17.00.B2",
                   "vendor": "Nvidia"
@@ -1085,7 +1085,7 @@
                   "cpu_affinity": 0,
                   "device": "/dev/nvidia0",
                   "memory": 11554258944,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.17.00.B2",
                   "vendor": "Nvidia"
@@ -1094,7 +1094,7 @@
                   "cpu_affinity": 0,
                   "device": "/dev/nvidia1",
                   "memory": 11554258944,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.17.00.B2",
                   "vendor": "Nvidia"
@@ -1103,7 +1103,7 @@
                   "cpu_affinity": 1,
                   "device": "/dev/nvidia2",
                   "memory": 11554258944,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.17.00.B2",
                   "vendor": "Nvidia"
@@ -1112,7 +1112,7 @@
                   "cpu_affinity": 1,
                   "device": "/dev/nvidia3",
                   "memory": 11554258944,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.17.00.B2",
                   "vendor": "Nvidia"
@@ -1349,7 +1349,7 @@
                   "cpu_affinity": 0,
                   "device": "/dev/nvidia0",
                   "memory": 11554258944,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.17.00.B2",
                   "vendor": "Nvidia"
@@ -1358,7 +1358,7 @@
                   "cpu_affinity": 0,
                   "device": "/dev/nvidia1",
                   "memory": 11554258944,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.0B.40.09",
                   "vendor": "Nvidia"
@@ -1367,7 +1367,7 @@
                   "cpu_affinity": 1,
                   "device": "/dev/nvidia2",
                   "memory": 11554258944,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.17.00.B2",
                   "vendor": "Nvidia"
@@ -1376,7 +1376,7 @@
                   "cpu_affinity": 1,
                   "device": "/dev/nvidia3",
                   "memory": 11554258944,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.17.00.B2",
                   "vendor": "Nvidia"
@@ -1613,7 +1613,7 @@
                   "cpu_affinity": 0,
                   "device": "/dev/nvidia0",
                   "memory": 11554258944,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.17.00.B2",
                   "vendor": "Nvidia"
@@ -1622,7 +1622,7 @@
                   "cpu_affinity": 0,
                   "device": "/dev/nvidia1",
                   "memory": 11554258944,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.17.00.B2",
                   "vendor": "Nvidia"
@@ -1631,7 +1631,7 @@
                   "cpu_affinity": 1,
                   "device": "/dev/nvidia2",
                   "memory": 11554258944,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.17.00.AC",
                   "vendor": "Nvidia"
@@ -1640,7 +1640,7 @@
                   "cpu_affinity": 1,
                   "device": "/dev/nvidia3",
                   "memory": 11554258944,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.0B.40.09",
                   "vendor": "Nvidia"
@@ -1877,7 +1877,7 @@
                   "cpu_affinity": 0,
                   "device": "/dev/nvidia0",
                   "memory": 11554258944,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.17.00.B2",
                   "vendor": "Nvidia"
@@ -1886,7 +1886,7 @@
                   "cpu_affinity": 0,
                   "device": "/dev/nvidia1",
                   "memory": 11554258944,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.17.00.B2",
                   "vendor": "Nvidia"
@@ -1895,7 +1895,7 @@
                   "cpu_affinity": 1,
                   "device": "/dev/nvidia2",
                   "memory": 11554258944,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.17.00.B2",
                   "vendor": "Nvidia"
@@ -1904,7 +1904,7 @@
                   "cpu_affinity": 1,
                   "device": "/dev/nvidia3",
                   "memory": 11554258944,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.17.00.B2",
                   "vendor": "Nvidia"
@@ -2141,7 +2141,7 @@
                   "cpu_affinity": 0,
                   "device": "/dev/nvidia0",
                   "memory": 11554258944,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.17.00.B2",
                   "vendor": "Nvidia"
@@ -2150,7 +2150,7 @@
                   "cpu_affinity": 0,
                   "device": "/dev/nvidia1",
                   "memory": 11554258944,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.17.00.B2",
                   "vendor": "Nvidia"
@@ -2159,7 +2159,7 @@
                   "cpu_affinity": 1,
                   "device": "/dev/nvidia2",
                   "memory": 11554258944,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.17.00.B2",
                   "vendor": "Nvidia"
@@ -2168,7 +2168,7 @@
                   "cpu_affinity": 1,
                   "device": "/dev/nvidia3",
                   "memory": 11554258944,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.17.00.B2",
                   "vendor": "Nvidia"
@@ -2405,7 +2405,7 @@
                   "cpu_affinity": 0,
                   "device": "/dev/nvidia0",
                   "memory": 11554258944,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.17.00.B2",
                   "vendor": "Nvidia"
@@ -2414,7 +2414,7 @@
                   "cpu_affinity": 0,
                   "device": "/dev/nvidia1",
                   "memory": 11554258944,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.17.00.B2",
                   "vendor": "Nvidia"
@@ -2423,7 +2423,7 @@
                   "cpu_affinity": 1,
                   "device": "/dev/nvidia2",
                   "memory": 11554258944,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.17.00.B2",
                   "vendor": "Nvidia"
@@ -2432,7 +2432,7 @@
                   "cpu_affinity": 1,
                   "device": "/dev/nvidia3",
                   "memory": 11554258944,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.17.00.B2",
                   "vendor": "Nvidia"
@@ -2669,7 +2669,7 @@
                   "cpu_affinity": 0,
                   "device": "/dev/nvidia0",
                   "memory": 11554258944,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.17.00.B2",
                   "vendor": "Nvidia"
@@ -2678,7 +2678,7 @@
                   "cpu_affinity": 0,
                   "device": "/dev/nvidia1",
                   "memory": 11554258944,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.17.00.B2",
                   "vendor": "Nvidia"
@@ -2687,7 +2687,7 @@
                   "cpu_affinity": 1,
                   "device": "/dev/nvidia2",
                   "memory": 11554258944,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.0B.40.09",
                   "vendor": "Nvidia"
@@ -2696,7 +2696,7 @@
                   "cpu_affinity": 1,
                   "device": "/dev/nvidia3",
                   "memory": 11554258944,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.17.00.B2",
                   "vendor": "Nvidia"
@@ -2933,7 +2933,7 @@
                   "cpu_affinity": 0,
                   "device": "/dev/nvidia0",
                   "memory": 11554258944,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.17.00.B2",
                   "vendor": "Nvidia"
@@ -2942,7 +2942,7 @@
                   "cpu_affinity": 0,
                   "device": "/dev/nvidia1",
                   "memory": 11554258944,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.17.00.B2",
                   "vendor": "Nvidia"
@@ -2951,7 +2951,7 @@
                   "cpu_affinity": 1,
                   "device": "/dev/nvidia2",
                   "memory": 11554258944,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.17.00.B2",
                   "vendor": "Nvidia"
@@ -2960,7 +2960,7 @@
                   "cpu_affinity": 1,
                   "device": "/dev/nvidia3",
                   "memory": 11554258944,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.17.00.B2",
                   "vendor": "Nvidia"
@@ -3197,7 +3197,7 @@
                   "cpu_affinity": 0,
                   "device": "/dev/nvidia0",
                   "memory": 11554258944,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.17.00.B2",
                   "vendor": "Nvidia"
@@ -3206,7 +3206,7 @@
                   "cpu_affinity": 0,
                   "device": "/dev/nvidia1",
                   "memory": 11554258944,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.17.00.B2",
                   "vendor": "Nvidia"
@@ -3215,7 +3215,7 @@
                   "cpu_affinity": 1,
                   "device": "/dev/nvidia2",
                   "memory": 11554258944,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.17.00.B2",
                   "vendor": "Nvidia"
@@ -3224,7 +3224,7 @@
                   "cpu_affinity": 1,
                   "device": "/dev/nvidia3",
                   "memory": 11554258944,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.17.00.B2",
                   "vendor": "Nvidia"
diff --git a/spec/input/data_graffiti2-missing-gpu.json b/spec/input/data_graffiti2-missing-gpu.json
index 099ac1b07df..a3dfe72b875 100644
--- a/spec/input/data_graffiti2-missing-gpu.json
+++ b/spec/input/data_graffiti2-missing-gpu.json
@@ -29,7 +29,7 @@
                   "cpu_affinity": 0,
                   "device": "/dev/nvidia0",
                   "memory": 10989000000,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.17.00.B2",
                   "vendor": "Nvidia"
@@ -38,7 +38,7 @@
                   "cpu_affinity": 0,
                   "device": "/dev/nvidia1",
                   "memory": 10989000000,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.17.00.B2",
                   "vendor": "Nvidia"
@@ -47,7 +47,7 @@
                   "cpu_affinity": 1,
                   "device": "/dev/nvidia2",
                   "memory": 10989000000,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.17.00.B2",
                   "vendor": "Nvidia"
@@ -56,7 +56,7 @@
                   "cpu_affinity": 1,
                   "device": "/dev/nvidia3",
                   "memory": 10989000000,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.17.00.B2",
                   "vendor": "Nvidia"
@@ -298,7 +298,7 @@
                   "cpu_affinity": 0,
                   "device": "/dev/nvidia0",
                   "memory": 10989000000,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.17.00.B2",
                   "vendor": "Nvidia"
@@ -307,7 +307,7 @@
                   "cpu_affinity": 0,
                   "device": "/dev/nvidia1",
                   "memory": 10989000000,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.17.00.B2",
                   "vendor": "Nvidia"
@@ -316,7 +316,7 @@
                   "cpu_affinity": 1,
                   "device": "/dev/nvidia2",
                   "memory": 10989000000,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.0B.40.09",
                   "vendor": "Nvidia"
@@ -325,7 +325,7 @@
                   "cpu_affinity": 1,
                   "device": "/dev/nvidia3",
                   "memory": 10989000000,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.17.00.B2",
                   "vendor": "Nvidia"
@@ -567,7 +567,7 @@
                   "cpu_affinity": 0,
                   "device": "/dev/nvidia0",
                   "memory": 10989000000,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.17.00.B2",
                   "vendor": "Nvidia"
@@ -576,7 +576,7 @@
                   "cpu_affinity": 0,
                   "device": "/dev/nvidia1",
                   "memory": 10989000000,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.0B.40.09",
                   "vendor": "Nvidia"
@@ -585,7 +585,7 @@
                   "cpu_affinity": 1,
                   "device": "/dev/nvidia2",
                   "memory": 10989000000,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.17.00.B2",
                   "vendor": "Nvidia"
@@ -827,7 +827,7 @@
                   "cpu_affinity": 0,
                   "device": "/dev/nvidia0",
                   "memory": 10989000000,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.17.00.B2",
                   "vendor": "Nvidia"
@@ -836,7 +836,7 @@
                   "cpu_affinity": 0,
                   "device": "/dev/nvidia1",
                   "memory": 10989000000,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.17.00.B2",
                   "vendor": "Nvidia"
@@ -845,7 +845,7 @@
                   "cpu_affinity": 1,
                   "device": "/dev/nvidia2",
                   "memory": 10989000000,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.17.00.B2",
                   "vendor": "Nvidia"
@@ -854,7 +854,7 @@
                   "cpu_affinity": 1,
                   "device": "/dev/nvidia3",
                   "memory": 10989000000,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.17.00.B2",
                   "vendor": "Nvidia"
@@ -1096,7 +1096,7 @@
                   "cpu_affinity": 0,
                   "device": "/dev/nvidia0",
                   "memory": 10989000000,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.17.00.B2",
                   "vendor": "Nvidia"
@@ -1105,7 +1105,7 @@
                   "cpu_affinity": 0,
                   "device": "/dev/nvidia1",
                   "memory": 10989000000,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.17.00.B2",
                   "vendor": "Nvidia"
@@ -1114,7 +1114,7 @@
                   "cpu_affinity": 1,
                   "device": "/dev/nvidia2",
                   "memory": 10989000000,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.17.00.B2",
                   "vendor": "Nvidia"
@@ -1123,7 +1123,7 @@
                   "cpu_affinity": 1,
                   "device": "/dev/nvidia3",
                   "memory": 10989000000,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.17.00.B2",
                   "vendor": "Nvidia"
@@ -1365,7 +1365,7 @@
                   "cpu_affinity": 0,
                   "device": "/dev/nvidia0",
                   "memory": 10989000000,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.17.00.B2",
                   "vendor": "Nvidia"
@@ -1374,7 +1374,7 @@
                   "cpu_affinity": 0,
                   "device": "/dev/nvidia1",
                   "memory": 10989000000,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.17.00.B2",
                   "vendor": "Nvidia"
@@ -1383,7 +1383,7 @@
                   "cpu_affinity": 1,
                   "device": "/dev/nvidia2",
                   "memory": 10989000000,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.17.00.B2",
                   "vendor": "Nvidia"
@@ -1392,7 +1392,7 @@
                   "cpu_affinity": 1,
                   "device": "/dev/nvidia3",
                   "memory": 10989000000,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.17.00.B2",
                   "vendor": "Nvidia"
@@ -1634,7 +1634,7 @@
                   "cpu_affinity": 0,
                   "device": "/dev/nvidia0",
                   "memory": 10989000000,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.17.00.B2",
                   "vendor": "Nvidia"
@@ -1643,7 +1643,7 @@
                   "cpu_affinity": 0,
                   "device": "/dev/nvidia1",
                   "memory": 10989000000,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.17.00.B2",
                   "vendor": "Nvidia"
@@ -1652,7 +1652,7 @@
                   "cpu_affinity": 1,
                   "device": "/dev/nvidia2",
                   "memory": 10989000000,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.17.00.B2",
                   "vendor": "Nvidia"
@@ -1661,7 +1661,7 @@
                   "cpu_affinity": 1,
                   "device": "/dev/nvidia3",
                   "memory": 10989000000,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.17.00.B2",
                   "vendor": "Nvidia"
@@ -1903,7 +1903,7 @@
                   "cpu_affinity": 0,
                   "device": "/dev/nvidia0",
                   "memory": 10989000000,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.17.00.B2",
                   "vendor": "Nvidia"
@@ -1912,7 +1912,7 @@
                   "cpu_affinity": 0,
                   "device": "/dev/nvidia1",
                   "memory": 10989000000,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.17.00.B2",
                   "vendor": "Nvidia"
@@ -1921,7 +1921,7 @@
                   "cpu_affinity": 1,
                   "device": "/dev/nvidia2",
                   "memory": 10989000000,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.17.00.B2",
                   "vendor": "Nvidia"
@@ -1930,7 +1930,7 @@
                   "cpu_affinity": 1,
                   "device": "/dev/nvidia3",
                   "memory": 10989000000,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.17.00.B2",
                   "vendor": "Nvidia"
@@ -2172,7 +2172,7 @@
                   "cpu_affinity": 0,
                   "device": "/dev/nvidia0",
                   "memory": 10989000000,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.17.00.B2",
                   "vendor": "Nvidia"
@@ -2181,7 +2181,7 @@
                   "cpu_affinity": 0,
                   "device": "/dev/nvidia1",
                   "memory": 10989000000,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.17.00.B2",
                   "vendor": "Nvidia"
@@ -2190,7 +2190,7 @@
                   "cpu_affinity": 1,
                   "device": "/dev/nvidia2",
                   "memory": 10989000000,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.17.00.AC",
                   "vendor": "Nvidia"
@@ -2199,7 +2199,7 @@
                   "cpu_affinity": 1,
                   "device": "/dev/nvidia3",
                   "memory": 10989000000,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.0B.40.09",
                   "vendor": "Nvidia"
@@ -2441,7 +2441,7 @@
                   "cpu_affinity": 0,
                   "device": "/dev/nvidia0",
                   "memory": 10989000000,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.17.00.B2",
                   "vendor": "Nvidia"
@@ -2450,7 +2450,7 @@
                   "cpu_affinity": 0,
                   "device": "/dev/nvidia1",
                   "memory": 10989000000,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.17.00.B2",
                   "vendor": "Nvidia"
@@ -2459,7 +2459,7 @@
                   "cpu_affinity": 1,
                   "device": "/dev/nvidia2",
                   "memory": 10989000000,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.17.00.B2",
                   "vendor": "Nvidia"
@@ -2468,7 +2468,7 @@
                   "cpu_affinity": 1,
                   "device": "/dev/nvidia3",
                   "memory": 10989000000,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.17.00.B2",
                   "vendor": "Nvidia"
@@ -2710,7 +2710,7 @@
                   "cpu_affinity": 0,
                   "device": "/dev/nvidia0",
                   "memory": 10989000000,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.17.00.B2",
                   "vendor": "Nvidia"
@@ -2719,7 +2719,7 @@
                   "cpu_affinity": 0,
                   "device": "/dev/nvidia1",
                   "memory": 10989000000,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.17.00.B2",
                   "vendor": "Nvidia"
@@ -2728,7 +2728,7 @@
                   "cpu_affinity": 1,
                   "device": "/dev/nvidia2",
                   "memory": 10989000000,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.17.00.B2",
                   "vendor": "Nvidia"
@@ -2737,7 +2737,7 @@
                   "cpu_affinity": 1,
                   "device": "/dev/nvidia3",
                   "memory": 10989000000,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.17.00.B2",
                   "vendor": "Nvidia"
@@ -2979,7 +2979,7 @@
                   "cpu_affinity": 0,
                   "device": "/dev/nvidia0",
                   "memory": 10989000000,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.17.00.B2",
                   "vendor": "Nvidia"
@@ -2988,7 +2988,7 @@
                   "cpu_affinity": 0,
                   "device": "/dev/nvidia1",
                   "memory": 10989000000,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.17.00.B2",
                   "vendor": "Nvidia"
@@ -2997,7 +2997,7 @@
                   "cpu_affinity": 1,
                   "device": "/dev/nvidia2",
                   "memory": 10989000000,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.17.00.B2",
                   "vendor": "Nvidia"
@@ -3006,7 +3006,7 @@
                   "cpu_affinity": 1,
                   "device": "/dev/nvidia3",
                   "memory": 10989000000,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.17.00.B2",
                   "vendor": "Nvidia"
@@ -3248,7 +3248,7 @@
                   "cpu_affinity": 0,
                   "device": "/dev/nvidia0",
                   "memory": 10989000000,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.17.00.B2",
                   "vendor": "Nvidia"
@@ -3257,7 +3257,7 @@
                   "cpu_affinity": 0,
                   "device": "/dev/nvidia1",
                   "memory": 10989000000,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.17.00.B2",
                   "vendor": "Nvidia"
@@ -3266,7 +3266,7 @@
                   "cpu_affinity": 1,
                   "device": "/dev/nvidia2",
                   "memory": 10989000000,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.17.00.B2",
                   "vendor": "Nvidia"
@@ -3275,7 +3275,7 @@
                   "cpu_affinity": 1,
                   "device": "/dev/nvidia3",
                   "memory": 10989000000,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.17.00.B2",
                   "vendor": "Nvidia"
diff --git a/spec/input/data_graffiti2.json b/spec/input/data_graffiti2.json
index ed9168716d3..933cd5b4414 100644
--- a/spec/input/data_graffiti2.json
+++ b/spec/input/data_graffiti2.json
@@ -29,7 +29,7 @@
                   "cpu_affinity": 0,
                   "device": "/dev/nvidia0",
                   "memory": 10989000000,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.17.00.B2",
                   "vendor": "Nvidia"
@@ -38,7 +38,7 @@
                   "cpu_affinity": 0,
                   "device": "/dev/nvidia1",
                   "memory": 10989000000,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.17.00.B2",
                   "vendor": "Nvidia"
@@ -47,7 +47,7 @@
                   "cpu_affinity": 1,
                   "device": "/dev/nvidia2",
                   "memory": 10989000000,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.17.00.B2",
                   "vendor": "Nvidia"
@@ -56,7 +56,7 @@
                   "cpu_affinity": 1,
                   "device": "/dev/nvidia3",
                   "memory": 10989000000,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.17.00.B2",
                   "vendor": "Nvidia"
@@ -298,7 +298,7 @@
                   "cpu_affinity": 0,
                   "device": "/dev/nvidia0",
                   "memory": 10989000000,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.17.00.B2",
                   "vendor": "Nvidia"
@@ -307,7 +307,7 @@
                   "cpu_affinity": 0,
                   "device": "/dev/nvidia1",
                   "memory": 10989000000,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.17.00.B2",
                   "vendor": "Nvidia"
@@ -316,7 +316,7 @@
                   "cpu_affinity": 1,
                   "device": "/dev/nvidia2",
                   "memory": 10989000000,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.0B.40.09",
                   "vendor": "Nvidia"
@@ -325,7 +325,7 @@
                   "cpu_affinity": 1,
                   "device": "/dev/nvidia3",
                   "memory": 10989000000,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.17.00.B2",
                   "vendor": "Nvidia"
@@ -567,7 +567,7 @@
                   "cpu_affinity": 0,
                   "device": "/dev/nvidia0",
                   "memory": 10989000000,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.17.00.B2",
                   "vendor": "Nvidia"
@@ -576,7 +576,7 @@
                   "cpu_affinity": 0,
                   "device": "/dev/nvidia1",
                   "memory": 10989000000,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.0B.40.09",
                   "vendor": "Nvidia"
@@ -585,7 +585,7 @@
                   "cpu_affinity": 1,
                   "device": "/dev/nvidia2",
                   "memory": 10989000000,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.17.00.B2",
                   "vendor": "Nvidia"
@@ -594,7 +594,7 @@
                   "cpu_affinity": 1,
                   "device": "/dev/nvidia3",
                   "memory": 10989000000,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.17.00.B2",
                   "vendor": "Nvidia"
@@ -836,7 +836,7 @@
                   "cpu_affinity": 0,
                   "device": "/dev/nvidia0",
                   "memory": 10989000000,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.17.00.B2",
                   "vendor": "Nvidia"
@@ -845,7 +845,7 @@
                   "cpu_affinity": 0,
                   "device": "/dev/nvidia1",
                   "memory": 10989000000,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.17.00.B2",
                   "vendor": "Nvidia"
@@ -854,7 +854,7 @@
                   "cpu_affinity": 1,
                   "device": "/dev/nvidia2",
                   "memory": 10989000000,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.17.00.B2",
                   "vendor": "Nvidia"
@@ -863,7 +863,7 @@
                   "cpu_affinity": 1,
                   "device": "/dev/nvidia3",
                   "memory": 10989000000,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.17.00.B2",
                   "vendor": "Nvidia"
@@ -1105,7 +1105,7 @@
                   "cpu_affinity": 0,
                   "device": "/dev/nvidia0",
                   "memory": 10989000000,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.17.00.B2",
                   "vendor": "Nvidia"
@@ -1114,7 +1114,7 @@
                   "cpu_affinity": 0,
                   "device": "/dev/nvidia1",
                   "memory": 10989000000,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.17.00.B2",
                   "vendor": "Nvidia"
@@ -1123,7 +1123,7 @@
                   "cpu_affinity": 1,
                   "device": "/dev/nvidia2",
                   "memory": 10989000000,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.17.00.B2",
                   "vendor": "Nvidia"
@@ -1132,7 +1132,7 @@
                   "cpu_affinity": 1,
                   "device": "/dev/nvidia3",
                   "memory": 10989000000,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.17.00.B2",
                   "vendor": "Nvidia"
@@ -1374,7 +1374,7 @@
                   "cpu_affinity": 0,
                   "device": "/dev/nvidia0",
                   "memory": 10989000000,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.17.00.B2",
                   "vendor": "Nvidia"
@@ -1383,7 +1383,7 @@
                   "cpu_affinity": 0,
                   "device": "/dev/nvidia1",
                   "memory": 10989000000,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.17.00.B2",
                   "vendor": "Nvidia"
@@ -1392,7 +1392,7 @@
                   "cpu_affinity": 1,
                   "device": "/dev/nvidia2",
                   "memory": 10989000000,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.17.00.B2",
                   "vendor": "Nvidia"
@@ -1401,7 +1401,7 @@
                   "cpu_affinity": 1,
                   "device": "/dev/nvidia3",
                   "memory": 10989000000,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.17.00.B2",
                   "vendor": "Nvidia"
@@ -1643,7 +1643,7 @@
                   "cpu_affinity": 0,
                   "device": "/dev/nvidia0",
                   "memory": 10989000000,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.17.00.B2",
                   "vendor": "Nvidia"
@@ -1652,7 +1652,7 @@
                   "cpu_affinity": 0,
                   "device": "/dev/nvidia1",
                   "memory": 10989000000,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.17.00.B2",
                   "vendor": "Nvidia"
@@ -1661,7 +1661,7 @@
                   "cpu_affinity": 1,
                   "device": "/dev/nvidia2",
                   "memory": 10989000000,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.17.00.B2",
                   "vendor": "Nvidia"
@@ -1670,7 +1670,7 @@
                   "cpu_affinity": 1,
                   "device": "/dev/nvidia3",
                   "memory": 10989000000,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.17.00.B2",
                   "vendor": "Nvidia"
@@ -1912,7 +1912,7 @@
                   "cpu_affinity": 0,
                   "device": "/dev/nvidia0",
                   "memory": 10989000000,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.17.00.B2",
                   "vendor": "Nvidia"
@@ -1921,7 +1921,7 @@
                   "cpu_affinity": 0,
                   "device": "/dev/nvidia1",
                   "memory": 10989000000,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.17.00.B2",
                   "vendor": "Nvidia"
@@ -1930,7 +1930,7 @@
                   "cpu_affinity": 1,
                   "device": "/dev/nvidia2",
                   "memory": 10989000000,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.17.00.B2",
                   "vendor": "Nvidia"
@@ -1939,7 +1939,7 @@
                   "cpu_affinity": 1,
                   "device": "/dev/nvidia3",
                   "memory": 10989000000,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.17.00.B2",
                   "vendor": "Nvidia"
@@ -2181,7 +2181,7 @@
                   "cpu_affinity": 0,
                   "device": "/dev/nvidia0",
                   "memory": 10989000000,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.17.00.B2",
                   "vendor": "Nvidia"
@@ -2190,7 +2190,7 @@
                   "cpu_affinity": 0,
                   "device": "/dev/nvidia1",
                   "memory": 10989000000,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.17.00.B2",
                   "vendor": "Nvidia"
@@ -2199,7 +2199,7 @@
                   "cpu_affinity": 1,
                   "device": "/dev/nvidia2",
                   "memory": 10989000000,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.17.00.AC",
                   "vendor": "Nvidia"
@@ -2208,7 +2208,7 @@
                   "cpu_affinity": 1,
                   "device": "/dev/nvidia3",
                   "memory": 10989000000,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.0B.40.09",
                   "vendor": "Nvidia"
@@ -2450,7 +2450,7 @@
                   "cpu_affinity": 0,
                   "device": "/dev/nvidia0",
                   "memory": 10989000000,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.17.00.B2",
                   "vendor": "Nvidia"
@@ -2459,7 +2459,7 @@
                   "cpu_affinity": 0,
                   "device": "/dev/nvidia1",
                   "memory": 10989000000,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.17.00.B2",
                   "vendor": "Nvidia"
@@ -2468,7 +2468,7 @@
                   "cpu_affinity": 1,
                   "device": "/dev/nvidia2",
                   "memory": 10989000000,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.17.00.B2",
                   "vendor": "Nvidia"
@@ -2477,7 +2477,7 @@
                   "cpu_affinity": 1,
                   "device": "/dev/nvidia3",
                   "memory": 10989000000,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.17.00.B2",
                   "vendor": "Nvidia"
@@ -2719,7 +2719,7 @@
                   "cpu_affinity": 0,
                   "device": "/dev/nvidia0",
                   "memory": 10989000000,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.17.00.B2",
                   "vendor": "Nvidia"
@@ -2728,7 +2728,7 @@
                   "cpu_affinity": 0,
                   "device": "/dev/nvidia1",
                   "memory": 10989000000,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.17.00.B2",
                   "vendor": "Nvidia"
@@ -2737,7 +2737,7 @@
                   "cpu_affinity": 1,
                   "device": "/dev/nvidia2",
                   "memory": 10989000000,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.17.00.B2",
                   "vendor": "Nvidia"
@@ -2746,7 +2746,7 @@
                   "cpu_affinity": 1,
                   "device": "/dev/nvidia3",
                   "memory": 10989000000,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.17.00.B2",
                   "vendor": "Nvidia"
@@ -2988,7 +2988,7 @@
                   "cpu_affinity": 0,
                   "device": "/dev/nvidia0",
                   "memory": 10989000000,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.17.00.B2",
                   "vendor": "Nvidia"
@@ -2997,7 +2997,7 @@
                   "cpu_affinity": 0,
                   "device": "/dev/nvidia1",
                   "memory": 10989000000,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.17.00.B2",
                   "vendor": "Nvidia"
@@ -3006,7 +3006,7 @@
                   "cpu_affinity": 1,
                   "device": "/dev/nvidia2",
                   "memory": 10989000000,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.17.00.B2",
                   "vendor": "Nvidia"
@@ -3015,7 +3015,7 @@
                   "cpu_affinity": 1,
                   "device": "/dev/nvidia3",
                   "memory": 10989000000,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.17.00.B2",
                   "vendor": "Nvidia"
@@ -3257,7 +3257,7 @@
                   "cpu_affinity": 0,
                   "device": "/dev/nvidia0",
                   "memory": 10989000000,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.17.00.B2",
                   "vendor": "Nvidia"
@@ -3266,7 +3266,7 @@
                   "cpu_affinity": 0,
                   "device": "/dev/nvidia1",
                   "memory": 10989000000,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.17.00.B2",
                   "vendor": "Nvidia"
@@ -3275,7 +3275,7 @@
                   "cpu_affinity": 1,
                   "device": "/dev/nvidia2",
                   "memory": 10989000000,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.17.00.B2",
                   "vendor": "Nvidia"
@@ -3284,7 +3284,7 @@
                   "cpu_affinity": 1,
                   "device": "/dev/nvidia3",
                   "memory": 10989000000,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.17.00.B2",
                   "vendor": "Nvidia"
diff --git a/spec/input/data_misconfigured_server_with_disk.json b/spec/input/data_misconfigured_server_with_disk.json
index cf2f4aa0885..82dfb7108d4 100644
--- a/spec/input/data_misconfigured_server_with_disk.json
+++ b/spec/input/data_misconfigured_server_with_disk.json
@@ -34,7 +34,7 @@
                   "cpu_affinity": 0,
                   "device": "/dev/nvidia0",
                   "memory": 10989000000,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.17.00.B2",
                   "vendor": "Nvidia"
@@ -43,7 +43,7 @@
                   "cpu_affinity": 0,
                   "device": "/dev/nvidia1",
                   "memory": 10989000000,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.17.00.B2",
                   "vendor": "Nvidia"
@@ -52,7 +52,7 @@
                   "cpu_affinity": 1,
                   "device": "/dev/nvidia2",
                   "memory": 10989000000,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.0B.40.09",
                   "vendor": "Nvidia"
@@ -61,7 +61,7 @@
                   "cpu_affinity": 1,
                   "device": "/dev/nvidia3",
                   "memory": 10989000000,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.17.00.B2",
                   "vendor": "Nvidia"
@@ -255,7 +255,7 @@
                   "cpu_affinity": 0,
                   "device": "/dev/nvidia0",
                   "memory": 10989000000,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.17.00.B2",
                   "vendor": "Nvidia"
@@ -264,7 +264,7 @@
                   "cpu_affinity": 0,
                   "device": "/dev/nvidia1",
                   "memory": 10989000000,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.0B.40.09",
                   "vendor": "Nvidia"
@@ -273,7 +273,7 @@
                   "cpu_affinity": 1,
                   "device": "/dev/nvidia2",
                   "memory": 10989000000,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.0B.40.09",
                   "vendor": "Nvidia"
@@ -282,7 +282,7 @@
                   "cpu_affinity": 1,
                   "device": "/dev/nvidia3",
                   "memory": 10989000000,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.17.00.AC",
                   "vendor": "Nvidia"
@@ -489,7 +489,7 @@
                   "cpu_affinity": 0,
                   "device": "/dev/nvidia0",
                   "memory": 10989000000,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.17.00.B2",
                   "vendor": "Nvidia"
@@ -498,7 +498,7 @@
                   "cpu_affinity": 0,
                   "device": "/dev/nvidia1",
                   "memory": 10989000000,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.0B.40.09",
                   "vendor": "Nvidia"
@@ -507,7 +507,7 @@
                   "cpu_affinity": 1,
                   "device": "/dev/nvidia2",
                   "memory": 10989000000,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.0B.40.09",
                   "vendor": "Nvidia"
@@ -516,7 +516,7 @@
                   "cpu_affinity": 1,
                   "device": "/dev/nvidia3",
                   "memory": 10989000000,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.17.00.AC",
                   "vendor": "Nvidia"
@@ -749,7 +749,7 @@
                   "cpu_affinity": 0,
                   "device": "/dev/nvidia0",
                   "memory": 10989000000,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.17.00.B2",
                   "vendor": "Nvidia"
@@ -758,7 +758,7 @@
                   "cpu_affinity": 0,
                   "device": "/dev/nvidia1",
                   "memory": 10989000000,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.17.00.B2",
                   "vendor": "Nvidia"
@@ -767,7 +767,7 @@
                   "cpu_affinity": 1,
                   "device": "/dev/nvidia2",
                   "memory": 10989000000,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.0B.40.09",
                   "vendor": "Nvidia"
@@ -776,7 +776,7 @@
                   "cpu_affinity": 1,
                   "device": "/dev/nvidia3",
                   "memory": 10989000000,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.17.00.B2",
                   "vendor": "Nvidia"
diff --git a/spec/input/data_missing_main_network_property.json b/spec/input/data_missing_main_network_property.json
index fbd061dde7a..96985cca449 100644
--- a/spec/input/data_missing_main_network_property.json
+++ b/spec/input/data_missing_main_network_property.json
@@ -34,7 +34,7 @@
                   "cpu_affinity": 0,
                   "device": "/dev/nvidia0",
                   "memory": 10989000000,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.17.00.B2",
                   "vendor": "Nvidia"
@@ -43,7 +43,7 @@
                   "cpu_affinity": 0,
                   "device": "/dev/nvidia1",
                   "memory": 10989000000,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.17.00.B2",
                   "vendor": "Nvidia"
@@ -52,7 +52,7 @@
                   "cpu_affinity": 1,
                   "device": "/dev/nvidia2",
                   "memory": 10989000000,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.0B.40.09",
                   "vendor": "Nvidia"
@@ -61,7 +61,7 @@
                   "cpu_affinity": 1,
                   "device": "/dev/nvidia3",
                   "memory": 10989000000,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.17.00.B2",
                   "vendor": "Nvidia"
@@ -170,7 +170,7 @@
                   "cpu_affinity": 0,
                   "device": "/dev/nvidia0",
                   "memory": 10989000000,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.17.00.B2",
                   "vendor": "Nvidia"
@@ -179,7 +179,7 @@
                   "cpu_affinity": 0,
                   "device": "/dev/nvidia1",
                   "memory": 10989000000,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.0B.40.09",
                   "vendor": "Nvidia"
@@ -188,7 +188,7 @@
                   "cpu_affinity": 1,
                   "device": "/dev/nvidia2",
                   "memory": 10989000000,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.0B.40.09",
                   "vendor": "Nvidia"
@@ -197,7 +197,7 @@
                   "cpu_affinity": 1,
                   "device": "/dev/nvidia3",
                   "memory": 10989000000,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.17.00.AC",
                   "vendor": "Nvidia"
diff --git a/spec/input/data_round_robin_cpusets.json b/spec/input/data_round_robin_cpusets.json
index 508fc5cd708..ca659b93887 100644
--- a/spec/input/data_round_robin_cpusets.json
+++ b/spec/input/data_round_robin_cpusets.json
@@ -34,7 +34,7 @@
                   "cpu_affinity": 0,
                   "device": "/dev/nvidia0",
                   "memory": 10989000000,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.17.00.B2",
                   "vendor": "Nvidia"
@@ -43,7 +43,7 @@
                   "cpu_affinity": 0,
                   "device": "/dev/nvidia1",
                   "memory": 10989000000,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.17.00.B2",
                   "vendor": "Nvidia"
@@ -52,7 +52,7 @@
                   "cpu_affinity": 1,
                   "device": "/dev/nvidia2",
                   "memory": 10989000000,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.0B.40.09",
                   "vendor": "Nvidia"
@@ -61,7 +61,7 @@
                   "cpu_affinity": 1,
                   "device": "/dev/nvidia3",
                   "memory": 10989000000,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.17.00.B2",
                   "vendor": "Nvidia"
@@ -241,7 +241,7 @@
                   "cpu_affinity": 0,
                   "device": "/dev/nvidia0",
                   "memory": 10989000000,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.17.00.B2",
                   "vendor": "Nvidia"
@@ -250,7 +250,7 @@
                   "cpu_affinity": 0,
                   "device": "/dev/nvidia1",
                   "memory": 10989000000,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.0B.40.09",
                   "vendor": "Nvidia"
@@ -259,7 +259,7 @@
                   "cpu_affinity": 1,
                   "device": "/dev/nvidia2",
                   "memory": 10989000000,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.0B.40.09",
                   "vendor": "Nvidia"
@@ -268,7 +268,7 @@
                   "cpu_affinity": 1,
                   "device": "/dev/nvidia3",
                   "memory": 10989000000,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.17.00.AC",
                   "vendor": "Nvidia"
diff --git a/spec/input/data_wattmeters_nil.json b/spec/input/data_wattmeters_nil.json
index c800fc76c7c..377d85de5b8 100644
--- a/spec/input/data_wattmeters_nil.json
+++ b/spec/input/data_wattmeters_nil.json
@@ -34,7 +34,7 @@
                   "cpu_affinity": 0,
                   "device": "/dev/nvidia0",
                   "memory": 10989000000,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.17.00.B2",
                   "vendor": "Nvidia"
@@ -43,7 +43,7 @@
                   "cpu_affinity": 0,
                   "device": "/dev/nvidia1",
                   "memory": 10989000000,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.17.00.B2",
                   "vendor": "Nvidia"
@@ -52,7 +52,7 @@
                   "cpu_affinity": 1,
                   "device": "/dev/nvidia2",
                   "memory": 10989000000,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.0B.40.09",
                   "vendor": "Nvidia"
@@ -61,7 +61,7 @@
                   "cpu_affinity": 1,
                   "device": "/dev/nvidia3",
                   "memory": 10989000000,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.17.00.B2",
                   "vendor": "Nvidia"
@@ -240,7 +240,7 @@
                   "cpu_affinity": 0,
                   "device": "/dev/nvidia0",
                   "memory": 10989000000,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.17.00.B2",
                   "vendor": "Nvidia"
@@ -249,7 +249,7 @@
                   "cpu_affinity": 0,
                   "device": "/dev/nvidia1",
                   "memory": 10989000000,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.0B.40.09",
                   "vendor": "Nvidia"
@@ -258,7 +258,7 @@
                   "cpu_affinity": 1,
                   "device": "/dev/nvidia2",
                   "memory": 10989000000,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.0B.40.09",
                   "vendor": "Nvidia"
@@ -267,7 +267,7 @@
                   "cpu_affinity": 1,
                   "device": "/dev/nvidia3",
                   "memory": 10989000000,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.17.00.AC",
                   "vendor": "Nvidia"
diff --git a/spec/input/data_wattmeters_variations.json b/spec/input/data_wattmeters_variations.json
index 374de2b0a61..ff48c7b89a0 100644
--- a/spec/input/data_wattmeters_variations.json
+++ b/spec/input/data_wattmeters_variations.json
@@ -34,7 +34,7 @@
                   "cpu_affinity": 0,
                   "device": "/dev/nvidia0",
                   "memory": 10989000000,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.17.00.B2",
                   "vendor": "Nvidia"
@@ -43,7 +43,7 @@
                   "cpu_affinity": 0,
                   "device": "/dev/nvidia1",
                   "memory": 10989000000,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.17.00.B2",
                   "vendor": "Nvidia"
@@ -52,7 +52,7 @@
                   "cpu_affinity": 1,
                   "device": "/dev/nvidia2",
                   "memory": 10989000000,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.0B.40.09",
                   "vendor": "Nvidia"
@@ -61,7 +61,7 @@
                   "cpu_affinity": 1,
                   "device": "/dev/nvidia3",
                   "memory": 10989000000,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.17.00.B2",
                   "vendor": "Nvidia"
@@ -241,7 +241,7 @@
                   "cpu_affinity": 0,
                   "device": "/dev/nvidia0",
                   "memory": 10989000000,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.17.00.B2",
                   "vendor": "Nvidia"
@@ -250,7 +250,7 @@
                   "cpu_affinity": 0,
                   "device": "/dev/nvidia1",
                   "memory": 10989000000,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.0B.40.09",
                   "vendor": "Nvidia"
@@ -259,7 +259,7 @@
                   "cpu_affinity": 1,
                   "device": "/dev/nvidia2",
                   "memory": 10989000000,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.0B.40.09",
                   "vendor": "Nvidia"
@@ -268,7 +268,7 @@
                   "cpu_affinity": 1,
                   "device": "/dev/nvidia3",
                   "memory": 10989000000,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.17.00.AC",
                   "vendor": "Nvidia"
diff --git a/spec/input/data_with_disk.json b/spec/input/data_with_disk.json
index cf2f4aa0885..82dfb7108d4 100644
--- a/spec/input/data_with_disk.json
+++ b/spec/input/data_with_disk.json
@@ -34,7 +34,7 @@
                   "cpu_affinity": 0,
                   "device": "/dev/nvidia0",
                   "memory": 10989000000,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.17.00.B2",
                   "vendor": "Nvidia"
@@ -43,7 +43,7 @@
                   "cpu_affinity": 0,
                   "device": "/dev/nvidia1",
                   "memory": 10989000000,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.17.00.B2",
                   "vendor": "Nvidia"
@@ -52,7 +52,7 @@
                   "cpu_affinity": 1,
                   "device": "/dev/nvidia2",
                   "memory": 10989000000,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.0B.40.09",
                   "vendor": "Nvidia"
@@ -61,7 +61,7 @@
                   "cpu_affinity": 1,
                   "device": "/dev/nvidia3",
                   "memory": 10989000000,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.17.00.B2",
                   "vendor": "Nvidia"
@@ -255,7 +255,7 @@
                   "cpu_affinity": 0,
                   "device": "/dev/nvidia0",
                   "memory": 10989000000,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.17.00.B2",
                   "vendor": "Nvidia"
@@ -264,7 +264,7 @@
                   "cpu_affinity": 0,
                   "device": "/dev/nvidia1",
                   "memory": 10989000000,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.0B.40.09",
                   "vendor": "Nvidia"
@@ -273,7 +273,7 @@
                   "cpu_affinity": 1,
                   "device": "/dev/nvidia2",
                   "memory": 10989000000,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.0B.40.09",
                   "vendor": "Nvidia"
@@ -282,7 +282,7 @@
                   "cpu_affinity": 1,
                   "device": "/dev/nvidia3",
                   "memory": 10989000000,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.17.00.AC",
                   "vendor": "Nvidia"
@@ -489,7 +489,7 @@
                   "cpu_affinity": 0,
                   "device": "/dev/nvidia0",
                   "memory": 10989000000,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.17.00.B2",
                   "vendor": "Nvidia"
@@ -498,7 +498,7 @@
                   "cpu_affinity": 0,
                   "device": "/dev/nvidia1",
                   "memory": 10989000000,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.0B.40.09",
                   "vendor": "Nvidia"
@@ -507,7 +507,7 @@
                   "cpu_affinity": 1,
                   "device": "/dev/nvidia2",
                   "memory": 10989000000,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.0B.40.09",
                   "vendor": "Nvidia"
@@ -516,7 +516,7 @@
                   "cpu_affinity": 1,
                   "device": "/dev/nvidia3",
                   "memory": 10989000000,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.17.00.AC",
                   "vendor": "Nvidia"
@@ -749,7 +749,7 @@
                   "cpu_affinity": 0,
                   "device": "/dev/nvidia0",
                   "memory": 10989000000,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.17.00.B2",
                   "vendor": "Nvidia"
@@ -758,7 +758,7 @@
                   "cpu_affinity": 0,
                   "device": "/dev/nvidia1",
                   "memory": 10989000000,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.17.00.B2",
                   "vendor": "Nvidia"
@@ -767,7 +767,7 @@
                   "cpu_affinity": 1,
                   "device": "/dev/nvidia2",
                   "memory": 10989000000,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.0B.40.09",
                   "vendor": "Nvidia"
@@ -776,7 +776,7 @@
                   "cpu_affinity": 1,
                   "device": "/dev/nvidia3",
                   "memory": 10989000000,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.17.00.B2",
                   "vendor": "Nvidia"
diff --git a/spec/input/data_with_non_reservable_gpus.json b/spec/input/data_with_non_reservable_gpus.json
index e0293aa9ae1..0cd6bcd7d30 100644
--- a/spec/input/data_with_non_reservable_gpus.json
+++ b/spec/input/data_with_non_reservable_gpus.json
@@ -34,7 +34,7 @@
                   "cpu_affinity": 0,
                   "device": "/dev/nvidia0",
                   "memory": 10989000000,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.17.00.B2",
                   "vendor": "Nvidia",
@@ -44,7 +44,7 @@
                   "cpu_affinity": 0,
                   "device": "/dev/nvidia1",
                   "memory": 10989000000,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.17.00.B2",
                   "vendor": "Nvidia",
@@ -54,7 +54,7 @@
                   "cpu_affinity": 1,
                   "device": "/dev/nvidia2",
                   "memory": 10989000000,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.0B.40.09",
                   "vendor": "Nvidia",
@@ -64,7 +64,7 @@
                   "cpu_affinity": 1,
                   "device": "/dev/nvidia3",
                   "memory": 10989000000,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.17.00.B2",
                   "vendor": "Nvidia",
@@ -245,7 +245,7 @@
                   "cpu_affinity": 0,
                   "device": "/dev/nvidia0",
                   "memory": 10989000000,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.17.00.B2",
                   "vendor": "Nvidia",
@@ -255,7 +255,7 @@
                   "cpu_affinity": 0,
                   "device": "/dev/nvidia1",
                   "memory": 10989000000,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.0B.40.09",
                   "vendor": "Nvidia",
@@ -265,7 +265,7 @@
                   "cpu_affinity": 1,
                   "device": "/dev/nvidia2",
                   "memory": 10989000000,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.0B.40.09",
                   "vendor": "Nvidia",
@@ -275,7 +275,7 @@
                   "cpu_affinity": 1,
                   "device": "/dev/nvidia3",
                   "memory": 10989000000,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.17.00.AC",
                   "vendor": "Nvidia",
diff --git a/spec/input/data_without_gpu.json b/spec/input/data_without_gpu.json
index 22960c0dff9..ee0667ba676 100644
--- a/spec/input/data_without_gpu.json
+++ b/spec/input/data_without_gpu.json
@@ -34,7 +34,7 @@
                   "cpu_affinity": 0,
                   "device": "/dev/nvidia0",
                   "memory": 10989000000,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.17.00.B2",
                   "vendor": "Nvidia"
@@ -43,7 +43,7 @@
                   "cpu_affinity": 0,
                   "device": "/dev/nvidia1",
                   "memory": 10989000000,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.17.00.B2",
                   "vendor": "Nvidia"
@@ -52,7 +52,7 @@
                   "cpu_affinity": 1,
                   "device": "/dev/nvidia2",
                   "memory": 10989000000,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.0B.40.09",
                   "vendor": "Nvidia"
@@ -61,7 +61,7 @@
                   "cpu_affinity": 1,
                   "device": "/dev/nvidia3",
                   "memory": 10989000000,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.17.00.B2",
                   "vendor": "Nvidia"
@@ -255,7 +255,7 @@
                   "cpu_affinity": 0,
                   "device": "/dev/nvidia0",
                   "memory": 10989000000,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.17.00.B2",
                   "vendor": "Nvidia"
@@ -264,7 +264,7 @@
                   "cpu_affinity": 0,
                   "device": "/dev/nvidia1",
                   "memory": 10989000000,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.0B.40.09",
                   "vendor": "Nvidia"
@@ -273,7 +273,7 @@
                   "cpu_affinity": 1,
                   "device": "/dev/nvidia2",
                   "memory": 10989000000,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.0B.40.09",
                   "vendor": "Nvidia"
@@ -282,7 +282,7 @@
                   "cpu_affinity": 1,
                   "device": "/dev/nvidia3",
                   "memory": 10989000000,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.17.00.AC",
                   "vendor": "Nvidia"
@@ -946,7 +946,7 @@
                   "cpu_affinity": 0,
                   "device": "/dev/nvidia0",
                   "memory": 10989000000,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.17.00.B2",
                   "vendor": "Nvidia"
@@ -955,7 +955,7 @@
                   "cpu_affinity": 0,
                   "device": "/dev/nvidia1",
                   "memory": 10989000000,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.0B.40.09",
                   "vendor": "Nvidia"
@@ -964,7 +964,7 @@
                   "cpu_affinity": 1,
                   "device": "/dev/nvidia2",
                   "memory": 10989000000,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.0B.40.09",
                   "vendor": "Nvidia"
@@ -973,7 +973,7 @@
                   "cpu_affinity": 1,
                   "device": "/dev/nvidia3",
                   "memory": 10989000000,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.17.00.AC",
                   "vendor": "Nvidia"
@@ -1206,7 +1206,7 @@
                   "cpu_affinity": 0,
                   "device": "/dev/nvidia0",
                   "memory": 10989000000,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.17.00.B2",
                   "vendor": "Nvidia"
@@ -1215,7 +1215,7 @@
                   "cpu_affinity": 0,
                   "device": "/dev/nvidia1",
                   "memory": 10989000000,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.17.00.B2",
                   "vendor": "Nvidia"
@@ -1224,7 +1224,7 @@
                   "cpu_affinity": 1,
                   "device": "/dev/nvidia2",
                   "memory": 10989000000,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.0B.40.09",
                   "vendor": "Nvidia"
@@ -1233,7 +1233,7 @@
                   "cpu_affinity": 1,
                   "device": "/dev/nvidia3",
                   "memory": 10989000000,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.17.00.B2",
                   "vendor": "Nvidia"
diff --git a/spec/input/oar_but_chassis_unset.json b/spec/input/oar_but_chassis_unset.json
index 9145bad28bb..a7184334a0a 100644
--- a/spec/input/oar_but_chassis_unset.json
+++ b/spec/input/oar_but_chassis_unset.json
@@ -55,7 +55,7 @@
       "gpu_count": 4,
       "cluster_priority": 201906,
       "ib_count": 0,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "mic": "NO",
       "switch": "gw-fakesite",
       "eth_count": 1,
@@ -144,7 +144,7 @@
       "eth_count": 1,
       "switch": "gw-fakesite",
       "mic": "NO",
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "ib_count": 0,
       "cluster_priority": 201906,
       "gpu_count": 4,
@@ -178,7 +178,7 @@
       "cpufreq": "2.1",
       "exotic": "NO",
       "mic": "NO",
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "ib_count": 0,
       "eth_count": 1,
       "switch": "gw-fakesite",
@@ -265,7 +265,7 @@
       "next_state": "UnChanged",
       "mic": "NO",
       "ib_count": 0,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "eth_count": 1,
       "switch": "gw-fakesite",
       "available_upto": 2147483647,
@@ -374,7 +374,7 @@
       "cpu": 1,
       "switch": "gw-fakesite",
       "eth_count": 1,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "ib_count": 0,
       "mic": "NO",
       "next_state": "UnChanged",
@@ -461,7 +461,7 @@
       "eth_count": 1,
       "switch": "gw-fakesite",
       "mic": "NO",
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "ib_count": 0
     },
     {
@@ -509,7 +509,7 @@
       "type": "default",
       "mic": "NO",
       "ib_count": 0,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "eth_count": 1,
       "switch": "gw-fakesite",
       "cpuarch": "x86_64",
@@ -597,7 +597,7 @@
       "switch": "gw-fakesite",
       "mic": "NO",
       "ib_count": 0,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "memcpu": 65536,
       "cpufreq": "2.1",
       "exotic": "NO",
@@ -671,7 +671,7 @@
       "gpu_count": 4,
       "cluster_priority": 201906,
       "ib_count": 0,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "mic": "NO",
       "switch": "gw-fakesite",
       "eth_count": 1,
@@ -726,7 +726,7 @@
       "cluster_priority": 201906,
       "gpu_count": 4,
       "ib_count": 0,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "mic": "NO",
       "switch": "gw-fakesite",
       "eth_count": 1,
@@ -804,7 +804,7 @@
       "next_state": "UnChanged",
       "mic": "NO",
       "ib_count": 0,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "eth_count": 1,
       "switch": "gw-fakesite",
       "available_upto": 2147483647,
@@ -863,7 +863,7 @@
       "switch": "gw-fakesite",
       "eth_count": 1,
       "ib_count": 0,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "mic": "NO",
       "cpufreq": "2.1",
       "exotic": "NO",
@@ -947,7 +947,7 @@
       "cpufreq": "2.1",
       "exotic": "NO",
       "memcpu": 65536,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "ib_count": 0,
       "mic": "NO",
       "switch": "gw-fakesite",
@@ -1056,7 +1056,7 @@
       "cluster_priority": 201906,
       "gpu_count": 4,
       "ib_count": 0,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "mic": "NO",
       "switch": "gw-fakesite",
       "eth_count": 1,
@@ -1114,7 +1114,7 @@
       "switch": "gw-fakesite",
       "mic": "NO",
       "ib_count": 0,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "opa_count": 0,
       "id": 15,
       "production": "YES",
@@ -1210,7 +1210,7 @@
       "maintenance": "NO",
       "next_state": "UnChanged",
       "mic": "NO",
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "ib_count": 0,
       "eth_count": 1,
       "switch": "gw-fakesite",
@@ -1247,7 +1247,7 @@
       "next_state": "UnChanged",
       "mic": "NO",
       "ib_count": 0,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "eth_count": 1,
       "switch": "gw-fakesite",
       "cpu": 3,
@@ -1334,7 +1334,7 @@
       "deploy": "YES",
       "mic": "NO",
       "ib_count": 0,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "eth_count": 1,
       "switch": "gw-fakesite",
       "cpuarch": "x86_64",
@@ -1452,7 +1452,7 @@
       "cpu": 3,
       "switch": "gw-fakesite",
       "eth_count": 1,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "ib_count": 0,
       "mic": "NO",
       "next_state": "UnChanged",
@@ -1510,7 +1510,7 @@
       "available_upto": 2147483647,
       "switch": "gw-fakesite",
       "eth_count": 1,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "ib_count": 0,
       "mic": "NO",
       "next_state": "UnChanged",
@@ -1556,7 +1556,7 @@
       "eth_count": 1,
       "switch": "gw-fakesite",
       "mic": "NO",
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "ib_count": 0,
       "memcpu": 65536,
       "deploy": "YES",
@@ -1693,7 +1693,7 @@
       "eth_count": 1,
       "switch": "gw-fakesite",
       "mic": "NO",
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "ib_count": 0
     },
     {
@@ -1708,7 +1708,7 @@
       "maintenance": "NO",
       "next_state": "UnChanged",
       "mic": "NO",
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "ib_count": 0,
       "eth_count": 1,
       "switch": "gw-fakesite",
@@ -1777,7 +1777,7 @@
       "chassis": null, 
       "mic": "NO",
       "ib_count": 0,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "eth_count": 1,
       "switch": "gw-fakesite",
       "host": "clustera-2.fakesite.grid5000.fr",
@@ -1861,7 +1861,7 @@
       "gpu_count": 4,
       "cluster_priority": 201906,
       "maintenance": "NO",
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "ib_count": 0,
       "mic": "NO",
       "switch": "gw-fakesite",
@@ -2001,7 +2001,7 @@
       "eth_count": 1,
       "switch": "gw-fakesite",
       "mic": "NO",
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "ib_count": 0
     },
     {
@@ -2066,7 +2066,7 @@
       "cpufreq": "2.1",
       "exotic": "NO",
       "memcpu": 65536,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "ib_count": 0,
       "mic": "NO",
       "switch": "gw-fakesite",
@@ -2095,7 +2095,7 @@
       "switch": "gw-fakesite",
       "eth_count": 1,
       "ib_count": 0,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "mic": "NO",
       "cpufreq": "2.1",
       "exotic": "NO",
@@ -2189,7 +2189,7 @@
       "cluster_priority": 201906,
       "gpu_count": 4,
       "ib_count": 0,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "mic": "NO",
       "switch": "gw-fakesite",
       "eth_count": 1,
@@ -2281,7 +2281,7 @@
       "eth_count": 1,
       "switch": "gw-fakesite",
       "mic": "NO",
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "ib_count": 0,
       "gpu_count": 4,
       "cluster_priority": 201906,
@@ -2342,7 +2342,7 @@
       "gpu_count": 4,
       "cluster_priority": 201906,
       "maintenance": "NO",
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "ib_count": 0,
       "mic": "NO",
       "switch": "gw-fakesite",
@@ -2394,7 +2394,7 @@
       "switch": "gw-fakesite",
       "eth_count": 1,
       "ib_count": 0,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "mic": "NO",
       "next_state": "UnChanged",
       "maintenance": "NO",
diff --git a/spec/input/oar_configured.json b/spec/input/oar_configured.json
index 54a8afc5bda..dc0d1eec5fe 100644
--- a/spec/input/oar_configured.json
+++ b/spec/input/oar_configured.json
@@ -55,7 +55,7 @@
       "gpu_count": 4,
       "cluster_priority": 201906,
       "ib_count": 0,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "mic": "NO",
       "switch": "gw-fakesite",
       "eth_count": 1,
@@ -144,7 +144,7 @@
       "eth_count": 1,
       "switch": "gw-fakesite",
       "mic": "NO",
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "ib_count": 0,
       "cluster_priority": 201906,
       "gpu_count": 4,
@@ -178,7 +178,7 @@
       "cpufreq": "2.1",
       "exotic": "NO",
       "mic": "NO",
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "ib_count": 0,
       "eth_count": 1,
       "switch": "gw-fakesite",
@@ -265,7 +265,7 @@
       "next_state": "UnChanged",
       "mic": "NO",
       "ib_count": 0,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "eth_count": 1,
       "switch": "gw-fakesite",
       "available_upto": 2147483647,
@@ -374,7 +374,7 @@
       "cpu": 1,
       "switch": "gw-fakesite",
       "eth_count": 1,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "ib_count": 0,
       "mic": "NO",
       "next_state": "UnChanged",
@@ -461,7 +461,7 @@
       "eth_count": 1,
       "switch": "gw-fakesite",
       "mic": "NO",
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "ib_count": 0
     },
     {
@@ -509,7 +509,7 @@
       "type": "default",
       "mic": "NO",
       "ib_count": 0,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "eth_count": 1,
       "switch": "gw-fakesite",
       "cpuarch": "x86_64",
@@ -597,7 +597,7 @@
       "switch": "gw-fakesite",
       "mic": "NO",
       "ib_count": 0,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "memcpu": 65536,
       "cpufreq": "2.1",
       "exotic": "NO",
@@ -671,7 +671,7 @@
       "gpu_count": 4,
       "cluster_priority": 201906,
       "ib_count": 0,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "mic": "NO",
       "switch": "gw-fakesite",
       "eth_count": 1,
@@ -726,7 +726,7 @@
       "cluster_priority": 201906,
       "gpu_count": 4,
       "ib_count": 0,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "mic": "NO",
       "switch": "gw-fakesite",
       "eth_count": 1,
@@ -804,7 +804,7 @@
       "next_state": "UnChanged",
       "mic": "NO",
       "ib_count": 0,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "eth_count": 1,
       "switch": "gw-fakesite",
       "available_upto": 2147483647,
@@ -863,7 +863,7 @@
       "switch": "gw-fakesite",
       "eth_count": 1,
       "ib_count": 0,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "mic": "NO",
       "cpufreq": "2.1",
       "exotic": "NO",
@@ -947,7 +947,7 @@
       "cpufreq": "2.1",
       "exotic": "NO",
       "memcpu": 65536,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "ib_count": 0,
       "mic": "NO",
       "switch": "gw-fakesite",
@@ -1056,7 +1056,7 @@
       "cluster_priority": 201906,
       "gpu_count": 4,
       "ib_count": 0,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "mic": "NO",
       "switch": "gw-fakesite",
       "eth_count": 1,
@@ -1114,7 +1114,7 @@
       "switch": "gw-fakesite",
       "mic": "NO",
       "ib_count": 0,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "opa_count": 0,
       "id": 15,
       "production": "YES",
@@ -1210,7 +1210,7 @@
       "maintenance": "NO",
       "next_state": "UnChanged",
       "mic": "NO",
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "ib_count": 0,
       "eth_count": 1,
       "switch": "gw-fakesite",
@@ -1247,7 +1247,7 @@
       "next_state": "UnChanged",
       "mic": "NO",
       "ib_count": 0,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "eth_count": 1,
       "switch": "gw-fakesite",
       "cpu": 3,
@@ -1334,7 +1334,7 @@
       "deploy": "YES",
       "mic": "NO",
       "ib_count": 0,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "eth_count": 1,
       "switch": "gw-fakesite",
       "cpuarch": "x86_64",
@@ -1452,7 +1452,7 @@
       "cpu": 3,
       "switch": "gw-fakesite",
       "eth_count": 1,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "ib_count": 0,
       "mic": "NO",
       "next_state": "UnChanged",
@@ -1510,7 +1510,7 @@
       "available_upto": 2147483647,
       "switch": "gw-fakesite",
       "eth_count": 1,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "ib_count": 0,
       "mic": "NO",
       "next_state": "UnChanged",
@@ -1556,7 +1556,7 @@
       "eth_count": 1,
       "switch": "gw-fakesite",
       "mic": "NO",
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "ib_count": 0,
       "memcpu": 65536,
       "deploy": "YES",
@@ -1693,7 +1693,7 @@
       "eth_count": 1,
       "switch": "gw-fakesite",
       "mic": "NO",
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "ib_count": 0
     },
     {
@@ -1708,7 +1708,7 @@
       "maintenance": "NO",
       "next_state": "UnChanged",
       "mic": "NO",
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "ib_count": 0,
       "eth_count": 1,
       "switch": "gw-fakesite",
@@ -1777,7 +1777,7 @@
       "chassis": "Dell Inc. PowerEdge T640 9L1CBX2", 
       "mic": "NO",
       "ib_count": 0,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "eth_count": 1,
       "switch": "gw-fakesite",
       "host": "clustera-2.fakesite.grid5000.fr",
@@ -1861,7 +1861,7 @@
       "gpu_count": 4,
       "cluster_priority": 201906,
       "maintenance": "NO",
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "ib_count": 0,
       "mic": "NO",
       "switch": "gw-fakesite",
@@ -2001,7 +2001,7 @@
       "eth_count": 1,
       "switch": "gw-fakesite",
       "mic": "NO",
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "ib_count": 0
     },
     {
@@ -2066,7 +2066,7 @@
       "cpufreq": "2.1",
       "exotic": "NO",
       "memcpu": 65536,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "ib_count": 0,
       "mic": "NO",
       "switch": "gw-fakesite",
@@ -2095,7 +2095,7 @@
       "switch": "gw-fakesite",
       "eth_count": 1,
       "ib_count": 0,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "mic": "NO",
       "cpufreq": "2.1",
       "exotic": "NO",
@@ -2189,7 +2189,7 @@
       "cluster_priority": 201906,
       "gpu_count": 4,
       "ib_count": 0,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "mic": "NO",
       "switch": "gw-fakesite",
       "eth_count": 1,
@@ -2281,7 +2281,7 @@
       "eth_count": 1,
       "switch": "gw-fakesite",
       "mic": "NO",
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "ib_count": 0,
       "gpu_count": 4,
       "cluster_priority": 201906,
@@ -2342,7 +2342,7 @@
       "gpu_count": 4,
       "cluster_priority": 201906,
       "maintenance": "NO",
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "ib_count": 0,
       "mic": "NO",
       "switch": "gw-fakesite",
@@ -2394,7 +2394,7 @@
       "switch": "gw-fakesite",
       "eth_count": 1,
       "ib_count": 0,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "mic": "NO",
       "next_state": "UnChanged",
       "maintenance": "NO",
diff --git a/spec/input/oar_duplicated_cpus_cores_gpus.json b/spec/input/oar_duplicated_cpus_cores_gpus.json
index 33f9fcc0a93..18b4dd4a5eb 100644
--- a/spec/input/oar_duplicated_cpus_cores_gpus.json
+++ b/spec/input/oar_duplicated_cpus_cores_gpus.json
@@ -54,7 +54,7 @@
       "gpu_count": 4,
       "cluster_priority": 201906,
       "ib_count": 0,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "mic": "NO",
       "switch": "gw-fakesite",
       "eth_count": 1,
@@ -140,7 +140,7 @@
       "eth_count": 1,
       "switch": "gw-fakesite",
       "mic": "NO",
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "ib_count": 0,
       "cluster_priority": 201906,
       "gpu_count": 4,
@@ -172,7 +172,7 @@
       "memcore": 8192,
       "cpufreq": "2.1",
       "mic": "NO",
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "ib_count": 0,
       "eth_count": 1,
       "switch": "gw-fakesite",
@@ -257,7 +257,7 @@
       "next_state": "UnChanged",
       "mic": "NO",
       "ib_count": 0,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "eth_count": 1,
       "switch": "gw-fakesite",
       "available_upto": 2147483647,
@@ -364,7 +364,7 @@
       "cpu": 1,
       "switch": "gw-fakesite",
       "eth_count": 1,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "ib_count": 0,
       "mic": "NO",
       "next_state": "UnChanged",
@@ -449,7 +449,7 @@
       "eth_count": 1,
       "switch": "gw-fakesite",
       "mic": "NO",
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "ib_count": 0
     },
     {
@@ -496,7 +496,7 @@
       "type": "default",
       "mic": "NO",
       "ib_count": 0,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "eth_count": 1,
       "switch": "gw-fakesite",
       "cpuarch": "x86_64",
@@ -582,7 +582,7 @@
       "switch": "gw-fakesite",
       "mic": "NO",
       "ib_count": 0,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "memcpu": 65536,
       "cpufreq": "2.1",
       "memcore": 8192,
@@ -654,7 +654,7 @@
       "gpu_count": 4,
       "cluster_priority": 201906,
       "ib_count": 0,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "mic": "NO",
       "switch": "gw-fakesite",
       "eth_count": 1,
@@ -706,7 +706,7 @@
       "cluster_priority": 201906,
       "gpu_count": 4,
       "ib_count": 0,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "mic": "NO",
       "switch": "gw-fakesite",
       "eth_count": 1,
@@ -782,7 +782,7 @@
       "next_state": "UnChanged",
       "mic": "NO",
       "ib_count": 0,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "eth_count": 1,
       "switch": "gw-fakesite",
       "available_upto": 2147483647,
@@ -840,7 +840,7 @@
       "switch": "gw-fakesite",
       "eth_count": 1,
       "ib_count": 0,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "mic": "NO",
       "cpufreq": "2.1",
       "memcore": 8192,
@@ -921,7 +921,7 @@
       "memcore": 8192,
       "cpufreq": "2.1",
       "memcpu": 65536,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "ib_count": 0,
       "mic": "NO",
       "switch": "gw-fakesite",
@@ -1029,7 +1029,7 @@
       "cluster_priority": 201906,
       "gpu_count": 4,
       "ib_count": 0,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "mic": "NO",
       "switch": "gw-fakesite",
       "eth_count": 1,
@@ -1084,7 +1084,7 @@
       "switch": "gw-fakesite",
       "mic": "NO",
       "ib_count": 0,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "opa_count": 0,
       "id": 15,
       "production": "YES",
@@ -1179,7 +1179,7 @@
       "maintenance": "NO",
       "next_state": "UnChanged",
       "mic": "NO",
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "ib_count": 0,
       "eth_count": 1,
       "switch": "gw-fakesite",
@@ -1214,7 +1214,7 @@
       "next_state": "UnChanged",
       "mic": "NO",
       "ib_count": 0,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "eth_count": 1,
       "switch": "gw-fakesite",
       "cpu": 3,
@@ -1298,7 +1298,7 @@
       "deploy": "NO",
       "mic": "NO",
       "ib_count": 0,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "eth_count": 1,
       "switch": "gw-fakesite",
       "cpuarch": "x86_64",
@@ -1414,7 +1414,7 @@
       "cpu": 3,
       "switch": "gw-fakesite",
       "eth_count": 1,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "ib_count": 0,
       "mic": "NO",
       "next_state": "UnChanged",
@@ -1471,7 +1471,7 @@
       "available_upto": 2147483647,
       "switch": "gw-fakesite",
       "eth_count": 1,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "ib_count": 0,
       "mic": "NO",
       "next_state": "UnChanged",
@@ -1515,7 +1515,7 @@
       "eth_count": 1,
       "switch": "gw-fakesite",
       "mic": "NO",
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "ib_count": 0,
       "memcpu": 65536,
       "deploy": "NO",
@@ -1649,7 +1649,7 @@
       "eth_count": 1,
       "switch": "gw-fakesite",
       "mic": "NO",
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "ib_count": 0
     },
     {
@@ -1663,7 +1663,7 @@
       "maintenance": "NO",
       "next_state": "UnChanged",
       "mic": "NO",
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "ib_count": 0,
       "eth_count": 1,
       "switch": "gw-fakesite",
@@ -1730,7 +1730,7 @@
     {
       "mic": "NO",
       "ib_count": 0,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "eth_count": 1,
       "switch": "gw-fakesite",
       "host": "clustera-2.fakesite.grid5000.fr",
@@ -1812,7 +1812,7 @@
       "gpu_count": 4,
       "cluster_priority": 201906,
       "maintenance": "NO",
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "ib_count": 0,
       "mic": "NO",
       "switch": "gw-fakesite",
@@ -1949,7 +1949,7 @@
       "eth_count": 1,
       "switch": "gw-fakesite",
       "mic": "NO",
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "ib_count": 0
     },
     {
@@ -2012,7 +2012,7 @@
       "memcore": 8192,
       "cpufreq": "2.1",
       "memcpu": 65536,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "ib_count": 0,
       "mic": "NO",
       "switch": "gw-fakesite",
@@ -2040,7 +2040,7 @@
       "switch": "gw-fakesite",
       "eth_count": 1,
       "ib_count": 0,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "mic": "NO",
       "cpufreq": "2.1",
       "memcore": 8192,
@@ -2131,7 +2131,7 @@
       "cluster_priority": 201906,
       "gpu_count": 4,
       "ib_count": 0,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "mic": "NO",
       "switch": "gw-fakesite",
       "eth_count": 1,
@@ -2222,7 +2222,7 @@
       "eth_count": 1,
       "switch": "gw-fakesite",
       "mic": "NO",
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "ib_count": 0,
       "gpu_count": 4,
       "cluster_priority": 201906,
@@ -2280,7 +2280,7 @@
       "gpu_count": 4,
       "cluster_priority": 201906,
       "maintenance": "NO",
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "ib_count": 0,
       "mic": "NO",
       "switch": "gw-fakesite",
@@ -2331,7 +2331,7 @@
       "switch": "gw-fakesite",
       "eth_count": 1,
       "ib_count": 0,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "mic": "NO",
       "next_state": "UnChanged",
       "maintenance": "NO",
diff --git a/spec/input/oar_grue-without-gpus.json b/spec/input/oar_grue-without-gpus.json
index 778e59f9f94..d1aab26ff29 100644
--- a/spec/input/oar_grue-without-gpus.json
+++ b/spec/input/oar_grue-without-gpus.json
@@ -774814,7 +774814,7 @@
       "finaud_decision": "NO",
       "gpu": 53,
       "gpu_count": 4,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "gpudevice": "0",
       "grub": null,
       "host": "graffiti-1.nancy.grid5000.fr",
@@ -774907,7 +774907,7 @@
       "finaud_decision": "NO",
       "gpu": 53,
       "gpu_count": 4,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "gpudevice": "0",
       "grub": null,
       "host": "graffiti-1.nancy.grid5000.fr",
@@ -775000,7 +775000,7 @@
       "finaud_decision": "NO",
       "gpu": 53,
       "gpu_count": 4,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "gpudevice": "0",
       "grub": null,
       "host": "graffiti-1.nancy.grid5000.fr",
@@ -775093,7 +775093,7 @@
       "finaud_decision": "NO",
       "gpu": 53,
       "gpu_count": 4,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "gpudevice": "0",
       "grub": null,
       "host": "graffiti-1.nancy.grid5000.fr",
@@ -775186,7 +775186,7 @@
       "finaud_decision": "NO",
       "gpu": 54,
       "gpu_count": 4,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "gpudevice": "1",
       "grub": null,
       "host": "graffiti-1.nancy.grid5000.fr",
@@ -775279,7 +775279,7 @@
       "finaud_decision": "NO",
       "gpu": 54,
       "gpu_count": 4,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "gpudevice": "1",
       "grub": null,
       "host": "graffiti-1.nancy.grid5000.fr",
@@ -775372,7 +775372,7 @@
       "finaud_decision": "NO",
       "gpu": 54,
       "gpu_count": 4,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "gpudevice": "1",
       "grub": null,
       "host": "graffiti-1.nancy.grid5000.fr",
@@ -775465,7 +775465,7 @@
       "finaud_decision": "NO",
       "gpu": 54,
       "gpu_count": 4,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "gpudevice": "1",
       "grub": null,
       "host": "graffiti-1.nancy.grid5000.fr",
@@ -775558,7 +775558,7 @@
       "finaud_decision": "NO",
       "gpu": 55,
       "gpu_count": 4,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "gpudevice": "2",
       "grub": null,
       "host": "graffiti-1.nancy.grid5000.fr",
@@ -775651,7 +775651,7 @@
       "finaud_decision": "NO",
       "gpu": 55,
       "gpu_count": 4,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "gpudevice": "2",
       "grub": null,
       "host": "graffiti-1.nancy.grid5000.fr",
@@ -775744,7 +775744,7 @@
       "finaud_decision": "NO",
       "gpu": 55,
       "gpu_count": 4,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "gpudevice": "2",
       "grub": null,
       "host": "graffiti-1.nancy.grid5000.fr",
@@ -775837,7 +775837,7 @@
       "finaud_decision": "NO",
       "gpu": 55,
       "gpu_count": 4,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "gpudevice": "2",
       "grub": null,
       "host": "graffiti-1.nancy.grid5000.fr",
@@ -775930,7 +775930,7 @@
       "finaud_decision": "NO",
       "gpu": 56,
       "gpu_count": 4,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "gpudevice": "3",
       "grub": null,
       "host": "graffiti-1.nancy.grid5000.fr",
@@ -776023,7 +776023,7 @@
       "finaud_decision": "NO",
       "gpu": 56,
       "gpu_count": 4,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "gpudevice": "3",
       "grub": null,
       "host": "graffiti-1.nancy.grid5000.fr",
@@ -776116,7 +776116,7 @@
       "finaud_decision": "NO",
       "gpu": 56,
       "gpu_count": 4,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "gpudevice": "3",
       "grub": null,
       "host": "graffiti-1.nancy.grid5000.fr",
@@ -776209,7 +776209,7 @@
       "finaud_decision": "NO",
       "gpu": 56,
       "gpu_count": 4,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "gpudevice": "3",
       "grub": null,
       "host": "graffiti-1.nancy.grid5000.fr",
@@ -776302,7 +776302,7 @@
       "finaud_decision": "NO",
       "gpu": 57,
       "gpu_count": 4,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "gpudevice": "0",
       "grub": null,
       "host": "graffiti-2.nancy.grid5000.fr",
@@ -776395,7 +776395,7 @@
       "finaud_decision": "NO",
       "gpu": 57,
       "gpu_count": 4,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "gpudevice": "0",
       "grub": null,
       "host": "graffiti-2.nancy.grid5000.fr",
@@ -776488,7 +776488,7 @@
       "finaud_decision": "NO",
       "gpu": 57,
       "gpu_count": 4,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "gpudevice": "0",
       "grub": null,
       "host": "graffiti-2.nancy.grid5000.fr",
@@ -776581,7 +776581,7 @@
       "finaud_decision": "NO",
       "gpu": 57,
       "gpu_count": 4,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "gpudevice": "0",
       "grub": null,
       "host": "graffiti-2.nancy.grid5000.fr",
@@ -776674,7 +776674,7 @@
       "finaud_decision": "NO",
       "gpu": 58,
       "gpu_count": 4,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "gpudevice": "1",
       "grub": null,
       "host": "graffiti-2.nancy.grid5000.fr",
@@ -776767,7 +776767,7 @@
       "finaud_decision": "NO",
       "gpu": 58,
       "gpu_count": 4,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "gpudevice": "1",
       "grub": null,
       "host": "graffiti-2.nancy.grid5000.fr",
@@ -776860,7 +776860,7 @@
       "finaud_decision": "NO",
       "gpu": 58,
       "gpu_count": 4,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "gpudevice": "1",
       "grub": null,
       "host": "graffiti-2.nancy.grid5000.fr",
@@ -776953,7 +776953,7 @@
       "finaud_decision": "NO",
       "gpu": 58,
       "gpu_count": 4,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "gpudevice": "1",
       "grub": null,
       "host": "graffiti-2.nancy.grid5000.fr",
@@ -777046,7 +777046,7 @@
       "finaud_decision": "NO",
       "gpu": 59,
       "gpu_count": 4,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "gpudevice": "2",
       "grub": null,
       "host": "graffiti-2.nancy.grid5000.fr",
@@ -777139,7 +777139,7 @@
       "finaud_decision": "NO",
       "gpu": 59,
       "gpu_count": 4,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "gpudevice": "2",
       "grub": null,
       "host": "graffiti-2.nancy.grid5000.fr",
@@ -777232,7 +777232,7 @@
       "finaud_decision": "NO",
       "gpu": 59,
       "gpu_count": 4,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "gpudevice": "2",
       "grub": null,
       "host": "graffiti-2.nancy.grid5000.fr",
@@ -777325,7 +777325,7 @@
       "finaud_decision": "NO",
       "gpu": 59,
       "gpu_count": 4,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "gpudevice": "2",
       "grub": null,
       "host": "graffiti-2.nancy.grid5000.fr",
@@ -777418,7 +777418,7 @@
       "finaud_decision": "NO",
       "gpu": 60,
       "gpu_count": 4,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "gpudevice": "3",
       "grub": null,
       "host": "graffiti-2.nancy.grid5000.fr",
@@ -777511,7 +777511,7 @@
       "finaud_decision": "NO",
       "gpu": 60,
       "gpu_count": 4,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "gpudevice": "3",
       "grub": null,
       "host": "graffiti-2.nancy.grid5000.fr",
@@ -777604,7 +777604,7 @@
       "finaud_decision": "NO",
       "gpu": 60,
       "gpu_count": 4,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "gpudevice": "3",
       "grub": null,
       "host": "graffiti-2.nancy.grid5000.fr",
@@ -777697,7 +777697,7 @@
       "finaud_decision": "NO",
       "gpu": 60,
       "gpu_count": 4,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "gpudevice": "3",
       "grub": null,
       "host": "graffiti-2.nancy.grid5000.fr",
@@ -777790,7 +777790,7 @@
       "finaud_decision": "NO",
       "gpu": 61,
       "gpu_count": 4,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "gpudevice": "0",
       "grub": null,
       "host": "graffiti-3.nancy.grid5000.fr",
@@ -777883,7 +777883,7 @@
       "finaud_decision": "NO",
       "gpu": 61,
       "gpu_count": 4,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "gpudevice": "0",
       "grub": null,
       "host": "graffiti-3.nancy.grid5000.fr",
@@ -777976,7 +777976,7 @@
       "finaud_decision": "NO",
       "gpu": 61,
       "gpu_count": 4,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "gpudevice": "0",
       "grub": null,
       "host": "graffiti-3.nancy.grid5000.fr",
@@ -778069,7 +778069,7 @@
       "finaud_decision": "NO",
       "gpu": 61,
       "gpu_count": 4,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "gpudevice": "0",
       "grub": null,
       "host": "graffiti-3.nancy.grid5000.fr",
@@ -778162,7 +778162,7 @@
       "finaud_decision": "NO",
       "gpu": 62,
       "gpu_count": 4,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "gpudevice": "1",
       "grub": null,
       "host": "graffiti-3.nancy.grid5000.fr",
@@ -778255,7 +778255,7 @@
       "finaud_decision": "NO",
       "gpu": 62,
       "gpu_count": 4,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "gpudevice": "1",
       "grub": null,
       "host": "graffiti-3.nancy.grid5000.fr",
@@ -778348,7 +778348,7 @@
       "finaud_decision": "NO",
       "gpu": 62,
       "gpu_count": 4,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "gpudevice": "1",
       "grub": null,
       "host": "graffiti-3.nancy.grid5000.fr",
@@ -778441,7 +778441,7 @@
       "finaud_decision": "NO",
       "gpu": 62,
       "gpu_count": 4,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "gpudevice": "1",
       "grub": null,
       "host": "graffiti-3.nancy.grid5000.fr",
@@ -778534,7 +778534,7 @@
       "finaud_decision": "NO",
       "gpu": 63,
       "gpu_count": 4,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "gpudevice": "2",
       "grub": null,
       "host": "graffiti-3.nancy.grid5000.fr",
@@ -778627,7 +778627,7 @@
       "finaud_decision": "NO",
       "gpu": 63,
       "gpu_count": 4,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "gpudevice": "2",
       "grub": null,
       "host": "graffiti-3.nancy.grid5000.fr",
@@ -778720,7 +778720,7 @@
       "finaud_decision": "NO",
       "gpu": 63,
       "gpu_count": 4,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "gpudevice": "2",
       "grub": null,
       "host": "graffiti-3.nancy.grid5000.fr",
@@ -778813,7 +778813,7 @@
       "finaud_decision": "NO",
       "gpu": 63,
       "gpu_count": 4,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "gpudevice": "2",
       "grub": null,
       "host": "graffiti-3.nancy.grid5000.fr",
@@ -778906,7 +778906,7 @@
       "finaud_decision": "NO",
       "gpu": 64,
       "gpu_count": 4,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "gpudevice": "3",
       "grub": null,
       "host": "graffiti-3.nancy.grid5000.fr",
@@ -778999,7 +778999,7 @@
       "finaud_decision": "NO",
       "gpu": 64,
       "gpu_count": 4,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "gpudevice": "3",
       "grub": null,
       "host": "graffiti-3.nancy.grid5000.fr",
@@ -779092,7 +779092,7 @@
       "finaud_decision": "NO",
       "gpu": 64,
       "gpu_count": 4,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "gpudevice": "3",
       "grub": null,
       "host": "graffiti-3.nancy.grid5000.fr",
@@ -779185,7 +779185,7 @@
       "finaud_decision": "NO",
       "gpu": 64,
       "gpu_count": 4,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "gpudevice": "3",
       "grub": null,
       "host": "graffiti-3.nancy.grid5000.fr",
@@ -779278,7 +779278,7 @@
       "finaud_decision": "NO",
       "gpu": 65,
       "gpu_count": 4,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "gpudevice": "0",
       "grub": null,
       "host": "graffiti-4.nancy.grid5000.fr",
@@ -779371,7 +779371,7 @@
       "finaud_decision": "NO",
       "gpu": 65,
       "gpu_count": 4,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "gpudevice": "0",
       "grub": null,
       "host": "graffiti-4.nancy.grid5000.fr",
@@ -779464,7 +779464,7 @@
       "finaud_decision": "NO",
       "gpu": 65,
       "gpu_count": 4,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "gpudevice": "0",
       "grub": null,
       "host": "graffiti-4.nancy.grid5000.fr",
@@ -779557,7 +779557,7 @@
       "finaud_decision": "NO",
       "gpu": 65,
       "gpu_count": 4,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "gpudevice": "0",
       "grub": null,
       "host": "graffiti-4.nancy.grid5000.fr",
@@ -779650,7 +779650,7 @@
       "finaud_decision": "NO",
       "gpu": 66,
       "gpu_count": 4,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "gpudevice": "1",
       "grub": null,
       "host": "graffiti-4.nancy.grid5000.fr",
@@ -779743,7 +779743,7 @@
       "finaud_decision": "NO",
       "gpu": 66,
       "gpu_count": 4,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "gpudevice": "1",
       "grub": null,
       "host": "graffiti-4.nancy.grid5000.fr",
@@ -779836,7 +779836,7 @@
       "finaud_decision": "NO",
       "gpu": 66,
       "gpu_count": 4,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "gpudevice": "1",
       "grub": null,
       "host": "graffiti-4.nancy.grid5000.fr",
@@ -779929,7 +779929,7 @@
       "finaud_decision": "NO",
       "gpu": 66,
       "gpu_count": 4,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "gpudevice": "1",
       "grub": null,
       "host": "graffiti-4.nancy.grid5000.fr",
@@ -780022,7 +780022,7 @@
       "finaud_decision": "NO",
       "gpu": 67,
       "gpu_count": 4,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "gpudevice": "2",
       "grub": null,
       "host": "graffiti-4.nancy.grid5000.fr",
@@ -780115,7 +780115,7 @@
       "finaud_decision": "NO",
       "gpu": 67,
       "gpu_count": 4,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "gpudevice": "2",
       "grub": null,
       "host": "graffiti-4.nancy.grid5000.fr",
@@ -780208,7 +780208,7 @@
       "finaud_decision": "NO",
       "gpu": 67,
       "gpu_count": 4,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "gpudevice": "2",
       "grub": null,
       "host": "graffiti-4.nancy.grid5000.fr",
@@ -780301,7 +780301,7 @@
       "finaud_decision": "NO",
       "gpu": 67,
       "gpu_count": 4,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "gpudevice": "2",
       "grub": null,
       "host": "graffiti-4.nancy.grid5000.fr",
@@ -780394,7 +780394,7 @@
       "finaud_decision": "NO",
       "gpu": 68,
       "gpu_count": 4,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "gpudevice": "3",
       "grub": null,
       "host": "graffiti-4.nancy.grid5000.fr",
@@ -780487,7 +780487,7 @@
       "finaud_decision": "NO",
       "gpu": 68,
       "gpu_count": 4,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "gpudevice": "3",
       "grub": null,
       "host": "graffiti-4.nancy.grid5000.fr",
@@ -780580,7 +780580,7 @@
       "finaud_decision": "NO",
       "gpu": 68,
       "gpu_count": 4,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "gpudevice": "3",
       "grub": null,
       "host": "graffiti-4.nancy.grid5000.fr",
@@ -780673,7 +780673,7 @@
       "finaud_decision": "NO",
       "gpu": 68,
       "gpu_count": 4,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "gpudevice": "3",
       "grub": null,
       "host": "graffiti-4.nancy.grid5000.fr",
@@ -780766,7 +780766,7 @@
       "finaud_decision": "NO",
       "gpu": 69,
       "gpu_count": 4,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "gpudevice": "0",
       "grub": null,
       "host": "graffiti-5.nancy.grid5000.fr",
@@ -780859,7 +780859,7 @@
       "finaud_decision": "NO",
       "gpu": 69,
       "gpu_count": 4,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "gpudevice": "0",
       "grub": null,
       "host": "graffiti-5.nancy.grid5000.fr",
@@ -780952,7 +780952,7 @@
       "finaud_decision": "NO",
       "gpu": 69,
       "gpu_count": 4,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "gpudevice": "0",
       "grub": null,
       "host": "graffiti-5.nancy.grid5000.fr",
@@ -781045,7 +781045,7 @@
       "finaud_decision": "NO",
       "gpu": 69,
       "gpu_count": 4,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "gpudevice": "0",
       "grub": null,
       "host": "graffiti-5.nancy.grid5000.fr",
@@ -781138,7 +781138,7 @@
       "finaud_decision": "NO",
       "gpu": 70,
       "gpu_count": 4,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "gpudevice": "1",
       "grub": null,
       "host": "graffiti-5.nancy.grid5000.fr",
@@ -781231,7 +781231,7 @@
       "finaud_decision": "NO",
       "gpu": 70,
       "gpu_count": 4,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "gpudevice": "1",
       "grub": null,
       "host": "graffiti-5.nancy.grid5000.fr",
@@ -781324,7 +781324,7 @@
       "finaud_decision": "NO",
       "gpu": 70,
       "gpu_count": 4,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "gpudevice": "1",
       "grub": null,
       "host": "graffiti-5.nancy.grid5000.fr",
@@ -781417,7 +781417,7 @@
       "finaud_decision": "NO",
       "gpu": 70,
       "gpu_count": 4,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "gpudevice": "1",
       "grub": null,
       "host": "graffiti-5.nancy.grid5000.fr",
@@ -781510,7 +781510,7 @@
       "finaud_decision": "NO",
       "gpu": 71,
       "gpu_count": 4,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "gpudevice": "2",
       "grub": null,
       "host": "graffiti-5.nancy.grid5000.fr",
@@ -781603,7 +781603,7 @@
       "finaud_decision": "NO",
       "gpu": 71,
       "gpu_count": 4,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "gpudevice": "2",
       "grub": null,
       "host": "graffiti-5.nancy.grid5000.fr",
@@ -781696,7 +781696,7 @@
       "finaud_decision": "NO",
       "gpu": 71,
       "gpu_count": 4,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "gpudevice": "2",
       "grub": null,
       "host": "graffiti-5.nancy.grid5000.fr",
@@ -781789,7 +781789,7 @@
       "finaud_decision": "NO",
       "gpu": 71,
       "gpu_count": 4,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "gpudevice": "2",
       "grub": null,
       "host": "graffiti-5.nancy.grid5000.fr",
@@ -781882,7 +781882,7 @@
       "finaud_decision": "NO",
       "gpu": 72,
       "gpu_count": 4,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "gpudevice": "3",
       "grub": null,
       "host": "graffiti-5.nancy.grid5000.fr",
@@ -781975,7 +781975,7 @@
       "finaud_decision": "NO",
       "gpu": 72,
       "gpu_count": 4,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "gpudevice": "3",
       "grub": null,
       "host": "graffiti-5.nancy.grid5000.fr",
@@ -782068,7 +782068,7 @@
       "finaud_decision": "NO",
       "gpu": 72,
       "gpu_count": 4,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "gpudevice": "3",
       "grub": null,
       "host": "graffiti-5.nancy.grid5000.fr",
@@ -782161,7 +782161,7 @@
       "finaud_decision": "NO",
       "gpu": 72,
       "gpu_count": 4,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "gpudevice": "3",
       "grub": null,
       "host": "graffiti-5.nancy.grid5000.fr",
@@ -782254,7 +782254,7 @@
       "finaud_decision": "NO",
       "gpu": 73,
       "gpu_count": 4,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "gpudevice": "0",
       "grub": null,
       "host": "graffiti-6.nancy.grid5000.fr",
@@ -782347,7 +782347,7 @@
       "finaud_decision": "NO",
       "gpu": 73,
       "gpu_count": 4,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "gpudevice": "0",
       "grub": null,
       "host": "graffiti-6.nancy.grid5000.fr",
@@ -782440,7 +782440,7 @@
       "finaud_decision": "NO",
       "gpu": 73,
       "gpu_count": 4,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "gpudevice": "0",
       "grub": null,
       "host": "graffiti-6.nancy.grid5000.fr",
@@ -782533,7 +782533,7 @@
       "finaud_decision": "NO",
       "gpu": 73,
       "gpu_count": 4,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "gpudevice": "0",
       "grub": null,
       "host": "graffiti-6.nancy.grid5000.fr",
@@ -782626,7 +782626,7 @@
       "finaud_decision": "NO",
       "gpu": 74,
       "gpu_count": 4,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "gpudevice": "1",
       "grub": null,
       "host": "graffiti-6.nancy.grid5000.fr",
@@ -782719,7 +782719,7 @@
       "finaud_decision": "NO",
       "gpu": 74,
       "gpu_count": 4,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "gpudevice": "1",
       "grub": null,
       "host": "graffiti-6.nancy.grid5000.fr",
@@ -782812,7 +782812,7 @@
       "finaud_decision": "NO",
       "gpu": 74,
       "gpu_count": 4,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "gpudevice": "1",
       "grub": null,
       "host": "graffiti-6.nancy.grid5000.fr",
@@ -782905,7 +782905,7 @@
       "finaud_decision": "NO",
       "gpu": 74,
       "gpu_count": 4,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "gpudevice": "1",
       "grub": null,
       "host": "graffiti-6.nancy.grid5000.fr",
@@ -782998,7 +782998,7 @@
       "finaud_decision": "NO",
       "gpu": 75,
       "gpu_count": 4,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "gpudevice": "2",
       "grub": null,
       "host": "graffiti-6.nancy.grid5000.fr",
@@ -783091,7 +783091,7 @@
       "finaud_decision": "NO",
       "gpu": 75,
       "gpu_count": 4,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "gpudevice": "2",
       "grub": null,
       "host": "graffiti-6.nancy.grid5000.fr",
@@ -783184,7 +783184,7 @@
       "finaud_decision": "NO",
       "gpu": 75,
       "gpu_count": 4,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "gpudevice": "2",
       "grub": null,
       "host": "graffiti-6.nancy.grid5000.fr",
@@ -783277,7 +783277,7 @@
       "finaud_decision": "NO",
       "gpu": 75,
       "gpu_count": 4,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "gpudevice": "2",
       "grub": null,
       "host": "graffiti-6.nancy.grid5000.fr",
@@ -783370,7 +783370,7 @@
       "finaud_decision": "NO",
       "gpu": 76,
       "gpu_count": 4,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "gpudevice": "3",
       "grub": null,
       "host": "graffiti-6.nancy.grid5000.fr",
@@ -783463,7 +783463,7 @@
       "finaud_decision": "NO",
       "gpu": 76,
       "gpu_count": 4,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "gpudevice": "3",
       "grub": null,
       "host": "graffiti-6.nancy.grid5000.fr",
@@ -783556,7 +783556,7 @@
       "finaud_decision": "NO",
       "gpu": 76,
       "gpu_count": 4,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "gpudevice": "3",
       "grub": null,
       "host": "graffiti-6.nancy.grid5000.fr",
@@ -783649,7 +783649,7 @@
       "finaud_decision": "NO",
       "gpu": 76,
       "gpu_count": 4,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "gpudevice": "3",
       "grub": null,
       "host": "graffiti-6.nancy.grid5000.fr",
@@ -783742,7 +783742,7 @@
       "finaud_decision": "NO",
       "gpu": 77,
       "gpu_count": 4,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "gpudevice": "0",
       "grub": null,
       "host": "graffiti-7.nancy.grid5000.fr",
@@ -783835,7 +783835,7 @@
       "finaud_decision": "NO",
       "gpu": 77,
       "gpu_count": 4,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "gpudevice": "0",
       "grub": null,
       "host": "graffiti-7.nancy.grid5000.fr",
@@ -783928,7 +783928,7 @@
       "finaud_decision": "NO",
       "gpu": 77,
       "gpu_count": 4,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "gpudevice": "0",
       "grub": null,
       "host": "graffiti-7.nancy.grid5000.fr",
@@ -784021,7 +784021,7 @@
       "finaud_decision": "NO",
       "gpu": 77,
       "gpu_count": 4,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "gpudevice": "0",
       "grub": null,
       "host": "graffiti-7.nancy.grid5000.fr",
@@ -784114,7 +784114,7 @@
       "finaud_decision": "NO",
       "gpu": 78,
       "gpu_count": 4,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "gpudevice": "1",
       "grub": null,
       "host": "graffiti-7.nancy.grid5000.fr",
@@ -784207,7 +784207,7 @@
       "finaud_decision": "NO",
       "gpu": 78,
       "gpu_count": 4,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "gpudevice": "1",
       "grub": null,
       "host": "graffiti-7.nancy.grid5000.fr",
@@ -784300,7 +784300,7 @@
       "finaud_decision": "NO",
       "gpu": 78,
       "gpu_count": 4,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "gpudevice": "1",
       "grub": null,
       "host": "graffiti-7.nancy.grid5000.fr",
@@ -784393,7 +784393,7 @@
       "finaud_decision": "NO",
       "gpu": 78,
       "gpu_count": 4,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "gpudevice": "1",
       "grub": null,
       "host": "graffiti-7.nancy.grid5000.fr",
@@ -784486,7 +784486,7 @@
       "finaud_decision": "NO",
       "gpu": 79,
       "gpu_count": 4,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "gpudevice": "2",
       "grub": null,
       "host": "graffiti-7.nancy.grid5000.fr",
@@ -784579,7 +784579,7 @@
       "finaud_decision": "NO",
       "gpu": 79,
       "gpu_count": 4,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "gpudevice": "2",
       "grub": null,
       "host": "graffiti-7.nancy.grid5000.fr",
@@ -784672,7 +784672,7 @@
       "finaud_decision": "NO",
       "gpu": 79,
       "gpu_count": 4,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "gpudevice": "2",
       "grub": null,
       "host": "graffiti-7.nancy.grid5000.fr",
@@ -784765,7 +784765,7 @@
       "finaud_decision": "NO",
       "gpu": 79,
       "gpu_count": 4,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "gpudevice": "2",
       "grub": null,
       "host": "graffiti-7.nancy.grid5000.fr",
@@ -784858,7 +784858,7 @@
       "finaud_decision": "NO",
       "gpu": 80,
       "gpu_count": 4,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "gpudevice": "3",
       "grub": null,
       "host": "graffiti-7.nancy.grid5000.fr",
@@ -784951,7 +784951,7 @@
       "finaud_decision": "NO",
       "gpu": 80,
       "gpu_count": 4,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "gpudevice": "3",
       "grub": null,
       "host": "graffiti-7.nancy.grid5000.fr",
@@ -785044,7 +785044,7 @@
       "finaud_decision": "NO",
       "gpu": 80,
       "gpu_count": 4,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "gpudevice": "3",
       "grub": null,
       "host": "graffiti-7.nancy.grid5000.fr",
@@ -785137,7 +785137,7 @@
       "finaud_decision": "NO",
       "gpu": 80,
       "gpu_count": 4,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "gpudevice": "3",
       "grub": null,
       "host": "graffiti-7.nancy.grid5000.fr",
@@ -785230,7 +785230,7 @@
       "finaud_decision": "NO",
       "gpu": 81,
       "gpu_count": 4,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "gpudevice": "0",
       "grub": null,
       "host": "graffiti-8.nancy.grid5000.fr",
@@ -785323,7 +785323,7 @@
       "finaud_decision": "NO",
       "gpu": 81,
       "gpu_count": 4,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "gpudevice": "0",
       "grub": null,
       "host": "graffiti-8.nancy.grid5000.fr",
@@ -785416,7 +785416,7 @@
       "finaud_decision": "NO",
       "gpu": 81,
       "gpu_count": 4,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "gpudevice": "0",
       "grub": null,
       "host": "graffiti-8.nancy.grid5000.fr",
@@ -785509,7 +785509,7 @@
       "finaud_decision": "NO",
       "gpu": 81,
       "gpu_count": 4,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "gpudevice": "0",
       "grub": null,
       "host": "graffiti-8.nancy.grid5000.fr",
@@ -785602,7 +785602,7 @@
       "finaud_decision": "NO",
       "gpu": 82,
       "gpu_count": 4,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "gpudevice": "1",
       "grub": null,
       "host": "graffiti-8.nancy.grid5000.fr",
@@ -785695,7 +785695,7 @@
       "finaud_decision": "NO",
       "gpu": 82,
       "gpu_count": 4,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "gpudevice": "1",
       "grub": null,
       "host": "graffiti-8.nancy.grid5000.fr",
@@ -785788,7 +785788,7 @@
       "finaud_decision": "NO",
       "gpu": 82,
       "gpu_count": 4,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "gpudevice": "1",
       "grub": null,
       "host": "graffiti-8.nancy.grid5000.fr",
@@ -785881,7 +785881,7 @@
       "finaud_decision": "NO",
       "gpu": 82,
       "gpu_count": 4,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "gpudevice": "1",
       "grub": null,
       "host": "graffiti-8.nancy.grid5000.fr",
@@ -785974,7 +785974,7 @@
       "finaud_decision": "NO",
       "gpu": 83,
       "gpu_count": 4,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "gpudevice": "2",
       "grub": null,
       "host": "graffiti-8.nancy.grid5000.fr",
@@ -786067,7 +786067,7 @@
       "finaud_decision": "NO",
       "gpu": 83,
       "gpu_count": 4,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "gpudevice": "2",
       "grub": null,
       "host": "graffiti-8.nancy.grid5000.fr",
@@ -786160,7 +786160,7 @@
       "finaud_decision": "NO",
       "gpu": 83,
       "gpu_count": 4,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "gpudevice": "2",
       "grub": null,
       "host": "graffiti-8.nancy.grid5000.fr",
@@ -786253,7 +786253,7 @@
       "finaud_decision": "NO",
       "gpu": 83,
       "gpu_count": 4,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "gpudevice": "2",
       "grub": null,
       "host": "graffiti-8.nancy.grid5000.fr",
@@ -786346,7 +786346,7 @@
       "finaud_decision": "NO",
       "gpu": 84,
       "gpu_count": 4,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "gpudevice": "3",
       "grub": null,
       "host": "graffiti-8.nancy.grid5000.fr",
@@ -786439,7 +786439,7 @@
       "finaud_decision": "NO",
       "gpu": 84,
       "gpu_count": 4,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "gpudevice": "3",
       "grub": null,
       "host": "graffiti-8.nancy.grid5000.fr",
@@ -786532,7 +786532,7 @@
       "finaud_decision": "NO",
       "gpu": 84,
       "gpu_count": 4,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "gpudevice": "3",
       "grub": null,
       "host": "graffiti-8.nancy.grid5000.fr",
@@ -786625,7 +786625,7 @@
       "finaud_decision": "NO",
       "gpu": 84,
       "gpu_count": 4,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "gpudevice": "3",
       "grub": null,
       "host": "graffiti-8.nancy.grid5000.fr",
@@ -786718,7 +786718,7 @@
       "finaud_decision": "NO",
       "gpu": 85,
       "gpu_count": 4,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "gpudevice": "0",
       "grub": null,
       "host": "graffiti-9.nancy.grid5000.fr",
@@ -786811,7 +786811,7 @@
       "finaud_decision": "NO",
       "gpu": 85,
       "gpu_count": 4,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "gpudevice": "0",
       "grub": null,
       "host": "graffiti-9.nancy.grid5000.fr",
@@ -786904,7 +786904,7 @@
       "finaud_decision": "NO",
       "gpu": 85,
       "gpu_count": 4,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "gpudevice": "0",
       "grub": null,
       "host": "graffiti-9.nancy.grid5000.fr",
@@ -786997,7 +786997,7 @@
       "finaud_decision": "NO",
       "gpu": 85,
       "gpu_count": 4,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "gpudevice": "0",
       "grub": null,
       "host": "graffiti-9.nancy.grid5000.fr",
@@ -787090,7 +787090,7 @@
       "finaud_decision": "NO",
       "gpu": 86,
       "gpu_count": 4,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "gpudevice": "1",
       "grub": null,
       "host": "graffiti-9.nancy.grid5000.fr",
@@ -787183,7 +787183,7 @@
       "finaud_decision": "NO",
       "gpu": 86,
       "gpu_count": 4,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "gpudevice": "1",
       "grub": null,
       "host": "graffiti-9.nancy.grid5000.fr",
@@ -787276,7 +787276,7 @@
       "finaud_decision": "NO",
       "gpu": 86,
       "gpu_count": 4,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "gpudevice": "1",
       "grub": null,
       "host": "graffiti-9.nancy.grid5000.fr",
@@ -787369,7 +787369,7 @@
       "finaud_decision": "NO",
       "gpu": 86,
       "gpu_count": 4,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "gpudevice": "1",
       "grub": null,
       "host": "graffiti-9.nancy.grid5000.fr",
@@ -787462,7 +787462,7 @@
       "finaud_decision": "NO",
       "gpu": 87,
       "gpu_count": 4,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "gpudevice": "2",
       "grub": null,
       "host": "graffiti-9.nancy.grid5000.fr",
@@ -787555,7 +787555,7 @@
       "finaud_decision": "NO",
       "gpu": 87,
       "gpu_count": 4,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "gpudevice": "2",
       "grub": null,
       "host": "graffiti-9.nancy.grid5000.fr",
@@ -787648,7 +787648,7 @@
       "finaud_decision": "NO",
       "gpu": 87,
       "gpu_count": 4,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "gpudevice": "2",
       "grub": null,
       "host": "graffiti-9.nancy.grid5000.fr",
@@ -787741,7 +787741,7 @@
       "finaud_decision": "NO",
       "gpu": 87,
       "gpu_count": 4,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "gpudevice": "2",
       "grub": null,
       "host": "graffiti-9.nancy.grid5000.fr",
@@ -787834,7 +787834,7 @@
       "finaud_decision": "NO",
       "gpu": 88,
       "gpu_count": 4,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "gpudevice": "3",
       "grub": null,
       "host": "graffiti-9.nancy.grid5000.fr",
@@ -787927,7 +787927,7 @@
       "finaud_decision": "NO",
       "gpu": 88,
       "gpu_count": 4,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "gpudevice": "3",
       "grub": null,
       "host": "graffiti-9.nancy.grid5000.fr",
@@ -788020,7 +788020,7 @@
       "finaud_decision": "NO",
       "gpu": 88,
       "gpu_count": 4,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "gpudevice": "3",
       "grub": null,
       "host": "graffiti-9.nancy.grid5000.fr",
@@ -788113,7 +788113,7 @@
       "finaud_decision": "NO",
       "gpu": 88,
       "gpu_count": 4,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "gpudevice": "3",
       "grub": null,
       "host": "graffiti-9.nancy.grid5000.fr",
@@ -788206,7 +788206,7 @@
       "finaud_decision": "NO",
       "gpu": 89,
       "gpu_count": 4,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "gpudevice": "0",
       "grub": null,
       "host": "graffiti-10.nancy.grid5000.fr",
@@ -788299,7 +788299,7 @@
       "finaud_decision": "NO",
       "gpu": 89,
       "gpu_count": 4,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "gpudevice": "0",
       "grub": null,
       "host": "graffiti-10.nancy.grid5000.fr",
@@ -788392,7 +788392,7 @@
       "finaud_decision": "NO",
       "gpu": 89,
       "gpu_count": 4,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "gpudevice": "0",
       "grub": null,
       "host": "graffiti-10.nancy.grid5000.fr",
@@ -788485,7 +788485,7 @@
       "finaud_decision": "NO",
       "gpu": 89,
       "gpu_count": 4,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "gpudevice": "0",
       "grub": null,
       "host": "graffiti-10.nancy.grid5000.fr",
@@ -788578,7 +788578,7 @@
       "finaud_decision": "NO",
       "gpu": 90,
       "gpu_count": 4,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "gpudevice": "1",
       "grub": null,
       "host": "graffiti-10.nancy.grid5000.fr",
@@ -788671,7 +788671,7 @@
       "finaud_decision": "NO",
       "gpu": 90,
       "gpu_count": 4,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "gpudevice": "1",
       "grub": null,
       "host": "graffiti-10.nancy.grid5000.fr",
@@ -788764,7 +788764,7 @@
       "finaud_decision": "NO",
       "gpu": 90,
       "gpu_count": 4,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "gpudevice": "1",
       "grub": null,
       "host": "graffiti-10.nancy.grid5000.fr",
@@ -788857,7 +788857,7 @@
       "finaud_decision": "NO",
       "gpu": 90,
       "gpu_count": 4,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "gpudevice": "1",
       "grub": null,
       "host": "graffiti-10.nancy.grid5000.fr",
@@ -788950,7 +788950,7 @@
       "finaud_decision": "NO",
       "gpu": 91,
       "gpu_count": 4,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "gpudevice": "2",
       "grub": null,
       "host": "graffiti-10.nancy.grid5000.fr",
@@ -789043,7 +789043,7 @@
       "finaud_decision": "NO",
       "gpu": 91,
       "gpu_count": 4,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "gpudevice": "2",
       "grub": null,
       "host": "graffiti-10.nancy.grid5000.fr",
@@ -789136,7 +789136,7 @@
       "finaud_decision": "NO",
       "gpu": 91,
       "gpu_count": 4,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "gpudevice": "2",
       "grub": null,
       "host": "graffiti-10.nancy.grid5000.fr",
@@ -789229,7 +789229,7 @@
       "finaud_decision": "NO",
       "gpu": 91,
       "gpu_count": 4,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "gpudevice": "2",
       "grub": null,
       "host": "graffiti-10.nancy.grid5000.fr",
@@ -789322,7 +789322,7 @@
       "finaud_decision": "NO",
       "gpu": 92,
       "gpu_count": 4,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "gpudevice": "3",
       "grub": null,
       "host": "graffiti-10.nancy.grid5000.fr",
@@ -789415,7 +789415,7 @@
       "finaud_decision": "NO",
       "gpu": 92,
       "gpu_count": 4,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "gpudevice": "3",
       "grub": null,
       "host": "graffiti-10.nancy.grid5000.fr",
@@ -789508,7 +789508,7 @@
       "finaud_decision": "NO",
       "gpu": 92,
       "gpu_count": 4,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "gpudevice": "3",
       "grub": null,
       "host": "graffiti-10.nancy.grid5000.fr",
@@ -789601,7 +789601,7 @@
       "finaud_decision": "NO",
       "gpu": 92,
       "gpu_count": 4,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "gpudevice": "3",
       "grub": null,
       "host": "graffiti-10.nancy.grid5000.fr",
@@ -789694,7 +789694,7 @@
       "finaud_decision": "NO",
       "gpu": 93,
       "gpu_count": 4,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "gpudevice": "0",
       "grub": null,
       "host": "graffiti-11.nancy.grid5000.fr",
@@ -789787,7 +789787,7 @@
       "finaud_decision": "NO",
       "gpu": 93,
       "gpu_count": 4,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "gpudevice": "0",
       "grub": null,
       "host": "graffiti-11.nancy.grid5000.fr",
@@ -789880,7 +789880,7 @@
       "finaud_decision": "NO",
       "gpu": 93,
       "gpu_count": 4,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "gpudevice": "0",
       "grub": null,
       "host": "graffiti-11.nancy.grid5000.fr",
@@ -789973,7 +789973,7 @@
       "finaud_decision": "NO",
       "gpu": 93,
       "gpu_count": 4,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "gpudevice": "0",
       "grub": null,
       "host": "graffiti-11.nancy.grid5000.fr",
@@ -790066,7 +790066,7 @@
       "finaud_decision": "NO",
       "gpu": 94,
       "gpu_count": 4,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "gpudevice": "1",
       "grub": null,
       "host": "graffiti-11.nancy.grid5000.fr",
@@ -790159,7 +790159,7 @@
       "finaud_decision": "NO",
       "gpu": 94,
       "gpu_count": 4,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "gpudevice": "1",
       "grub": null,
       "host": "graffiti-11.nancy.grid5000.fr",
@@ -790252,7 +790252,7 @@
       "finaud_decision": "NO",
       "gpu": 94,
       "gpu_count": 4,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "gpudevice": "1",
       "grub": null,
       "host": "graffiti-11.nancy.grid5000.fr",
@@ -790345,7 +790345,7 @@
       "finaud_decision": "NO",
       "gpu": 94,
       "gpu_count": 4,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "gpudevice": "1",
       "grub": null,
       "host": "graffiti-11.nancy.grid5000.fr",
@@ -790438,7 +790438,7 @@
       "finaud_decision": "NO",
       "gpu": 95,
       "gpu_count": 4,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "gpudevice": "2",
       "grub": null,
       "host": "graffiti-11.nancy.grid5000.fr",
@@ -790531,7 +790531,7 @@
       "finaud_decision": "NO",
       "gpu": 95,
       "gpu_count": 4,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "gpudevice": "2",
       "grub": null,
       "host": "graffiti-11.nancy.grid5000.fr",
@@ -790624,7 +790624,7 @@
       "finaud_decision": "NO",
       "gpu": 95,
       "gpu_count": 4,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "gpudevice": "2",
       "grub": null,
       "host": "graffiti-11.nancy.grid5000.fr",
@@ -790717,7 +790717,7 @@
       "finaud_decision": "NO",
       "gpu": 95,
       "gpu_count": 4,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "gpudevice": "2",
       "grub": null,
       "host": "graffiti-11.nancy.grid5000.fr",
@@ -790810,7 +790810,7 @@
       "finaud_decision": "NO",
       "gpu": 96,
       "gpu_count": 4,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "gpudevice": "3",
       "grub": null,
       "host": "graffiti-11.nancy.grid5000.fr",
@@ -790903,7 +790903,7 @@
       "finaud_decision": "NO",
       "gpu": 96,
       "gpu_count": 4,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "gpudevice": "3",
       "grub": null,
       "host": "graffiti-11.nancy.grid5000.fr",
@@ -790996,7 +790996,7 @@
       "finaud_decision": "NO",
       "gpu": 96,
       "gpu_count": 4,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "gpudevice": "3",
       "grub": null,
       "host": "graffiti-11.nancy.grid5000.fr",
@@ -791089,7 +791089,7 @@
       "finaud_decision": "NO",
       "gpu": 96,
       "gpu_count": 4,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "gpudevice": "3",
       "grub": null,
       "host": "graffiti-11.nancy.grid5000.fr",
@@ -791182,7 +791182,7 @@
       "finaud_decision": "NO",
       "gpu": 97,
       "gpu_count": 4,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "gpudevice": "0",
       "grub": null,
       "host": "graffiti-12.nancy.grid5000.fr",
@@ -791275,7 +791275,7 @@
       "finaud_decision": "NO",
       "gpu": 97,
       "gpu_count": 4,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "gpudevice": "0",
       "grub": null,
       "host": "graffiti-12.nancy.grid5000.fr",
@@ -791368,7 +791368,7 @@
       "finaud_decision": "NO",
       "gpu": 97,
       "gpu_count": 4,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "gpudevice": "0",
       "grub": null,
       "host": "graffiti-12.nancy.grid5000.fr",
@@ -791461,7 +791461,7 @@
       "finaud_decision": "NO",
       "gpu": 97,
       "gpu_count": 4,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "gpudevice": "0",
       "grub": null,
       "host": "graffiti-12.nancy.grid5000.fr",
@@ -791554,7 +791554,7 @@
       "finaud_decision": "NO",
       "gpu": 98,
       "gpu_count": 4,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "gpudevice": "1",
       "grub": null,
       "host": "graffiti-12.nancy.grid5000.fr",
@@ -791647,7 +791647,7 @@
       "finaud_decision": "NO",
       "gpu": 98,
       "gpu_count": 4,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "gpudevice": "1",
       "grub": null,
       "host": "graffiti-12.nancy.grid5000.fr",
@@ -791740,7 +791740,7 @@
       "finaud_decision": "NO",
       "gpu": 98,
       "gpu_count": 4,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "gpudevice": "1",
       "grub": null,
       "host": "graffiti-12.nancy.grid5000.fr",
@@ -791833,7 +791833,7 @@
       "finaud_decision": "NO",
       "gpu": 98,
       "gpu_count": 4,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "gpudevice": "1",
       "grub": null,
       "host": "graffiti-12.nancy.grid5000.fr",
@@ -791926,7 +791926,7 @@
       "finaud_decision": "NO",
       "gpu": 99,
       "gpu_count": 4,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "gpudevice": "2",
       "grub": null,
       "host": "graffiti-12.nancy.grid5000.fr",
@@ -792019,7 +792019,7 @@
       "finaud_decision": "NO",
       "gpu": 99,
       "gpu_count": 4,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "gpudevice": "2",
       "grub": null,
       "host": "graffiti-12.nancy.grid5000.fr",
@@ -792112,7 +792112,7 @@
       "finaud_decision": "NO",
       "gpu": 99,
       "gpu_count": 4,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "gpudevice": "2",
       "grub": null,
       "host": "graffiti-12.nancy.grid5000.fr",
@@ -792205,7 +792205,7 @@
       "finaud_decision": "NO",
       "gpu": 99,
       "gpu_count": 4,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "gpudevice": "2",
       "grub": null,
       "host": "graffiti-12.nancy.grid5000.fr",
@@ -792298,7 +792298,7 @@
       "finaud_decision": "NO",
       "gpu": 100,
       "gpu_count": 4,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "gpudevice": "3",
       "grub": null,
       "host": "graffiti-12.nancy.grid5000.fr",
@@ -792391,7 +792391,7 @@
       "finaud_decision": "NO",
       "gpu": 100,
       "gpu_count": 4,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "gpudevice": "3",
       "grub": null,
       "host": "graffiti-12.nancy.grid5000.fr",
@@ -792484,7 +792484,7 @@
       "finaud_decision": "NO",
       "gpu": 100,
       "gpu_count": 4,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "gpudevice": "3",
       "grub": null,
       "host": "graffiti-12.nancy.grid5000.fr",
@@ -792577,7 +792577,7 @@
       "finaud_decision": "NO",
       "gpu": 100,
       "gpu_count": 4,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "gpudevice": "3",
       "grub": null,
       "host": "graffiti-12.nancy.grid5000.fr",
@@ -792670,7 +792670,7 @@
       "finaud_decision": "NO",
       "gpu": 101,
       "gpu_count": 4,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "gpudevice": "0",
       "grub": null,
       "host": "graffiti-13.nancy.grid5000.fr",
@@ -792763,7 +792763,7 @@
       "finaud_decision": "NO",
       "gpu": 101,
       "gpu_count": 4,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "gpudevice": "0",
       "grub": null,
       "host": "graffiti-13.nancy.grid5000.fr",
@@ -792856,7 +792856,7 @@
       "finaud_decision": "NO",
       "gpu": 101,
       "gpu_count": 4,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "gpudevice": "0",
       "grub": null,
       "host": "graffiti-13.nancy.grid5000.fr",
@@ -792949,7 +792949,7 @@
       "finaud_decision": "NO",
       "gpu": 101,
       "gpu_count": 4,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "gpudevice": "0",
       "grub": null,
       "host": "graffiti-13.nancy.grid5000.fr",
@@ -793042,7 +793042,7 @@
       "finaud_decision": "NO",
       "gpu": 102,
       "gpu_count": 4,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "gpudevice": "1",
       "grub": null,
       "host": "graffiti-13.nancy.grid5000.fr",
@@ -793135,7 +793135,7 @@
       "finaud_decision": "NO",
       "gpu": 102,
       "gpu_count": 4,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "gpudevice": "1",
       "grub": null,
       "host": "graffiti-13.nancy.grid5000.fr",
@@ -793228,7 +793228,7 @@
       "finaud_decision": "NO",
       "gpu": 102,
       "gpu_count": 4,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "gpudevice": "1",
       "grub": null,
       "host": "graffiti-13.nancy.grid5000.fr",
@@ -793321,7 +793321,7 @@
       "finaud_decision": "NO",
       "gpu": 102,
       "gpu_count": 4,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "gpudevice": "1",
       "grub": null,
       "host": "graffiti-13.nancy.grid5000.fr",
@@ -793414,7 +793414,7 @@
       "finaud_decision": "NO",
       "gpu": 103,
       "gpu_count": 4,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "gpudevice": "2",
       "grub": null,
       "host": "graffiti-13.nancy.grid5000.fr",
@@ -793507,7 +793507,7 @@
       "finaud_decision": "NO",
       "gpu": 103,
       "gpu_count": 4,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "gpudevice": "2",
       "grub": null,
       "host": "graffiti-13.nancy.grid5000.fr",
@@ -793600,7 +793600,7 @@
       "finaud_decision": "NO",
       "gpu": 103,
       "gpu_count": 4,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "gpudevice": "2",
       "grub": null,
       "host": "graffiti-13.nancy.grid5000.fr",
@@ -793693,7 +793693,7 @@
       "finaud_decision": "NO",
       "gpu": 103,
       "gpu_count": 4,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "gpudevice": "2",
       "grub": null,
       "host": "graffiti-13.nancy.grid5000.fr",
@@ -793786,7 +793786,7 @@
       "finaud_decision": "NO",
       "gpu": 104,
       "gpu_count": 4,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "gpudevice": "3",
       "grub": null,
       "host": "graffiti-13.nancy.grid5000.fr",
@@ -793879,7 +793879,7 @@
       "finaud_decision": "NO",
       "gpu": 104,
       "gpu_count": 4,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "gpudevice": "3",
       "grub": null,
       "host": "graffiti-13.nancy.grid5000.fr",
@@ -793972,7 +793972,7 @@
       "finaud_decision": "NO",
       "gpu": 104,
       "gpu_count": 4,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "gpudevice": "3",
       "grub": null,
       "host": "graffiti-13.nancy.grid5000.fr",
@@ -794065,7 +794065,7 @@
       "finaud_decision": "NO",
       "gpu": 104,
       "gpu_count": 4,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "gpudevice": "3",
       "grub": null,
       "host": "graffiti-13.nancy.grid5000.fr",
diff --git a/spec/input/oar_misconfigured_gpu.json b/spec/input/oar_misconfigured_gpu.json
index cdf6fa0a0c0..4e5c1370478 100644
--- a/spec/input/oar_misconfigured_gpu.json
+++ b/spec/input/oar_misconfigured_gpu.json
@@ -54,7 +54,7 @@
       "gpu_count": 4,
       "cluster_priority": 201906,
       "ib_count": 0,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "mic": "NO",
       "switch": "gw-fakesite",
       "eth_count": 1,
@@ -140,7 +140,7 @@
       "eth_count": 1,
       "switch": "gw-fakesite",
       "mic": "NO",
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "ib_count": 0,
       "cluster_priority": 201906,
       "gpu_count": 4,
@@ -172,7 +172,7 @@
       "memcore": 8192,
       "cpufreq": "2.1",
       "mic": "NO",
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "ib_count": 0,
       "eth_count": 1,
       "switch": "gw-fakesite",
@@ -257,7 +257,7 @@
       "next_state": "UnChanged",
       "mic": "NO",
       "ib_count": 0,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "eth_count": 1,
       "switch": "gw-fakesite",
       "available_upto": 2147483647,
@@ -364,7 +364,7 @@
       "cpu": 1,
       "switch": "gw-fakesite",
       "eth_count": 1,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "ib_count": 0,
       "mic": "NO",
       "next_state": "UnChanged",
@@ -449,7 +449,7 @@
       "eth_count": 1,
       "switch": "gw-fakesite",
       "mic": "NO",
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "ib_count": 0
     },
     {
@@ -496,7 +496,7 @@
       "type": "default",
       "mic": "NO",
       "ib_count": 0,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "eth_count": 1,
       "switch": "gw-fakesite",
       "cpuarch": "x86_64",
@@ -582,7 +582,7 @@
       "switch": "gw-fakesite",
       "mic": "NO",
       "ib_count": 0,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "memcpu": 65536,
       "cpufreq": "2.1",
       "memcore": 8192,
@@ -654,7 +654,7 @@
       "gpu_count": 4,
       "cluster_priority": 201906,
       "ib_count": 0,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "mic": "NO",
       "switch": "gw-fakesite",
       "eth_count": 1,
@@ -706,7 +706,7 @@
       "cluster_priority": 201906,
       "gpu_count": 4,
       "ib_count": 0,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "mic": "NO",
       "switch": "gw-fakesite",
       "eth_count": 1,
@@ -782,7 +782,7 @@
       "next_state": "UnChanged",
       "mic": "NO",
       "ib_count": 0,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "eth_count": 1,
       "switch": "gw-fakesite",
       "available_upto": 2147483647,
@@ -840,7 +840,7 @@
       "switch": "gw-fakesite",
       "eth_count": 1,
       "ib_count": 0,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "mic": "NO",
       "cpufreq": "2.1",
       "memcore": 8192,
@@ -921,7 +921,7 @@
       "memcore": 8192,
       "cpufreq": "2.1",
       "memcpu": 65536,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "ib_count": 0,
       "mic": "NO",
       "switch": "gw-fakesite",
@@ -1029,7 +1029,7 @@
       "cluster_priority": 201906,
       "gpu_count": 4,
       "ib_count": 0,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "mic": "NO",
       "switch": "gw-fakesite",
       "eth_count": 1,
@@ -1084,7 +1084,7 @@
       "switch": "gw-fakesite",
       "mic": "NO",
       "ib_count": 0,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "opa_count": 0,
       "id": 15,
       "production": "YES",
@@ -1179,7 +1179,7 @@
       "maintenance": "NO",
       "next_state": "UnChanged",
       "mic": "NO",
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "ib_count": 0,
       "eth_count": 1,
       "switch": "gw-fakesite",
@@ -1214,7 +1214,7 @@
       "next_state": "UnChanged",
       "mic": "NO",
       "ib_count": 0,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "eth_count": 1,
       "switch": "gw-fakesite",
       "cpu": 3,
@@ -1298,7 +1298,7 @@
       "deploy": "NO",
       "mic": "NO",
       "ib_count": 0,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "eth_count": 1,
       "switch": "gw-fakesite",
       "cpuarch": "x86_64",
@@ -1414,7 +1414,7 @@
       "cpu": 3,
       "switch": "gw-fakesite",
       "eth_count": 1,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "ib_count": 0,
       "mic": "NO",
       "next_state": "UnChanged",
@@ -1471,7 +1471,7 @@
       "available_upto": 2147483647,
       "switch": "gw-fakesite",
       "eth_count": 1,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "ib_count": 0,
       "mic": "NO",
       "next_state": "UnChanged",
@@ -1515,7 +1515,7 @@
       "eth_count": 1,
       "switch": "gw-fakesite",
       "mic": "NO",
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "ib_count": 0,
       "memcpu": 65536,
       "deploy": "NO",
@@ -1649,7 +1649,7 @@
       "eth_count": 1,
       "switch": "gw-fakesite",
       "mic": "NO",
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "ib_count": 0
     },
     {
@@ -1663,7 +1663,7 @@
       "maintenance": "NO",
       "next_state": "UnChanged",
       "mic": "NO",
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "ib_count": 0,
       "eth_count": 1,
       "switch": "gw-fakesite",
@@ -1730,7 +1730,7 @@
     {
       "mic": "NO",
       "ib_count": 0,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "eth_count": 1,
       "switch": "gw-fakesite",
       "host": "clustera-2.fakesite.grid5000.fr",
@@ -1812,7 +1812,7 @@
       "gpu_count": 4,
       "cluster_priority": 201906,
       "maintenance": "NO",
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "ib_count": 0,
       "mic": "NO",
       "switch": "gw-fakesite",
@@ -1949,7 +1949,7 @@
       "eth_count": 1,
       "switch": "gw-fakesite",
       "mic": "NO",
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "ib_count": 0
     },
     {
@@ -2012,7 +2012,7 @@
       "memcore": 8192,
       "cpufreq": "2.1",
       "memcpu": 65536,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "ib_count": 0,
       "mic": "NO",
       "switch": "gw-fakesite",
@@ -2040,7 +2040,7 @@
       "switch": "gw-fakesite",
       "eth_count": 1,
       "ib_count": 0,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "mic": "NO",
       "cpufreq": "2.1",
       "memcore": 8192,
@@ -2131,7 +2131,7 @@
       "cluster_priority": 201906,
       "gpu_count": 4,
       "ib_count": 0,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "mic": "NO",
       "switch": "gw-fakesite",
       "eth_count": 1,
@@ -2222,7 +2222,7 @@
       "eth_count": 1,
       "switch": "gw-fakesite",
       "mic": "NO",
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "ib_count": 0,
       "gpu_count": 4,
       "cluster_priority": 201906,
@@ -2280,7 +2280,7 @@
       "gpu_count": 4,
       "cluster_priority": 201906,
       "maintenance": "NO",
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "ib_count": 0,
       "mic": "NO",
       "switch": "gw-fakesite",
@@ -2331,7 +2331,7 @@
       "switch": "gw-fakesite",
       "eth_count": 1,
       "ib_count": 0,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "mic": "NO",
       "next_state": "UnChanged",
       "maintenance": "NO",
diff --git a/spec/input/oar_misconfigured_non_reservable_gpu.json b/spec/input/oar_misconfigured_non_reservable_gpu.json
index cdf6fa0a0c0..4e5c1370478 100644
--- a/spec/input/oar_misconfigured_non_reservable_gpu.json
+++ b/spec/input/oar_misconfigured_non_reservable_gpu.json
@@ -54,7 +54,7 @@
       "gpu_count": 4,
       "cluster_priority": 201906,
       "ib_count": 0,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "mic": "NO",
       "switch": "gw-fakesite",
       "eth_count": 1,
@@ -140,7 +140,7 @@
       "eth_count": 1,
       "switch": "gw-fakesite",
       "mic": "NO",
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "ib_count": 0,
       "cluster_priority": 201906,
       "gpu_count": 4,
@@ -172,7 +172,7 @@
       "memcore": 8192,
       "cpufreq": "2.1",
       "mic": "NO",
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "ib_count": 0,
       "eth_count": 1,
       "switch": "gw-fakesite",
@@ -257,7 +257,7 @@
       "next_state": "UnChanged",
       "mic": "NO",
       "ib_count": 0,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "eth_count": 1,
       "switch": "gw-fakesite",
       "available_upto": 2147483647,
@@ -364,7 +364,7 @@
       "cpu": 1,
       "switch": "gw-fakesite",
       "eth_count": 1,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "ib_count": 0,
       "mic": "NO",
       "next_state": "UnChanged",
@@ -449,7 +449,7 @@
       "eth_count": 1,
       "switch": "gw-fakesite",
       "mic": "NO",
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "ib_count": 0
     },
     {
@@ -496,7 +496,7 @@
       "type": "default",
       "mic": "NO",
       "ib_count": 0,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "eth_count": 1,
       "switch": "gw-fakesite",
       "cpuarch": "x86_64",
@@ -582,7 +582,7 @@
       "switch": "gw-fakesite",
       "mic": "NO",
       "ib_count": 0,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "memcpu": 65536,
       "cpufreq": "2.1",
       "memcore": 8192,
@@ -654,7 +654,7 @@
       "gpu_count": 4,
       "cluster_priority": 201906,
       "ib_count": 0,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "mic": "NO",
       "switch": "gw-fakesite",
       "eth_count": 1,
@@ -706,7 +706,7 @@
       "cluster_priority": 201906,
       "gpu_count": 4,
       "ib_count": 0,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "mic": "NO",
       "switch": "gw-fakesite",
       "eth_count": 1,
@@ -782,7 +782,7 @@
       "next_state": "UnChanged",
       "mic": "NO",
       "ib_count": 0,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "eth_count": 1,
       "switch": "gw-fakesite",
       "available_upto": 2147483647,
@@ -840,7 +840,7 @@
       "switch": "gw-fakesite",
       "eth_count": 1,
       "ib_count": 0,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "mic": "NO",
       "cpufreq": "2.1",
       "memcore": 8192,
@@ -921,7 +921,7 @@
       "memcore": 8192,
       "cpufreq": "2.1",
       "memcpu": 65536,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "ib_count": 0,
       "mic": "NO",
       "switch": "gw-fakesite",
@@ -1029,7 +1029,7 @@
       "cluster_priority": 201906,
       "gpu_count": 4,
       "ib_count": 0,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "mic": "NO",
       "switch": "gw-fakesite",
       "eth_count": 1,
@@ -1084,7 +1084,7 @@
       "switch": "gw-fakesite",
       "mic": "NO",
       "ib_count": 0,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "opa_count": 0,
       "id": 15,
       "production": "YES",
@@ -1179,7 +1179,7 @@
       "maintenance": "NO",
       "next_state": "UnChanged",
       "mic": "NO",
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "ib_count": 0,
       "eth_count": 1,
       "switch": "gw-fakesite",
@@ -1214,7 +1214,7 @@
       "next_state": "UnChanged",
       "mic": "NO",
       "ib_count": 0,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "eth_count": 1,
       "switch": "gw-fakesite",
       "cpu": 3,
@@ -1298,7 +1298,7 @@
       "deploy": "NO",
       "mic": "NO",
       "ib_count": 0,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "eth_count": 1,
       "switch": "gw-fakesite",
       "cpuarch": "x86_64",
@@ -1414,7 +1414,7 @@
       "cpu": 3,
       "switch": "gw-fakesite",
       "eth_count": 1,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "ib_count": 0,
       "mic": "NO",
       "next_state": "UnChanged",
@@ -1471,7 +1471,7 @@
       "available_upto": 2147483647,
       "switch": "gw-fakesite",
       "eth_count": 1,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "ib_count": 0,
       "mic": "NO",
       "next_state": "UnChanged",
@@ -1515,7 +1515,7 @@
       "eth_count": 1,
       "switch": "gw-fakesite",
       "mic": "NO",
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "ib_count": 0,
       "memcpu": 65536,
       "deploy": "NO",
@@ -1649,7 +1649,7 @@
       "eth_count": 1,
       "switch": "gw-fakesite",
       "mic": "NO",
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "ib_count": 0
     },
     {
@@ -1663,7 +1663,7 @@
       "maintenance": "NO",
       "next_state": "UnChanged",
       "mic": "NO",
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "ib_count": 0,
       "eth_count": 1,
       "switch": "gw-fakesite",
@@ -1730,7 +1730,7 @@
     {
       "mic": "NO",
       "ib_count": 0,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "eth_count": 1,
       "switch": "gw-fakesite",
       "host": "clustera-2.fakesite.grid5000.fr",
@@ -1812,7 +1812,7 @@
       "gpu_count": 4,
       "cluster_priority": 201906,
       "maintenance": "NO",
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "ib_count": 0,
       "mic": "NO",
       "switch": "gw-fakesite",
@@ -1949,7 +1949,7 @@
       "eth_count": 1,
       "switch": "gw-fakesite",
       "mic": "NO",
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "ib_count": 0
     },
     {
@@ -2012,7 +2012,7 @@
       "memcore": 8192,
       "cpufreq": "2.1",
       "memcpu": 65536,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "ib_count": 0,
       "mic": "NO",
       "switch": "gw-fakesite",
@@ -2040,7 +2040,7 @@
       "switch": "gw-fakesite",
       "eth_count": 1,
       "ib_count": 0,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "mic": "NO",
       "cpufreq": "2.1",
       "memcore": 8192,
@@ -2131,7 +2131,7 @@
       "cluster_priority": 201906,
       "gpu_count": 4,
       "ib_count": 0,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "mic": "NO",
       "switch": "gw-fakesite",
       "eth_count": 1,
@@ -2222,7 +2222,7 @@
       "eth_count": 1,
       "switch": "gw-fakesite",
       "mic": "NO",
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "ib_count": 0,
       "gpu_count": 4,
       "cluster_priority": 201906,
@@ -2280,7 +2280,7 @@
       "gpu_count": 4,
       "cluster_priority": 201906,
       "maintenance": "NO",
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "ib_count": 0,
       "mic": "NO",
       "switch": "gw-fakesite",
@@ -2331,7 +2331,7 @@
       "switch": "gw-fakesite",
       "eth_count": 1,
       "ib_count": 0,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "mic": "NO",
       "next_state": "UnChanged",
       "maintenance": "NO",
diff --git a/spec/input/oar_missing_property.json b/spec/input/oar_missing_property.json
index 63637501f64..d111f5c5586 100644
--- a/spec/input/oar_missing_property.json
+++ b/spec/input/oar_missing_property.json
@@ -54,7 +54,7 @@
       "gpu_count": 4,
       "cluster_priority": 201906,
       "ib_count": 0,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "mic": "NO",
       "switch": "gw-fakesite",
       "eth_count": 1,
@@ -141,7 +141,7 @@
       "eth_count": 1,
       "switch": "gw-fakesite",
       "mic": "NO",
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "ib_count": 0,
       "cluster_priority": 201906,
       "gpu_count": 4,
@@ -175,7 +175,7 @@
       "cpufreq": "2.1",
       "exotic" : "NO",
       "mic": "NO",
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "ib_count": 0,
       "eth_count": 1,
       "switch": "gw-fakesite",
@@ -262,7 +262,7 @@
       "next_state": "UnChanged",
       "mic": "NO",
       "ib_count": 0,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "eth_count": 1,
       "switch": "gw-fakesite",
       "available_upto": 2147483647,
@@ -368,7 +368,7 @@
       "cpu": 1,
       "switch": "gw-fakesite",
       "eth_count": 1,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "ib_count": 0,
       "mic": "NO",
       "next_state": "UnChanged",
@@ -454,7 +454,7 @@
       "eth_count": 1,
       "switch": "gw-fakesite",
       "mic": "NO",
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "ib_count": 0
     },
     {
@@ -500,7 +500,7 @@
       "type": "default",
       "mic": "NO",
       "ib_count": 0,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "eth_count": 1,
       "switch": "gw-fakesite",
       "cpuarch": "x86_64",
@@ -588,7 +588,7 @@
       "switch": "gw-fakesite",
       "mic": "NO",
       "ib_count": 0,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "memcpu": 65536,
       "cpufreq": "2.1",
       "exotic" : "NO",
@@ -661,7 +661,7 @@
       "gpu_count": 4,
       "cluster_priority": 201906,
       "ib_count": 0,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "mic": "NO",
       "switch": "gw-fakesite",
       "eth_count": 1,
@@ -716,7 +716,7 @@
       "cluster_priority": 201906,
       "gpu_count": 4,
       "ib_count": 0,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "mic": "NO",
       "switch": "gw-fakesite",
       "eth_count": 1,
@@ -793,7 +793,7 @@
       "next_state": "UnChanged",
       "mic": "NO",
       "ib_count": 0,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "eth_count": 1,
       "switch": "gw-fakesite",
       "available_upto": 2147483647,
@@ -851,7 +851,7 @@
       "switch": "gw-fakesite",
       "eth_count": 1,
       "ib_count": 0,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "mic": "NO",
       "cpufreq": "2.1",
       "exotic" : "NO",
@@ -933,7 +933,7 @@
       "cpufreq": "2.1",
       "exotic" : "NO",
       "memcpu": 65536,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "ib_count": 0,
       "mic": "NO",
       "switch": "gw-fakesite",
@@ -1043,7 +1043,7 @@
       "cluster_priority": 201906,
       "gpu_count": 4,
       "ib_count": 0,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "mic": "NO",
       "switch": "gw-fakesite",
       "eth_count": 1,
@@ -1101,7 +1101,7 @@
       "switch": "gw-fakesite",
       "mic": "NO",
       "ib_count": 0,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "opa_count": 0,
       "id": 15,
       "production": "YES",
@@ -1197,7 +1197,7 @@
       "maintenance": "NO",
       "next_state": "UnChanged",
       "mic": "NO",
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "ib_count": 0,
       "eth_count": 1,
       "switch": "gw-fakesite",
@@ -1234,7 +1234,7 @@
       "next_state": "UnChanged",
       "mic": "NO",
       "ib_count": 0,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "eth_count": 1,
       "switch": "gw-fakesite",
       "cpu": 3,
@@ -1320,7 +1320,7 @@
       "deploy": "YES",
       "mic": "NO",
       "ib_count": 0,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "eth_count": 1,
       "switch": "gw-fakesite",
       "cpuarch": "x86_64",
@@ -1438,7 +1438,7 @@
       "cpu": 3,
       "switch": "gw-fakesite",
       "eth_count": 1,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "ib_count": 0,
       "mic": "NO",
       "next_state": "UnChanged",
@@ -1496,7 +1496,7 @@
       "available_upto": 2147483647,
       "switch": "gw-fakesite",
       "eth_count": 1,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "ib_count": 0,
       "mic": "NO",
       "next_state": "UnChanged",
@@ -1543,7 +1543,7 @@
       "eth_count": 1,
       "switch": "gw-fakesite",
       "mic": "NO",
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "ib_count": 0,
       "memcpu": 65536,
       "deploy": "YES",
@@ -1680,7 +1680,7 @@
       "eth_count": 1,
       "switch": "gw-fakesite",
       "mic": "NO",
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "ib_count": 0
     },
     {
@@ -1695,7 +1695,7 @@
       "maintenance": "NO",
       "next_state": "UnChanged",
       "mic": "NO",
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "ib_count": 0,
       "eth_count": 1,
       "switch": "gw-fakesite",
@@ -1763,7 +1763,7 @@
     {
       "mic": "NO",
       "ib_count": 0,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "eth_count": 1,
       "switch": "gw-fakesite",
       "host": "clustera-2.fakesite.grid5000.fr",
@@ -1848,7 +1848,7 @@
       "gpu_count": 4,
       "cluster_priority": 201906,
       "maintenance": "NO",
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "ib_count": 0,
       "mic": "NO",
       "switch": "gw-fakesite",
@@ -1988,7 +1988,7 @@
       "eth_count": 1,
       "switch": "gw-fakesite",
       "mic": "NO",
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "ib_count": 0
     },
     {
@@ -2052,7 +2052,7 @@
       "cpufreq": "2.1",
       "exotic" : "NO",
       "memcpu": 65536,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "ib_count": 0,
       "mic": "NO",
       "switch": "gw-fakesite",
@@ -2082,7 +2082,7 @@
       "switch": "gw-fakesite",
       "eth_count": 1,
       "ib_count": 0,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "mic": "NO",
       "cpufreq": "2.1",
       "exotic" : "NO",
@@ -2176,7 +2176,7 @@
       "cluster_priority": 201906,
       "gpu_count": 4,
       "ib_count": 0,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "mic": "NO",
       "switch": "gw-fakesite",
       "eth_count": 1,
@@ -2267,7 +2267,7 @@
       "eth_count": 1,
       "switch": "gw-fakesite",
       "mic": "NO",
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "ib_count": 0,
       "gpu_count": 4,
       "cluster_priority": 201906,
@@ -2329,7 +2329,7 @@
       "gpu_count": 4,
       "cluster_priority": 201906,
       "maintenance": "NO",
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "ib_count": 0,
       "mic": "NO",
       "switch": "gw-fakesite",
@@ -2380,7 +2380,7 @@
       "switch": "gw-fakesite",
       "eth_count": 1,
       "ib_count": 0,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "mic": "NO",
       "next_state": "UnChanged",
       "maintenance": "NO",
diff --git a/spec/input/oar_to_test_diff.json b/spec/input/oar_to_test_diff.json
index cc8fbfe05bc..a9f8eefaedf 100644
--- a/spec/input/oar_to_test_diff.json
+++ b/spec/input/oar_to_test_diff.json
@@ -54,7 +54,7 @@
       "gpu_count": 4,
       "cluster_priority": 201906,
       "ib_count": 0,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "mic": "NO",
       "switch": "gw-fakesite",
       "eth_count": 1,
@@ -140,7 +140,7 @@
       "eth_count": 1,
       "switch": "gw-fakesite",
       "mic": "NO",
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "ib_count": 0,
       "cluster_priority": 201906,
       "gpu_count": 4,
@@ -172,7 +172,7 @@
       "memcore": 8192,
       "cpufreq": "2.1",
       "mic": "NO",
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "ib_count": 0,
       "eth_count": 1,
       "switch": "gw-fakesite",
@@ -257,7 +257,7 @@
       "next_state": "UnChanged",
       "mic": "NO",
       "ib_count": 0,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "eth_count": 1,
       "switch": "gw-fakesite",
       "available_upto": 2147483647,
@@ -364,7 +364,7 @@
       "cpu": 1,
       "switch": "gw-fakesite",
       "eth_count": 1,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "ib_count": 0,
       "mic": "NO",
       "next_state": "UnChanged",
@@ -449,7 +449,7 @@
       "eth_count": 1,
       "switch": "gw-fakesite",
       "mic": "NO",
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "ib_count": 0
     },
     {
@@ -496,7 +496,7 @@
       "type": "default",
       "mic": "NO",
       "ib_count": 0,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "eth_count": 1,
       "switch": "gw-fakesite",
       "cpuarch": "x86_64",
@@ -582,7 +582,7 @@
       "switch": "gw-fakesite",
       "mic": "NO",
       "ib_count": 0,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "memcpu": 65536,
       "cpufreq": "2.1",
       "memcore": 8192,
@@ -654,7 +654,7 @@
       "gpu_count": 4,
       "cluster_priority": 201906,
       "ib_count": 0,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "mic": "NO",
       "switch": "gw-fakesite",
       "eth_count": 1,
@@ -706,7 +706,7 @@
       "cluster_priority": 201906,
       "gpu_count": 4,
       "ib_count": 0,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "mic": "NO",
       "switch": "gw-fakesite",
       "eth_count": 1,
@@ -782,7 +782,7 @@
       "next_state": "UnChanged",
       "mic": "NO",
       "ib_count": 0,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "eth_count": 1,
       "switch": "gw-fakesite",
       "available_upto": 2147483647,
@@ -840,7 +840,7 @@
       "switch": "gw-fakesite",
       "eth_count": 1,
       "ib_count": 0,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "mic": "NO",
       "cpufreq": "2.1",
       "memcore": 8192,
@@ -921,7 +921,7 @@
       "memcore": 8192,
       "cpufreq": "2.1",
       "memcpu": 65536,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "ib_count": 0,
       "mic": "NO",
       "switch": "gw-fakesite",
@@ -1029,7 +1029,7 @@
       "cluster_priority": 201906,
       "gpu_count": 4,
       "ib_count": 0,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "mic": "NO",
       "switch": "gw-fakesite",
       "eth_count": 1,
@@ -1084,7 +1084,7 @@
       "switch": "gw-fakesite",
       "mic": "NO",
       "ib_count": 0,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "opa_count": 0,
       "id": 15,
       "production": "YES",
@@ -1179,7 +1179,7 @@
       "maintenance": "NO",
       "next_state": "UnChanged",
       "mic": "NO",
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "ib_count": 0,
       "eth_count": 1,
       "switch": "gw-fakesite",
@@ -1214,7 +1214,7 @@
       "next_state": "UnChanged",
       "mic": "NO",
       "ib_count": 0,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "eth_count": 1,
       "switch": "gw-fakesite",
       "cpu": 3,
@@ -1298,7 +1298,7 @@
       "deploy": "NO",
       "mic": "NO",
       "ib_count": 0,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "eth_count": 1,
       "switch": "gw-fakesite",
       "cpuarch": "x86_64",
@@ -1414,7 +1414,7 @@
       "cpu": 3,
       "switch": "gw-fakesite",
       "eth_count": 1,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "ib_count": 0,
       "mic": "NO",
       "next_state": "UnChanged",
@@ -1471,7 +1471,7 @@
       "available_upto": 2147483647,
       "switch": "gw-fakesite",
       "eth_count": 1,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "ib_count": 0,
       "mic": "NO",
       "next_state": "UnChanged",
@@ -1515,7 +1515,7 @@
       "eth_count": 1,
       "switch": "gw-fakesite",
       "mic": "NO",
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "ib_count": 0,
       "memcpu": 65536,
       "deploy": "NO",
@@ -1649,7 +1649,7 @@
       "eth_count": 1,
       "switch": "gw-fakesite",
       "mic": "NO",
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "ib_count": 0
     },
     {
@@ -1663,7 +1663,7 @@
       "maintenance": "NO",
       "next_state": "UnChanged",
       "mic": "NO",
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "ib_count": 0,
       "eth_count": 1,
       "switch": "gw-fakesite",
@@ -1730,7 +1730,7 @@
     {
       "mic": "NO",
       "ib_count": 0,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "eth_count": 1,
       "switch": "gw-fakesite",
       "host": "clustera-2.fakesite.grid5000.fr",
@@ -1812,7 +1812,7 @@
       "gpu_count": 4,
       "cluster_priority": 201906,
       "maintenance": "NO",
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "ib_count": 0,
       "mic": "NO",
       "switch": "gw-fakesite",
@@ -1949,7 +1949,7 @@
       "eth_count": 1,
       "switch": "gw-fakesite",
       "mic": "NO",
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "ib_count": 0
     },
     {
@@ -2012,7 +2012,7 @@
       "memcore": 8192,
       "cpufreq": "2.1",
       "memcpu": 65536,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "ib_count": 0,
       "mic": "NO",
       "switch": "gw-fakesite",
@@ -2040,7 +2040,7 @@
       "switch": "gw-fakesite",
       "eth_count": 1,
       "ib_count": 0,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "mic": "NO",
       "cpufreq": "2.1",
       "memcore": 8192,
@@ -2131,7 +2131,7 @@
       "cluster_priority": 201906,
       "gpu_count": 4,
       "ib_count": 0,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "mic": "NO",
       "switch": "gw-fakesite",
       "eth_count": 1,
@@ -2222,7 +2222,7 @@
       "eth_count": 1,
       "switch": "gw-fakesite",
       "mic": "NO",
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "ib_count": 0,
       "gpu_count": 4,
       "cluster_priority": 201906,
@@ -2280,7 +2280,7 @@
       "gpu_count": 4,
       "cluster_priority": 201906,
       "maintenance": "NO",
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "ib_count": 0,
       "mic": "NO",
       "switch": "gw-fakesite",
@@ -2331,7 +2331,7 @@
       "switch": "gw-fakesite",
       "eth_count": 1,
       "ib_count": 0,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "mic": "NO",
       "next_state": "UnChanged",
       "maintenance": "NO",
diff --git a/spec/input/oar_with_disk.json b/spec/input/oar_with_disk.json
index 518e9756374..f4a54819160 100644
--- a/spec/input/oar_with_disk.json
+++ b/spec/input/oar_with_disk.json
@@ -50,7 +50,7 @@
          "disk" : null,
          "next_finaud_decision" : "NO",
          "ib_rate" : 0,
-         "gpu_model" : "GeForce RTX 2080 Ti",
+         "gpu_model" : "NVIDIA GeForce RTX 2080 Ti",
          "gpu" : 1,
          "finaud_decision" : "NO",
          "eth_rate" : 10,
@@ -112,7 +112,7 @@
          "cputype" : "Intel Xeon Silver 4110",
          "disk" : null,
          "next_finaud_decision" : "NO",
-         "gpu_model" : "GeForce RTX 2080 Ti",
+         "gpu_model" : "NVIDIA GeForce RTX 2080 Ti",
          "ib_rate" : 0,
          "switch" : null,
          "diskpath" : null,
@@ -211,7 +211,7 @@
          "next_finaud_decision" : "NO",
          "disk" : null,
          "cputype" : "Intel Xeon Silver 4110",
-         "gpu_model" : "GeForce RTX 2080 Ti",
+         "gpu_model" : "NVIDIA GeForce RTX 2080 Ti",
          "ib_rate" : 0,
          "gpu" : 1,
          "finaud_decision" : "NO",
@@ -247,7 +247,7 @@
          "disk" : null,
          "next_finaud_decision" : "NO",
          "ib_rate" : 0,
-         "gpu_model" : "GeForce RTX 2080 Ti",
+         "gpu_model" : "NVIDIA GeForce RTX 2080 Ti",
          "wattmeter" : "MULTIPLE",
          "last_available_upto" : 0,
          "maintenance" : "NO",
@@ -320,7 +320,7 @@
          "network_address" : "clusterb-1.fakesite.grid5000.fr"
       },
       {
-         "gpu_model" : "GeForce RTX 2080 Ti",
+         "gpu_model" : "NVIDIA GeForce RTX 2080 Ti",
          "ib_rate" : 0,
          "disk" : null,
          "next_finaud_decision" : "NO",
@@ -418,7 +418,7 @@
          "switch" : null,
          "diskpath" : null,
          "ib_rate" : 0,
-         "gpu_model" : "GeForce RTX 2080 Ti",
+         "gpu_model" : "NVIDIA GeForce RTX 2080 Ti",
          "disk" : null,
          "cputype" : "Intel Xeon Silver 4110",
          "next_finaud_decision" : "NO",
@@ -525,7 +525,7 @@
          "diskpath" : null,
          "switch" : null,
          "ib_rate" : 0,
-         "gpu_model" : "GeForce RTX 2080 Ti",
+         "gpu_model" : "NVIDIA GeForce RTX 2080 Ti",
          "disk" : null,
          "cputype" : "Intel Xeon Silver 4110",
          "next_finaud_decision" : "NO",
@@ -577,7 +577,7 @@
          "scheduler_priority" : 0,
          "gpu" : 2,
          "finaud_decision" : "NO",
-         "gpu_model" : "GeForce RTX 2080 Ti",
+         "gpu_model" : "NVIDIA GeForce RTX 2080 Ti",
          "ib_rate" : 0,
          "disk" : null,
          "cputype" : "Intel Xeon Silver 4110",
@@ -688,7 +688,7 @@
          "cluster_priority" : 201906,
          "wattmeter" : "MULTIPLE",
          "last_available_upto" : 0,
-         "gpu_model" : "GeForce RTX 2080 Ti",
+         "gpu_model" : "NVIDIA GeForce RTX 2080 Ti",
          "ib_rate" : 0,
          "disk" : null,
          "next_finaud_decision" : "NO",
@@ -716,7 +716,7 @@
       },
       {
          "ib_rate" : 0,
-         "gpu_model" : "GeForce RTX 2080 Ti",
+         "gpu_model" : "NVIDIA GeForce RTX 2080 Ti",
          "cputype" : "Intel Xeon Silver 4110",
          "disk" : null,
          "next_finaud_decision" : "NO",
@@ -841,7 +841,7 @@
          "disk" : null,
          "cputype" : "Intel Xeon Silver 4110",
          "next_finaud_decision" : "NO",
-         "gpu_model" : "GeForce RTX 2080 Ti",
+         "gpu_model" : "NVIDIA GeForce RTX 2080 Ti",
          "ib_rate" : 0,
          "ib_count" : 0,
          "expiry_date" : 0,
@@ -915,7 +915,7 @@
          ],
          "wattmeter" : "MULTIPLE",
          "last_available_upto" : 0,
-         "gpu_model" : "GeForce RTX 2080 Ti",
+         "gpu_model" : "NVIDIA GeForce RTX 2080 Ti",
          "ib_rate" : 0,
          "disk" : null,
          "next_finaud_decision" : "NO",
@@ -973,7 +973,7 @@
          "finaud_decision" : "NO",
          "gpu" : 4,
          "ib_rate" : 0,
-         "gpu_model" : "GeForce RTX 2080 Ti",
+         "gpu_model" : "NVIDIA GeForce RTX 2080 Ti",
          "next_finaud_decision" : "NO",
          "disk" : null,
          "cputype" : "Intel Xeon Silver 4110",
@@ -1033,7 +1033,7 @@
       {
          "finaud_decision" : "NO",
          "gpu" : 4,
-         "gpu_model" : "GeForce RTX 2080 Ti",
+         "gpu_model" : "NVIDIA GeForce RTX 2080 Ti",
          "ib_rate" : 0,
          "cputype" : "Intel Xeon Silver 4110",
          "disk" : null,
@@ -1164,7 +1164,7 @@
          "api_timestamp" : 1569497994,
          "gpu" : 4,
          "finaud_decision" : "NO",
-         "gpu_model" : "GeForce RTX 2080 Ti",
+         "gpu_model" : "NVIDIA GeForce RTX 2080 Ti",
          "ib_rate" : 0,
          "disk" : null,
          "next_finaud_decision" : "NO",
@@ -1220,7 +1220,7 @@
          "gpu" : 4,
          "finaud_decision" : "NO",
          "ib_rate" : 0,
-         "gpu_model" : "GeForce RTX 2080 Ti",
+         "gpu_model" : "NVIDIA GeForce RTX 2080 Ti",
          "next_finaud_decision" : "NO",
          "disk" : null,
          "cputype" : "Intel Xeon Silver 4110",
@@ -1559,7 +1559,7 @@
          "disk" : null,
          "next_finaud_decision" : "NO",
          "cputype" : "Intel Xeon Silver 4110",
-         "gpu_model" : "GeForce RTX 2080 Ti",
+         "gpu_model" : "NVIDIA GeForce RTX 2080 Ti",
          "ib_rate" : 0,
          "gpu" : 5,
          "finaud_decision" : "NO",
@@ -1635,7 +1635,7 @@
          ],
          "wattmeter" : "MULTIPLE",
          "last_available_upto" : 0,
-         "gpu_model" : "GeForce RTX 2080 Ti",
+         "gpu_model" : "NVIDIA GeForce RTX 2080 Ti",
          "ib_rate" : 0,
          "disk" : null,
          "cputype" : "Intel Xeon Silver 4110",
@@ -1693,7 +1693,7 @@
          "gpu" : 5,
          "finaud_decision" : "NO",
          "ib_rate" : 0,
-         "gpu_model" : "GeForce RTX 2080 Ti",
+         "gpu_model" : "NVIDIA GeForce RTX 2080 Ti",
          "disk" : null,
          "next_finaud_decision" : "NO",
          "cputype" : "Intel Xeon Silver 4110",
@@ -1789,7 +1789,7 @@
          "next_finaud_decision" : "NO",
          "cputype" : "Intel Xeon Silver 4110",
          "ib_rate" : 0,
-         "gpu_model" : "GeForce RTX 2080 Ti",
+         "gpu_model" : "NVIDIA GeForce RTX 2080 Ti",
          "myri_count" : 0,
          "cpucore" : 8,
          "cpufreq" : "2.1",
@@ -1849,7 +1849,7 @@
          "next_finaud_decision" : "NO",
          "disk" : null,
          "cputype" : "Intel Xeon Silver 4110",
-         "gpu_model" : "GeForce RTX 2080 Ti",
+         "gpu_model" : "NVIDIA GeForce RTX 2080 Ti",
          "ib_rate" : 0,
          "diskpath" : null,
          "switch" : null,
@@ -1921,7 +1921,7 @@
          "disk" : null,
          "next_finaud_decision" : "NO",
          "ib_rate" : 0,
-         "gpu_model" : "GeForce RTX 2080 Ti",
+         "gpu_model" : "NVIDIA GeForce RTX 2080 Ti",
          "finaud_decision" : "NO",
          "gpu" : 6,
          "api_timestamp" : 1569497994,
@@ -2009,7 +2009,7 @@
          "disk" : null,
          "cputype" : "Intel Xeon Silver 4110",
          "next_finaud_decision" : "NO",
-         "gpu_model" : "GeForce RTX 2080 Ti",
+         "gpu_model" : "NVIDIA GeForce RTX 2080 Ti",
          "ib_rate" : 0,
          "gpu" : 6,
          "finaud_decision" : "NO",
@@ -2060,7 +2060,7 @@
          "gpu" : 6,
          "finaud_decision" : "NO",
          "ib_rate" : 0,
-         "gpu_model" : "GeForce RTX 2080 Ti",
+         "gpu_model" : "NVIDIA GeForce RTX 2080 Ti",
          "disk" : null,
          "cputype" : "Intel Xeon Silver 4110",
          "next_finaud_decision" : "NO",
@@ -2139,7 +2139,7 @@
          "next_finaud_decision" : "NO",
          "disk" : null,
          "cputype" : "Intel Xeon Silver 4110",
-         "gpu_model" : "GeForce RTX 2080 Ti",
+         "gpu_model" : "NVIDIA GeForce RTX 2080 Ti",
          "ib_rate" : 0,
          "gpu" : 7,
          "finaud_decision" : "NO",
@@ -2246,7 +2246,7 @@
          "disk" : null,
          "next_finaud_decision" : "NO",
          "cputype" : "Intel Xeon Silver 4110",
-         "gpu_model" : "GeForce RTX 2080 Ti",
+         "gpu_model" : "NVIDIA GeForce RTX 2080 Ti",
          "ib_rate" : 0,
          "finaud_decision" : "NO",
          "gpu" : 7,
@@ -2300,7 +2300,7 @@
          "disk" : null,
          "next_finaud_decision" : "NO",
          "ib_rate" : 0,
-         "gpu_model" : "GeForce RTX 2080 Ti",
+         "gpu_model" : "NVIDIA GeForce RTX 2080 Ti",
          "last_available_upto" : 0,
          "wattmeter" : "MULTIPLE",
          "cluster_priority" : 201906,
@@ -2400,7 +2400,7 @@
          "finaud_decision" : "NO",
          "gpu" : 7,
          "ib_rate" : 0,
-         "gpu_model" : "GeForce RTX 2080 Ti",
+         "gpu_model" : "NVIDIA GeForce RTX 2080 Ti",
          "disk" : null,
          "cputype" : "Intel Xeon Silver 4110",
          "next_finaud_decision" : "NO",
@@ -2497,7 +2497,7 @@
          "gpu" : 8,
          "finaud_decision" : "NO",
          "ib_rate" : 0,
-         "gpu_model" : "GeForce RTX 2080 Ti",
+         "gpu_model" : "NVIDIA GeForce RTX 2080 Ti",
          "disk" : null,
          "next_finaud_decision" : "NO",
          "cputype" : "Intel Xeon Silver 4110",
@@ -2533,7 +2533,7 @@
       {
          "finaud_decision" : "NO",
          "gpu" : 8,
-         "gpu_model" : "GeForce RTX 2080 Ti",
+         "gpu_model" : "NVIDIA GeForce RTX 2080 Ti",
          "ib_rate" : 0,
          "next_finaud_decision" : "NO",
          "disk" : null,
@@ -2657,7 +2657,7 @@
          "diskpath" : null,
          "switch" : null,
          "ib_rate" : 0,
-         "gpu_model" : "GeForce RTX 2080 Ti",
+         "gpu_model" : "NVIDIA GeForce RTX 2080 Ti",
          "disk" : null,
          "cputype" : "Intel Xeon Silver 4110",
          "next_finaud_decision" : "NO",
@@ -2721,7 +2721,7 @@
          "disk" : null,
          "next_finaud_decision" : "NO",
          "ib_rate" : 0,
-         "gpu_model" : "GeForce RTX 2080 Ti",
+         "gpu_model" : "NVIDIA GeForce RTX 2080 Ti",
          "gpu" : 8,
          "finaud_decision" : "NO",
          "api_timestamp" : 1569497994,
diff --git a/spec/input/oar_with_disk_misconfigured_resources_properties_and_disks.json b/spec/input/oar_with_disk_misconfigured_resources_properties_and_disks.json
index bb6c64c2634..9390f11fc49 100644
--- a/spec/input/oar_with_disk_misconfigured_resources_properties_and_disks.json
+++ b/spec/input/oar_with_disk_misconfigured_resources_properties_and_disks.json
@@ -49,7 +49,7 @@
          "disk" : null,
          "next_finaud_decision" : "NO",
          "ib_rate" : 0,
-         "gpu_model" : "GeForce RTX 2080 Ti",
+         "gpu_model" : "NVIDIA GeForce RTX 2080 Ti",
          "gpu" : 1,
          "finaud_decision" : "NO",
          "eth_rate" : 10,
@@ -111,7 +111,7 @@
          "cputype" : "Intel Xeon Silver 4110",
          "disk" : null,
          "next_finaud_decision" : "NO",
-         "gpu_model" : "GeForce RTX 2080 Ti",
+         "gpu_model" : "NVIDIA GeForce RTX 2080 Ti",
          "ib_rate" : 0,
          "switch" : null,
          "diskpath" : null,
@@ -208,7 +208,7 @@
          "next_finaud_decision" : "NO",
          "disk" : null,
          "cputype" : "Intel Xeon Silver 4110",
-         "gpu_model" : "GeForce RTX 2080 Ti",
+         "gpu_model" : "NVIDIA GeForce RTX 2080 Ti",
          "ib_rate" : 0,
          "gpu" : 1,
          "finaud_decision" : "NO",
@@ -244,7 +244,7 @@
          "disk" : null,
          "next_finaud_decision" : "NO",
          "ib_rate" : 0,
-         "gpu_model" : "GeForce RTX 2080 Ti",
+         "gpu_model" : "NVIDIA GeForce RTX 2080 Ti",
          "wattmeter" : "MULTIPLE",
          "last_available_upto" : 0,
          "maintenance" : "NO",
@@ -316,7 +316,7 @@
          "network_address" : "clusterb-1.fakesite.grid5000.fr"
       },
       {
-         "gpu_model" : "GeForce RTX 2080 Ti",
+         "gpu_model" : "NVIDIA GeForce RTX 2080 Ti",
          "ib_rate" : 0,
          "disk" : null,
          "next_finaud_decision" : "NO",
@@ -412,7 +412,7 @@
          "switch" : null,
          "diskpath" : null,
          "ib_rate" : 0,
-         "gpu_model" : "GeForce RTX 2080 Ti",
+         "gpu_model" : "NVIDIA GeForce RTX 2080 Ti",
          "disk" : null,
          "cputype" : "Intel Xeon Silver 4110",
          "next_finaud_decision" : "NO",
@@ -518,7 +518,7 @@
          "diskpath" : null,
          "switch" : null,
          "ib_rate" : 0,
-         "gpu_model" : "GeForce RTX 2080 Ti",
+         "gpu_model" : "NVIDIA GeForce RTX 2080 Ti",
          "disk" : null,
          "cputype" : "Intel Xeon Silver 4110",
          "next_finaud_decision" : "NO",
@@ -569,7 +569,7 @@
          "scheduler_priority" : 0,
          "gpu" : 2,
          "finaud_decision" : "NO",
-         "gpu_model" : "GeForce RTX 2080 Ti",
+         "gpu_model" : "NVIDIA GeForce RTX 2080 Ti",
          "ib_rate" : 0,
          "disk" : null,
          "cputype" : "Intel Xeon Silver 4110",
@@ -680,7 +680,7 @@
          "cluster_priority" : 201906,
          "wattmeter" : "MULTIPLE",
          "last_available_upto" : 0,
-         "gpu_model" : "GeForce RTX 2080 Ti",
+         "gpu_model" : "NVIDIA GeForce RTX 2080 Ti",
          "ib_rate" : 0,
          "disk" : null,
          "next_finaud_decision" : "NO",
@@ -707,7 +707,7 @@
       },
       {
          "ib_rate" : 0,
-         "gpu_model" : "GeForce RTX 2080 Ti",
+         "gpu_model" : "NVIDIA GeForce RTX 2080 Ti",
          "cputype" : "Intel Xeon Silver 4110",
          "disk" : null,
          "next_finaud_decision" : "NO",
@@ -830,7 +830,7 @@
          "disk" : null,
          "cputype" : "Intel Xeon Silver 4110",
          "next_finaud_decision" : "NO",
-         "gpu_model" : "GeForce RTX 2080 Ti",
+         "gpu_model" : "NVIDIA GeForce RTX 2080 Ti",
          "ib_rate" : 0,
          "ib_count" : 0,
          "expiry_date" : 0,
@@ -903,7 +903,7 @@
          ],
          "wattmeter" : "MULTIPLE",
          "last_available_upto" : 0,
-         "gpu_model" : "GeForce RTX 2080 Ti",
+         "gpu_model" : "NVIDIA GeForce RTX 2080 Ti",
          "ib_rate" : 0,
          "disk" : null,
          "next_finaud_decision" : "NO",
@@ -960,7 +960,7 @@
          "finaud_decision" : "NO",
          "gpu" : 4,
          "ib_rate" : 0,
-         "gpu_model" : "GeForce RTX 2080 Ti",
+         "gpu_model" : "NVIDIA GeForce RTX 2080 Ti",
          "next_finaud_decision" : "NO",
          "disk" : null,
          "cputype" : "Intel Xeon Silver 4110",
@@ -1020,7 +1020,7 @@
       {
          "finaud_decision" : "NO",
          "gpu" : 4,
-         "gpu_model" : "GeForce RTX 2080 Ti",
+         "gpu_model" : "NVIDIA GeForce RTX 2080 Ti",
          "ib_rate" : 0,
          "cputype" : "Intel Xeon Silver 4110",
          "disk" : null,
@@ -1150,7 +1150,7 @@
          "api_timestamp" : 1569497994,
          "gpu" : 4,
          "finaud_decision" : "NO",
-         "gpu_model" : "GeForce RTX 2080 Ti",
+         "gpu_model" : "NVIDIA GeForce RTX 2080 Ti",
          "ib_rate" : 0,
          "disk" : null,
          "next_finaud_decision" : "NO",
@@ -1205,7 +1205,7 @@
          "gpu" : 4,
          "finaud_decision" : "NO",
          "ib_rate" : 0,
-         "gpu_model" : "GeForce RTX 2080 Ti",
+         "gpu_model" : "NVIDIA GeForce RTX 2080 Ti",
          "next_finaud_decision" : "NO",
          "disk" : null,
          "cputype" : "Intel Xeon Silver 4110",
@@ -1538,7 +1538,7 @@
          "disk" : null,
          "next_finaud_decision" : "NO",
          "cputype" : "Intel Xeon Silver 4110",
-         "gpu_model" : "GeForce RTX 2080 Ti",
+         "gpu_model" : "NVIDIA GeForce RTX 2080 Ti",
          "ib_rate" : 0,
          "gpu" : 5,
          "finaud_decision" : "NO",
@@ -1613,7 +1613,7 @@
          ],
          "wattmeter" : "MULTIPLE",
          "last_available_upto" : 0,
-         "gpu_model" : "GeForce RTX 2080 Ti",
+         "gpu_model" : "NVIDIA GeForce RTX 2080 Ti",
          "ib_rate" : 0,
          "disk" : null,
          "cputype" : "Intel Xeon Silver 4110",
@@ -1670,7 +1670,7 @@
          "gpu" : 5,
          "finaud_decision" : "NO",
          "ib_rate" : 0,
-         "gpu_model" : "GeForce RTX 2080 Ti",
+         "gpu_model" : "NVIDIA GeForce RTX 2080 Ti",
          "disk" : null,
          "next_finaud_decision" : "NO",
          "cputype" : "Intel Xeon Silver 4110",
@@ -1764,7 +1764,7 @@
          "next_finaud_decision" : "NO",
          "cputype" : "Intel Xeon Silver 4110",
          "ib_rate" : 0,
-         "gpu_model" : "GeForce RTX 2080 Ti",
+         "gpu_model" : "NVIDIA GeForce RTX 2080 Ti",
          "myri_count" : 0,
          "cpucore" : 8,
          "cpufreq" : "2.1",
@@ -1824,7 +1824,7 @@
          "next_finaud_decision" : "NO",
          "disk" : null,
          "cputype" : "Intel Xeon Silver 4110",
-         "gpu_model" : "GeForce RTX 2080 Ti",
+         "gpu_model" : "NVIDIA GeForce RTX 2080 Ti",
          "ib_rate" : 0,
          "diskpath" : null,
          "switch" : null,
@@ -1894,7 +1894,7 @@
          "disk" : null,
          "next_finaud_decision" : "NO",
          "ib_rate" : 0,
-         "gpu_model" : "GeForce RTX 2080 Ti",
+         "gpu_model" : "NVIDIA GeForce RTX 2080 Ti",
          "finaud_decision" : "NO",
          "gpu" : 6,
          "api_timestamp" : 1569497994,
@@ -1982,7 +1982,7 @@
          "disk" : null,
          "cputype" : "Intel Xeon Silver 4110",
          "next_finaud_decision" : "NO",
-         "gpu_model" : "GeForce RTX 2080 Ti",
+         "gpu_model" : "NVIDIA GeForce RTX 2080 Ti",
          "ib_rate" : 0,
          "gpu" : 6,
          "finaud_decision" : "NO",
@@ -2032,7 +2032,7 @@
          "gpu" : 6,
          "finaud_decision" : "NO",
          "ib_rate" : 0,
-         "gpu_model" : "GeForce RTX 2080 Ti",
+         "gpu_model" : "NVIDIA GeForce RTX 2080 Ti",
          "disk" : null,
          "cputype" : "Intel Xeon Silver 4110",
          "next_finaud_decision" : "NO",
@@ -2110,7 +2110,7 @@
          "next_finaud_decision" : "NO",
          "disk" : null,
          "cputype" : "Intel Xeon Silver 4110",
-         "gpu_model" : "GeForce RTX 2080 Ti",
+         "gpu_model" : "NVIDIA GeForce RTX 2080 Ti",
          "ib_rate" : 0,
          "gpu" : 7,
          "finaud_decision" : "NO",
@@ -2216,7 +2216,7 @@
          "disk" : null,
          "next_finaud_decision" : "NO",
          "cputype" : "Intel Xeon Silver 4110",
-         "gpu_model" : "GeForce RTX 2080 Ti",
+         "gpu_model" : "NVIDIA GeForce RTX 2080 Ti",
          "ib_rate" : 0,
          "finaud_decision" : "NO",
          "gpu" : 7,
@@ -2269,7 +2269,7 @@
          "disk" : null,
          "next_finaud_decision" : "NO",
          "ib_rate" : 0,
-         "gpu_model" : "GeForce RTX 2080 Ti",
+         "gpu_model" : "NVIDIA GeForce RTX 2080 Ti",
          "last_available_upto" : 0,
          "wattmeter" : "MULTIPLE",
          "cluster_priority" : 201906,
@@ -2368,7 +2368,7 @@
          "finaud_decision" : "NO",
          "gpu" : 7,
          "ib_rate" : 0,
-         "gpu_model" : "GeForce RTX 2080 Ti",
+         "gpu_model" : "NVIDIA GeForce RTX 2080 Ti",
          "disk" : null,
          "cputype" : "Intel Xeon Silver 4110",
          "next_finaud_decision" : "NO",
@@ -2463,7 +2463,7 @@
          "gpu" : 8,
          "finaud_decision" : "NO",
          "ib_rate" : 0,
-         "gpu_model" : "GeForce RTX 2080 Ti",
+         "gpu_model" : "NVIDIA GeForce RTX 2080 Ti",
          "disk" : null,
          "next_finaud_decision" : "NO",
          "cputype" : "Intel Xeon Silver 4110",
@@ -2499,7 +2499,7 @@
       {
          "finaud_decision" : "NO",
          "gpu" : 8,
-         "gpu_model" : "GeForce RTX 2080 Ti",
+         "gpu_model" : "NVIDIA GeForce RTX 2080 Ti",
          "ib_rate" : 0,
          "next_finaud_decision" : "NO",
          "disk" : null,
@@ -2621,7 +2621,7 @@
          "diskpath" : null,
          "switch" : null,
          "ib_rate" : 0,
-         "gpu_model" : "GeForce RTX 2080 Ti",
+         "gpu_model" : "NVIDIA GeForce RTX 2080 Ti",
          "disk" : null,
          "cputype" : "Intel Xeon Silver 4110",
          "next_finaud_decision" : "NO",
@@ -2685,7 +2685,7 @@
          "disk" : null,
          "next_finaud_decision" : "NO",
          "ib_rate" : 0,
-         "gpu_model" : "GeForce RTX 2080 Ti",
+         "gpu_model" : "NVIDIA GeForce RTX 2080 Ti",
          "gpu" : 8,
          "finaud_decision" : "NO",
          "api_timestamp" : 1569497994,
diff --git a/spec/input/oar_with_too_few_oar_resources.json b/spec/input/oar_with_too_few_oar_resources.json
index 97d601c60c7..de9453bef98 100644
--- a/spec/input/oar_with_too_few_oar_resources.json
+++ b/spec/input/oar_with_too_few_oar_resources.json
@@ -54,7 +54,7 @@
       "gpu_count": 4,
       "cluster_priority": 201906,
       "ib_count": 0,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "mic": "NO",
       "switch": "gw-fakesite",
       "eth_count": 1,
@@ -140,7 +140,7 @@
       "eth_count": 1,
       "switch": "gw-fakesite",
       "mic": "NO",
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "ib_count": 0,
       "cluster_priority": 201906,
       "gpu_count": 4,
@@ -172,7 +172,7 @@
       "memcore": 8192,
       "cpufreq": "2.1",
       "mic": "NO",
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "ib_count": 0,
       "eth_count": 1,
       "switch": "gw-fakesite",
@@ -257,7 +257,7 @@
       "next_state": "UnChanged",
       "mic": "NO",
       "ib_count": 0,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "eth_count": 1,
       "switch": "gw-fakesite",
       "available_upto": 2147483647,
@@ -364,7 +364,7 @@
       "cpu": 1,
       "switch": "gw-fakesite",
       "eth_count": 1,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "ib_count": 0,
       "mic": "NO",
       "next_state": "UnChanged",
@@ -449,7 +449,7 @@
       "eth_count": 1,
       "switch": "gw-fakesite",
       "mic": "NO",
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "ib_count": 0
     },
     {
@@ -496,7 +496,7 @@
       "type": "default",
       "mic": "NO",
       "ib_count": 0,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "eth_count": 1,
       "switch": "gw-fakesite",
       "cpuarch": "x86_64",
@@ -582,7 +582,7 @@
       "switch": "gw-fakesite",
       "mic": "NO",
       "ib_count": 0,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "memcpu": 65536,
       "cpufreq": "2.1",
       "memcore": 8192,
@@ -654,7 +654,7 @@
       "gpu_count": 4,
       "cluster_priority": 201906,
       "ib_count": 0,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "mic": "NO",
       "switch": "gw-fakesite",
       "eth_count": 1,
@@ -706,7 +706,7 @@
       "cluster_priority": 201906,
       "gpu_count": 4,
       "ib_count": 0,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "mic": "NO",
       "switch": "gw-fakesite",
       "eth_count": 1,
@@ -782,7 +782,7 @@
       "next_state": "UnChanged",
       "mic": "NO",
       "ib_count": 0,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "eth_count": 1,
       "switch": "gw-fakesite",
       "available_upto": 2147483647,
@@ -840,7 +840,7 @@
       "switch": "gw-fakesite",
       "eth_count": 1,
       "ib_count": 0,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "mic": "NO",
       "cpufreq": "2.1",
       "memcore": 8192,
@@ -921,7 +921,7 @@
       "memcore": 8192,
       "cpufreq": "2.1",
       "memcpu": 65536,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "ib_count": 0,
       "mic": "NO",
       "switch": "gw-fakesite",
@@ -1029,7 +1029,7 @@
       "cluster_priority": 201906,
       "gpu_count": 4,
       "ib_count": 0,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "mic": "NO",
       "switch": "gw-fakesite",
       "eth_count": 1,
@@ -1084,7 +1084,7 @@
       "switch": "gw-fakesite",
       "mic": "NO",
       "ib_count": 0,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "opa_count": 0,
       "id": 15,
       "production": "YES",
@@ -1179,7 +1179,7 @@
       "maintenance": "NO",
       "next_state": "UnChanged",
       "mic": "NO",
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "ib_count": 0,
       "eth_count": 1,
       "switch": "gw-fakesite",
@@ -1214,7 +1214,7 @@
       "next_state": "UnChanged",
       "mic": "NO",
       "ib_count": 0,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "eth_count": 1,
       "switch": "gw-fakesite",
       "cpu": 3,
@@ -1298,7 +1298,7 @@
       "deploy": "NO",
       "mic": "NO",
       "ib_count": 0,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "eth_count": 1,
       "switch": "gw-fakesite",
       "cpuarch": "x86_64",
@@ -1414,7 +1414,7 @@
       "cpu": 3,
       "switch": "gw-fakesite",
       "eth_count": 1,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "ib_count": 0,
       "mic": "NO",
       "next_state": "UnChanged",
@@ -1471,7 +1471,7 @@
       "available_upto": 2147483647,
       "switch": "gw-fakesite",
       "eth_count": 1,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "ib_count": 0,
       "mic": "NO",
       "next_state": "UnChanged",
@@ -1515,7 +1515,7 @@
       "eth_count": 1,
       "switch": "gw-fakesite",
       "mic": "NO",
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "ib_count": 0,
       "memcpu": 65536,
       "deploy": "NO",
@@ -1649,7 +1649,7 @@
       "eth_count": 1,
       "switch": "gw-fakesite",
       "mic": "NO",
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "ib_count": 0
     },
     {
@@ -1663,7 +1663,7 @@
       "maintenance": "NO",
       "next_state": "UnChanged",
       "mic": "NO",
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "ib_count": 0,
       "eth_count": 1,
       "switch": "gw-fakesite",
@@ -1730,7 +1730,7 @@
     {
       "mic": "NO",
       "ib_count": 0,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "eth_count": 1,
       "switch": "gw-fakesite",
       "host": "clustera-2.fakesite.grid5000.fr",
@@ -1812,7 +1812,7 @@
       "gpu_count": 4,
       "cluster_priority": 201906,
       "maintenance": "NO",
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "ib_count": 0,
       "mic": "NO",
       "switch": "gw-fakesite",
@@ -1949,7 +1949,7 @@
       "eth_count": 1,
       "switch": "gw-fakesite",
       "mic": "NO",
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "ib_count": 0
     },
     {
@@ -2012,7 +2012,7 @@
       "memcore": 8192,
       "cpufreq": "2.1",
       "memcpu": 65536,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "ib_count": 0,
       "mic": "NO",
       "switch": "gw-fakesite",
@@ -2040,7 +2040,7 @@
       "switch": "gw-fakesite",
       "eth_count": 1,
       "ib_count": 0,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "mic": "NO",
       "cpufreq": "2.1",
       "memcore": 8192,
@@ -2131,7 +2131,7 @@
       "cluster_priority": 201906,
       "gpu_count": 4,
       "ib_count": 0,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "mic": "NO",
       "switch": "gw-fakesite",
       "eth_count": 1,
@@ -2222,7 +2222,7 @@
       "eth_count": 1,
       "switch": "gw-fakesite",
       "mic": "NO",
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "ib_count": 0,
       "gpu_count": 4,
       "cluster_priority": 201906,
@@ -2280,7 +2280,7 @@
       "gpu_count": 4,
       "cluster_priority": 201906,
       "maintenance": "NO",
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "ib_count": 0,
       "mic": "NO",
       "switch": "gw-fakesite",
diff --git a/spec/input/oar_with_too_many_oar_resources.json b/spec/input/oar_with_too_many_oar_resources.json
index bb44612ecf1..547d03d123e 100644
--- a/spec/input/oar_with_too_many_oar_resources.json
+++ b/spec/input/oar_with_too_many_oar_resources.json
@@ -54,7 +54,7 @@
       "gpu_count": 4,
       "cluster_priority": 201906,
       "ib_count": 0,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "mic": "NO",
       "switch": "gw-fakesite",
       "eth_count": 1,
@@ -140,7 +140,7 @@
       "eth_count": 1,
       "switch": "gw-fakesite",
       "mic": "NO",
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "ib_count": 0,
       "cluster_priority": 201906,
       "gpu_count": 4,
@@ -172,7 +172,7 @@
       "memcore": 8192,
       "cpufreq": "2.1",
       "mic": "NO",
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "ib_count": 0,
       "eth_count": 1,
       "switch": "gw-fakesite",
@@ -257,7 +257,7 @@
       "next_state": "UnChanged",
       "mic": "NO",
       "ib_count": 0,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "eth_count": 1,
       "switch": "gw-fakesite",
       "available_upto": 2147483647,
@@ -364,7 +364,7 @@
       "cpu": 1,
       "switch": "gw-fakesite",
       "eth_count": 1,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "ib_count": 0,
       "mic": "NO",
       "next_state": "UnChanged",
@@ -449,7 +449,7 @@
       "eth_count": 1,
       "switch": "gw-fakesite",
       "mic": "NO",
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "ib_count": 0
     },
     {
@@ -496,7 +496,7 @@
       "type": "default",
       "mic": "NO",
       "ib_count": 0,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "eth_count": 1,
       "switch": "gw-fakesite",
       "cpuarch": "x86_64",
@@ -582,7 +582,7 @@
       "switch": "gw-fakesite",
       "mic": "NO",
       "ib_count": 0,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "memcpu": 65536,
       "cpufreq": "2.1",
       "memcore": 8192,
@@ -654,7 +654,7 @@
       "gpu_count": 4,
       "cluster_priority": 201906,
       "ib_count": 0,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "mic": "NO",
       "switch": "gw-fakesite",
       "eth_count": 1,
@@ -706,7 +706,7 @@
       "cluster_priority": 201906,
       "gpu_count": 4,
       "ib_count": 0,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "mic": "NO",
       "switch": "gw-fakesite",
       "eth_count": 1,
@@ -782,7 +782,7 @@
       "next_state": "UnChanged",
       "mic": "NO",
       "ib_count": 0,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "eth_count": 1,
       "switch": "gw-fakesite",
       "available_upto": 2147483647,
@@ -840,7 +840,7 @@
       "switch": "gw-fakesite",
       "eth_count": 1,
       "ib_count": 0,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "mic": "NO",
       "cpufreq": "2.1",
       "memcore": 8192,
@@ -921,7 +921,7 @@
       "memcore": 8192,
       "cpufreq": "2.1",
       "memcpu": 65536,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "ib_count": 0,
       "mic": "NO",
       "switch": "gw-fakesite",
@@ -1029,7 +1029,7 @@
       "cluster_priority": 201906,
       "gpu_count": 4,
       "ib_count": 0,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "mic": "NO",
       "switch": "gw-fakesite",
       "eth_count": 1,
@@ -1084,7 +1084,7 @@
       "switch": "gw-fakesite",
       "mic": "NO",
       "ib_count": 0,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "opa_count": 0,
       "id": 15,
       "production": "YES",
@@ -1179,7 +1179,7 @@
       "maintenance": "NO",
       "next_state": "UnChanged",
       "mic": "NO",
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "ib_count": 0,
       "eth_count": 1,
       "switch": "gw-fakesite",
@@ -1214,7 +1214,7 @@
       "next_state": "UnChanged",
       "mic": "NO",
       "ib_count": 0,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "eth_count": 1,
       "switch": "gw-fakesite",
       "cpu": 3,
@@ -1298,7 +1298,7 @@
       "deploy": "NO",
       "mic": "NO",
       "ib_count": 0,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "eth_count": 1,
       "switch": "gw-fakesite",
       "cpuarch": "x86_64",
@@ -1414,7 +1414,7 @@
       "cpu": 3,
       "switch": "gw-fakesite",
       "eth_count": 1,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "ib_count": 0,
       "mic": "NO",
       "next_state": "UnChanged",
@@ -1471,7 +1471,7 @@
       "available_upto": 2147483647,
       "switch": "gw-fakesite",
       "eth_count": 1,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "ib_count": 0,
       "mic": "NO",
       "next_state": "UnChanged",
@@ -1515,7 +1515,7 @@
       "eth_count": 1,
       "switch": "gw-fakesite",
       "mic": "NO",
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "ib_count": 0,
       "memcpu": 65536,
       "deploy": "NO",
@@ -1649,7 +1649,7 @@
       "eth_count": 1,
       "switch": "gw-fakesite",
       "mic": "NO",
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "ib_count": 0
     },
     {
@@ -1663,7 +1663,7 @@
       "maintenance": "NO",
       "next_state": "UnChanged",
       "mic": "NO",
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "ib_count": 0,
       "eth_count": 1,
       "switch": "gw-fakesite",
@@ -1730,7 +1730,7 @@
     {
       "mic": "NO",
       "ib_count": 0,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "eth_count": 1,
       "switch": "gw-fakesite",
       "host": "clustera-2.fakesite.grid5000.fr",
@@ -1812,7 +1812,7 @@
       "gpu_count": 4,
       "cluster_priority": 201906,
       "maintenance": "NO",
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "ib_count": 0,
       "mic": "NO",
       "switch": "gw-fakesite",
@@ -1949,7 +1949,7 @@
       "eth_count": 1,
       "switch": "gw-fakesite",
       "mic": "NO",
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "ib_count": 0
     },
     {
@@ -2012,7 +2012,7 @@
       "memcore": 8192,
       "cpufreq": "2.1",
       "memcpu": 65536,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "ib_count": 0,
       "mic": "NO",
       "switch": "gw-fakesite",
@@ -2040,7 +2040,7 @@
       "switch": "gw-fakesite",
       "eth_count": 1,
       "ib_count": 0,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "mic": "NO",
       "cpufreq": "2.1",
       "memcore": 8192,
@@ -2131,7 +2131,7 @@
       "cluster_priority": 201906,
       "gpu_count": 4,
       "ib_count": 0,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "mic": "NO",
       "switch": "gw-fakesite",
       "eth_count": 1,
@@ -2222,7 +2222,7 @@
       "eth_count": 1,
       "switch": "gw-fakesite",
       "mic": "NO",
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "ib_count": 0,
       "gpu_count": 4,
       "cluster_priority": 201906,
@@ -2280,7 +2280,7 @@
       "gpu_count": 4,
       "cluster_priority": 201906,
       "maintenance": "NO",
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "ib_count": 0,
       "mic": "NO",
       "switch": "gw-fakesite",
@@ -2331,7 +2331,7 @@
       "switch": "gw-fakesite",
       "eth_count": 1,
       "ib_count": 0,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "mic": "NO",
       "next_state": "UnChanged",
       "maintenance": "NO",
@@ -2406,7 +2406,7 @@
       "switch": "gw-fakesite",
       "eth_count": 1,
       "ib_count": 0,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "mic": "NO",
       "next_state": "UnChanged",
       "maintenance": "NO",
diff --git a/spec/input/oar_wrong_vartype.json b/spec/input/oar_wrong_vartype.json
index 6412df0e2ae..553cb0f129e 100644
--- a/spec/input/oar_wrong_vartype.json
+++ b/spec/input/oar_wrong_vartype.json
@@ -54,7 +54,7 @@
       "gpu_count": 4,
       "cluster_priority": 201906,
       "ib_count": 0,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "mic": "NO",
       "switch": "gw-fakesite",
       "eth_count": 1,
@@ -140,7 +140,7 @@
       "eth_count": 1,
       "switch": "gw-fakesite",
       "mic": "NO",
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "ib_count": 0,
       "cluster_priority": 201906,
       "gpu_count": 4,
@@ -172,7 +172,7 @@
       "memcore": 8192,
       "cpufreq": "2.1",
       "mic": "NO",
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "ib_count": 0,
       "eth_count": 1,
       "switch": "gw-fakesite",
@@ -257,7 +257,7 @@
       "next_state": "UnChanged",
       "mic": "NO",
       "ib_count": 0,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "eth_count": 1,
       "switch": "gw-fakesite",
       "available_upto": 2147483647,
@@ -364,7 +364,7 @@
       "cpu": 1,
       "switch": "gw-fakesite",
       "eth_count": 1,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "ib_count": 0,
       "mic": "NO",
       "next_state": "UnChanged",
@@ -449,7 +449,7 @@
       "eth_count": 1,
       "switch": "gw-fakesite",
       "mic": "NO",
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "ib_count": 0
     },
     {
@@ -496,7 +496,7 @@
       "type": "default",
       "mic": "NO",
       "ib_count": 0,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "eth_count": 1,
       "switch": "gw-fakesite",
       "cpuarch": "x86_64",
@@ -582,7 +582,7 @@
       "switch": "gw-fakesite",
       "mic": "NO",
       "ib_count": 0,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "memcpu": 65536,
       "cpufreq": "2.1",
       "memcore": 8192,
@@ -654,7 +654,7 @@
       "gpu_count": 4,
       "cluster_priority": 201906,
       "ib_count": 0,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "mic": "NO",
       "switch": "gw-fakesite",
       "eth_count": 1,
@@ -706,7 +706,7 @@
       "cluster_priority": 201906,
       "gpu_count": 4,
       "ib_count": 0,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "mic": "NO",
       "switch": "gw-fakesite",
       "eth_count": 1,
@@ -782,7 +782,7 @@
       "next_state": "UnChanged",
       "mic": "NO",
       "ib_count": 0,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "eth_count": 1,
       "switch": "gw-fakesite",
       "available_upto": 2147483647,
@@ -840,7 +840,7 @@
       "switch": "gw-fakesite",
       "eth_count": 1,
       "ib_count": 0,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "mic": "NO",
       "cpufreq": "2.1",
       "memcore": 8192,
@@ -921,7 +921,7 @@
       "memcore": 8192,
       "cpufreq": "2.1",
       "memcpu": 65536,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "ib_count": 0,
       "mic": "NO",
       "switch": "gw-fakesite",
@@ -1029,7 +1029,7 @@
       "cluster_priority": 201906,
       "gpu_count": 4,
       "ib_count": 0,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "mic": "NO",
       "switch": "gw-fakesite",
       "eth_count": 1,
@@ -1084,7 +1084,7 @@
       "switch": "gw-fakesite",
       "mic": "NO",
       "ib_count": 0,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "opa_count": 0,
       "id": 15,
       "production": "YES",
@@ -1179,7 +1179,7 @@
       "maintenance": "NO",
       "next_state": "UnChanged",
       "mic": "NO",
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "ib_count": 0,
       "eth_count": 1,
       "switch": "gw-fakesite",
@@ -1214,7 +1214,7 @@
       "next_state": "UnChanged",
       "mic": "NO",
       "ib_count": 0,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "eth_count": 1,
       "switch": "gw-fakesite",
       "cpu": 3,
@@ -1298,7 +1298,7 @@
       "deploy": "YES",
       "mic": "NO",
       "ib_count": 0,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "eth_count": 1,
       "switch": "gw-fakesite",
       "cpuarch": "x86_64",
@@ -1414,7 +1414,7 @@
       "cpu": 3,
       "switch": "gw-fakesite",
       "eth_count": 1,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "ib_count": 0,
       "mic": "NO",
       "next_state": "UnChanged",
@@ -1471,7 +1471,7 @@
       "available_upto": 2147483647,
       "switch": "gw-fakesite",
       "eth_count": 1,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "ib_count": 0,
       "mic": "NO",
       "next_state": "UnChanged",
@@ -1515,7 +1515,7 @@
       "eth_count": 1,
       "switch": "gw-fakesite",
       "mic": "NO",
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "ib_count": 0,
       "memcpu": 65536,
       "deploy": "YES",
@@ -1649,7 +1649,7 @@
       "eth_count": 1,
       "switch": "gw-fakesite",
       "mic": "NO",
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "ib_count": 0
     },
     {
@@ -1663,7 +1663,7 @@
       "maintenance": "NO",
       "next_state": "UnChanged",
       "mic": "NO",
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "ib_count": 0,
       "eth_count": 1,
       "switch": "gw-fakesite",
@@ -1730,7 +1730,7 @@
     {
       "mic": "NO",
       "ib_count": 0,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "eth_count": 1,
       "switch": "gw-fakesite",
       "host": "clustera-2.fakesite.grid5000.fr",
@@ -1812,7 +1812,7 @@
       "gpu_count": 4,
       "cluster_priority": 201906,
       "maintenance": "NO",
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "ib_count": 0,
       "mic": "NO",
       "switch": "gw-fakesite",
@@ -1949,7 +1949,7 @@
       "eth_count": 1,
       "switch": "gw-fakesite",
       "mic": "NO",
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "ib_count": 0
     },
     {
@@ -2012,7 +2012,7 @@
       "memcore": 8192,
       "cpufreq": "2.1",
       "memcpu": 65536,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "ib_count": 0,
       "mic": "NO",
       "switch": "gw-fakesite",
@@ -2040,7 +2040,7 @@
       "switch": "gw-fakesite",
       "eth_count": 1,
       "ib_count": 0,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "mic": "NO",
       "cpufreq": "2.1",
       "memcore": 8192,
@@ -2131,7 +2131,7 @@
       "cluster_priority": 201906,
       "gpu_count": 4,
       "ib_count": 0,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "mic": "NO",
       "switch": "gw-fakesite",
       "eth_count": 1,
@@ -2222,7 +2222,7 @@
       "eth_count": 1,
       "switch": "gw-fakesite",
       "mic": "NO",
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "ib_count": 0,
       "gpu_count": 4,
       "cluster_priority": 201906,
@@ -2280,7 +2280,7 @@
       "gpu_count": 4,
       "cluster_priority": 201906,
       "maintenance": "NO",
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "ib_count": 0,
       "mic": "NO",
       "switch": "gw-fakesite",
@@ -2331,7 +2331,7 @@
       "switch": "gw-fakesite",
       "eth_count": 1,
       "ib_count": 0,
-      "gpu_model": "GeForce RTX 2080 Ti",
+      "gpu_model": "NVIDIA GeForce RTX 2080 Ti",
       "mic": "NO",
       "next_state": "UnChanged",
       "maintenance": "NO",
diff --git a/spec/output/bad_best_effort_property_print_stdout.txt b/spec/output/bad_best_effort_property_print_stdout.txt
index efe6ae37710..f9e71405fb8 100644
--- a/spec/output/bad_best_effort_property_print_stdout.txt
+++ b/spec/output/bad_best_effort_property_print_stdout.txt
@@ -93,24 +93,24 @@ property_exist 'disk_reservation_count' || oarproperty -a disk_reservation_count
 ###################################
 # clustera-1.fakesite.grid5000.fr
 ###################################
-oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='1' AND type='default'" -p cpu=1 -p core=1 -p cpuset=0 -p gpu=1 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='2' AND type='default'" -p cpu=1 -p core=2 -p cpuset=1 -p gpu=1 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='3' AND type='default'" -p cpu=1 -p core=3 -p cpuset=2 -p gpu=1 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='4' AND type='default'" -p cpu=1 -p core=4 -p cpuset=3 -p gpu=1 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='5' AND type='default'" -p cpu=1 -p core=5 -p cpuset=4 -p gpu=2 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='6' AND type='default'" -p cpu=1 -p core=6 -p cpuset=5 -p gpu=2 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='7' AND type='default'" -p cpu=1 -p core=7 -p cpuset=6 -p gpu=2 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='8' AND type='default'" -p cpu=1 -p core=8 -p cpuset=7 -p gpu=2 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='9' AND type='default'" -p cpu=2 -p core=9 -p cpuset=8 -p gpu=3 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='10' AND type='default'" -p cpu=2 -p core=10 -p cpuset=9 -p gpu=3 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='11' AND type='default'" -p cpu=2 -p core=11 -p cpuset=10 -p gpu=3 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='12' AND type='default'" -p cpu=2 -p core=12 -p cpuset=11 -p gpu=3 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='13' AND type='default'" -p cpu=2 -p core=13 -p cpuset=12 -p gpu=4 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='14' AND type='default'" -p cpu=2 -p core=14 -p cpuset=13 -p gpu=4 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='15' AND type='default'" -p cpu=2 -p core=15 -p cpuset=14 -p gpu=4 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='16' AND type='default'" -p cpu=2 -p core=16 -p cpuset=15 -p gpu=4 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='1' AND type='default'" -p cpu=1 -p core=1 -p cpuset=0 -p gpu=1 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='2' AND type='default'" -p cpu=1 -p core=2 -p cpuset=1 -p gpu=1 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='3' AND type='default'" -p cpu=1 -p core=3 -p cpuset=2 -p gpu=1 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='4' AND type='default'" -p cpu=1 -p core=4 -p cpuset=3 -p gpu=1 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='5' AND type='default'" -p cpu=1 -p core=5 -p cpuset=4 -p gpu=2 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='6' AND type='default'" -p cpu=1 -p core=6 -p cpuset=5 -p gpu=2 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='7' AND type='default'" -p cpu=1 -p core=7 -p cpuset=6 -p gpu=2 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='8' AND type='default'" -p cpu=1 -p core=8 -p cpuset=7 -p gpu=2 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='9' AND type='default'" -p cpu=2 -p core=9 -p cpuset=8 -p gpu=3 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='10' AND type='default'" -p cpu=2 -p core=10 -p cpuset=9 -p gpu=3 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='11' AND type='default'" -p cpu=2 -p core=11 -p cpuset=10 -p gpu=3 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='12' AND type='default'" -p cpu=2 -p core=12 -p cpuset=11 -p gpu=3 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='13' AND type='default'" -p cpu=2 -p core=13 -p cpuset=12 -p gpu=4 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='14' AND type='default'" -p cpu=2 -p core=14 -p cpuset=13 -p gpu=4 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='15' AND type='default'" -p cpu=2 -p core=15 -p cpuset=14 -p gpu=4 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='16' AND type='default'" -p cpu=2 -p core=16 -p cpuset=15 -p gpu=4 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 echo; echo 'Setting properties for clustera-1.fakesite.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' and type='default'" -p ip='172.16.64.1' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw-fakesite' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 FL1CBX2' -p eth_count=1 -p eth_kavlan_count=0 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='GeForce RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='NO' -p cluster_priority=201906 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
+oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' and type='default'" -p ip='172.16.64.1' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw-fakesite' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 FL1CBX2' -p eth_count=1 -p eth_kavlan_count=0 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='NO' -p cluster_priority=201906 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
 
 echo '================================================================================'
 
@@ -118,23 +118,23 @@ echo '==========================================================================
 ###################################
 # clustera-2.fakesite.grid5000.fr
 ###################################
-oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='17' AND type='default'" -p cpu=3 -p core=17 -p cpuset=0 -p gpu=5 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='18' AND type='default'" -p cpu=3 -p core=18 -p cpuset=1 -p gpu=5 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='19' AND type='default'" -p cpu=3 -p core=19 -p cpuset=2 -p gpu=5 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='20' AND type='default'" -p cpu=3 -p core=20 -p cpuset=3 -p gpu=5 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='21' AND type='default'" -p cpu=3 -p core=21 -p cpuset=4 -p gpu=6 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='22' AND type='default'" -p cpu=3 -p core=22 -p cpuset=5 -p gpu=6 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='23' AND type='default'" -p cpu=3 -p core=23 -p cpuset=6 -p gpu=6 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='24' AND type='default'" -p cpu=3 -p core=24 -p cpuset=7 -p gpu=6 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='25' AND type='default'" -p cpu=4 -p core=25 -p cpuset=8 -p gpu=7 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='26' AND type='default'" -p cpu=4 -p core=26 -p cpuset=9 -p gpu=7 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='27' AND type='default'" -p cpu=4 -p core=27 -p cpuset=10 -p gpu=7 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='28' AND type='default'" -p cpu=4 -p core=28 -p cpuset=11 -p gpu=7 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='29' AND type='default'" -p cpu=4 -p core=29 -p cpuset=12 -p gpu=8 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='30' AND type='default'" -p cpu=4 -p core=30 -p cpuset=13 -p gpu=8 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='31' AND type='default'" -p cpu=4 -p core=31 -p cpuset=14 -p gpu=8 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='32' AND type='default'" -p cpu=4 -p core=32 -p cpuset=15 -p gpu=8 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='17' AND type='default'" -p cpu=3 -p core=17 -p cpuset=0 -p gpu=5 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='18' AND type='default'" -p cpu=3 -p core=18 -p cpuset=1 -p gpu=5 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='19' AND type='default'" -p cpu=3 -p core=19 -p cpuset=2 -p gpu=5 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='20' AND type='default'" -p cpu=3 -p core=20 -p cpuset=3 -p gpu=5 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='21' AND type='default'" -p cpu=3 -p core=21 -p cpuset=4 -p gpu=6 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='22' AND type='default'" -p cpu=3 -p core=22 -p cpuset=5 -p gpu=6 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='23' AND type='default'" -p cpu=3 -p core=23 -p cpuset=6 -p gpu=6 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='24' AND type='default'" -p cpu=3 -p core=24 -p cpuset=7 -p gpu=6 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='25' AND type='default'" -p cpu=4 -p core=25 -p cpuset=8 -p gpu=7 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='26' AND type='default'" -p cpu=4 -p core=26 -p cpuset=9 -p gpu=7 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='27' AND type='default'" -p cpu=4 -p core=27 -p cpuset=10 -p gpu=7 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='28' AND type='default'" -p cpu=4 -p core=28 -p cpuset=11 -p gpu=7 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='29' AND type='default'" -p cpu=4 -p core=29 -p cpuset=12 -p gpu=8 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='30' AND type='default'" -p cpu=4 -p core=30 -p cpuset=13 -p gpu=8 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='31' AND type='default'" -p cpu=4 -p core=31 -p cpuset=14 -p gpu=8 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='32' AND type='default'" -p cpu=4 -p core=32 -p cpuset=15 -p gpu=8 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 echo; echo 'Setting properties for clustera-2.fakesite.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' and type='default'" -p ip='172.16.64.2' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw-fakesite' -p besteffort='NO' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 9L1CBX2' -p eth_count=1 -p eth_kavlan_count=0 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='GeForce RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='NO' -p cluster_priority=201906 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
+oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' and type='default'" -p ip='172.16.64.2' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw-fakesite' -p besteffort='NO' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 9L1CBX2' -p eth_count=1 -p eth_kavlan_count=0 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='NO' -p cluster_priority=201906 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
 
 echo '================================================================================'
diff --git a/spec/output/bad_best_effort_property_table_stdout.txt b/spec/output/bad_best_effort_property_table_stdout.txt
index ff22c49a17b..78c01fb6074 100644
--- a/spec/output/bad_best_effort_property_table_stdout.txt
+++ b/spec/output/bad_best_effort_property_table_stdout.txt
@@ -1,36 +1,36 @@
 +---------- + -------------------- + ----- + ----- + -------- + ---- + -------------------- + ------------------------------ + ------------------------------+
 |   cluster | host                 | cpu   | core  | cpuset   | gpu  | gpudevice            | cpumodel                       | gpumodel                      |
 +---------- + -------------------- + ----- + ----- + -------- + ---- + -------------------- + ------------------------------ + ------------------------------+
-|  clustera | clustera-1           | 1     | 1     | 0        | 1    | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 1     | 2     | 1        | 1    | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 1     | 3     | 2        | 1    | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 1     | 4     | 3        | 1    | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 1     | 5     | 4        | 2    | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 1     | 6     | 5        | 2    | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 1     | 7     | 6        | 2    | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 1     | 8     | 7        | 2    | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 2     | 9     | 8        | 3    | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 2     | 10    | 9        | 3    | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 2     | 11    | 10       | 3    | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 2     | 12    | 11       | 3    | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 2     | 13    | 12       | 4    | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 2     | 14    | 13       | 4    | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 2     | 15    | 14       | 4    | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 2     | 16    | 15       | 4    | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 3     | 17    | 0        | 5    | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 3     | 18    | 1        | 5    | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 3     | 19    | 2        | 5    | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 3     | 20    | 3        | 5    | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 3     | 21    | 4        | 6    | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 3     | 22    | 5        | 6    | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 3     | 23    | 6        | 6    | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 3     | 24    | 7        | 6    | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 4     | 25    | 8        | 7    | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 4     | 26    | 9        | 7    | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 4     | 27    | 10       | 7    | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 4     | 28    | 11       | 7    | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 4     | 29    | 12       | 8    | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 4     | 30    | 13       | 8    | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 4     | 31    | 14       | 8    | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 4     | 32    | 15       | 8    | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
+|  clustera | clustera-1           | 1     | 1     | 0        | 1    | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 1     | 2     | 1        | 1    | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 1     | 3     | 2        | 1    | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 1     | 4     | 3        | 1    | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 1     | 5     | 4        | 2    | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 1     | 6     | 5        | 2    | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 1     | 7     | 6        | 2    | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 1     | 8     | 7        | 2    | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 2     | 9     | 8        | 3    | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 2     | 10    | 9        | 3    | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 2     | 11    | 10       | 3    | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 2     | 12    | 11       | 3    | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 2     | 13    | 12       | 4    | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 2     | 14    | 13       | 4    | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 2     | 15    | 14       | 4    | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 2     | 16    | 15       | 4    | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 3     | 17    | 0        | 5    | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 3     | 18    | 1        | 5    | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 3     | 19    | 2        | 5    | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 3     | 20    | 3        | 5    | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 3     | 21    | 4        | 6    | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 3     | 22    | 5        | 6    | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 3     | 23    | 6        | 6    | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 3     | 24    | 7        | 6    | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 4     | 25    | 8        | 7    | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 4     | 26    | 9        | 7    | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 4     | 27    | 10       | 7    | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 4     | 28    | 11       | 7    | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 4     | 29    | 12       | 8    | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 4     | 30    | 13       | 8    | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 4     | 31    | 14       | 8    | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 4     | 32    | 15       | 8    | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
 +---------- + -------------------- + ----- + ----- + -------- + ---- + -------------------- + ------------------------------ + ------------------------------+
diff --git a/spec/output/chassis_unset_print_stdout.txt b/spec/output/chassis_unset_print_stdout.txt
index db086ef26b1..3722dfbd9eb 100644
--- a/spec/output/chassis_unset_print_stdout.txt
+++ b/spec/output/chassis_unset_print_stdout.txt
@@ -93,24 +93,24 @@ property_exist 'disk_reservation_count' || oarproperty -a disk_reservation_count
 ###################################
 # clustera-1.fakesite.grid5000.fr
 ###################################
-oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='1' AND type='default'" -p cpu=1 -p core=1 -p cpuset=0 -p gpu=1 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='2' AND type='default'" -p cpu=1 -p core=2 -p cpuset=1 -p gpu=1 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='3' AND type='default'" -p cpu=1 -p core=3 -p cpuset=2 -p gpu=1 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='4' AND type='default'" -p cpu=1 -p core=4 -p cpuset=3 -p gpu=1 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='5' AND type='default'" -p cpu=1 -p core=5 -p cpuset=4 -p gpu=2 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='6' AND type='default'" -p cpu=1 -p core=6 -p cpuset=5 -p gpu=2 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='7' AND type='default'" -p cpu=1 -p core=7 -p cpuset=6 -p gpu=2 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='8' AND type='default'" -p cpu=1 -p core=8 -p cpuset=7 -p gpu=2 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='9' AND type='default'" -p cpu=2 -p core=9 -p cpuset=8 -p gpu=3 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='10' AND type='default'" -p cpu=2 -p core=10 -p cpuset=9 -p gpu=3 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='11' AND type='default'" -p cpu=2 -p core=11 -p cpuset=10 -p gpu=3 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='12' AND type='default'" -p cpu=2 -p core=12 -p cpuset=11 -p gpu=3 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='13' AND type='default'" -p cpu=2 -p core=13 -p cpuset=12 -p gpu=4 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='14' AND type='default'" -p cpu=2 -p core=14 -p cpuset=13 -p gpu=4 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='15' AND type='default'" -p cpu=2 -p core=15 -p cpuset=14 -p gpu=4 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='16' AND type='default'" -p cpu=2 -p core=16 -p cpuset=15 -p gpu=4 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='1' AND type='default'" -p cpu=1 -p core=1 -p cpuset=0 -p gpu=1 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='2' AND type='default'" -p cpu=1 -p core=2 -p cpuset=1 -p gpu=1 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='3' AND type='default'" -p cpu=1 -p core=3 -p cpuset=2 -p gpu=1 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='4' AND type='default'" -p cpu=1 -p core=4 -p cpuset=3 -p gpu=1 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='5' AND type='default'" -p cpu=1 -p core=5 -p cpuset=4 -p gpu=2 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='6' AND type='default'" -p cpu=1 -p core=6 -p cpuset=5 -p gpu=2 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='7' AND type='default'" -p cpu=1 -p core=7 -p cpuset=6 -p gpu=2 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='8' AND type='default'" -p cpu=1 -p core=8 -p cpuset=7 -p gpu=2 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='9' AND type='default'" -p cpu=2 -p core=9 -p cpuset=8 -p gpu=3 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='10' AND type='default'" -p cpu=2 -p core=10 -p cpuset=9 -p gpu=3 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='11' AND type='default'" -p cpu=2 -p core=11 -p cpuset=10 -p gpu=3 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='12' AND type='default'" -p cpu=2 -p core=12 -p cpuset=11 -p gpu=3 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='13' AND type='default'" -p cpu=2 -p core=13 -p cpuset=12 -p gpu=4 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='14' AND type='default'" -p cpu=2 -p core=14 -p cpuset=13 -p gpu=4 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='15' AND type='default'" -p cpu=2 -p core=15 -p cpuset=14 -p gpu=4 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='16' AND type='default'" -p cpu=2 -p core=16 -p cpuset=15 -p gpu=4 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 echo; echo 'Setting properties for clustera-1.fakesite.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' and type='default'" -p ip='172.16.64.1' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw-fakesite' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 FL1CBX2' -p eth_count=1 -p eth_kavlan_count=0 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='GeForce RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='NO' -p cluster_priority=201906 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
+oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' and type='default'" -p ip='172.16.64.1' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw-fakesite' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 FL1CBX2' -p eth_count=1 -p eth_kavlan_count=0 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='NO' -p cluster_priority=201906 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
 
 echo '================================================================================'
 
@@ -118,23 +118,23 @@ echo '==========================================================================
 ###################################
 # clustera-2.fakesite.grid5000.fr
 ###################################
-oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='17' AND type='default'" -p cpu=3 -p core=17 -p cpuset=0 -p gpu=5 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='18' AND type='default'" -p cpu=3 -p core=18 -p cpuset=1 -p gpu=5 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='19' AND type='default'" -p cpu=3 -p core=19 -p cpuset=2 -p gpu=5 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='20' AND type='default'" -p cpu=3 -p core=20 -p cpuset=3 -p gpu=5 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='21' AND type='default'" -p cpu=3 -p core=21 -p cpuset=4 -p gpu=6 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='22' AND type='default'" -p cpu=3 -p core=22 -p cpuset=5 -p gpu=6 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='23' AND type='default'" -p cpu=3 -p core=23 -p cpuset=6 -p gpu=6 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='24' AND type='default'" -p cpu=3 -p core=24 -p cpuset=7 -p gpu=6 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='25' AND type='default'" -p cpu=4 -p core=25 -p cpuset=8 -p gpu=7 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='26' AND type='default'" -p cpu=4 -p core=26 -p cpuset=9 -p gpu=7 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='27' AND type='default'" -p cpu=4 -p core=27 -p cpuset=10 -p gpu=7 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='28' AND type='default'" -p cpu=4 -p core=28 -p cpuset=11 -p gpu=7 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='29' AND type='default'" -p cpu=4 -p core=29 -p cpuset=12 -p gpu=8 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='30' AND type='default'" -p cpu=4 -p core=30 -p cpuset=13 -p gpu=8 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='31' AND type='default'" -p cpu=4 -p core=31 -p cpuset=14 -p gpu=8 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='32' AND type='default'" -p cpu=4 -p core=32 -p cpuset=15 -p gpu=8 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='17' AND type='default'" -p cpu=3 -p core=17 -p cpuset=0 -p gpu=5 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='18' AND type='default'" -p cpu=3 -p core=18 -p cpuset=1 -p gpu=5 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='19' AND type='default'" -p cpu=3 -p core=19 -p cpuset=2 -p gpu=5 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='20' AND type='default'" -p cpu=3 -p core=20 -p cpuset=3 -p gpu=5 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='21' AND type='default'" -p cpu=3 -p core=21 -p cpuset=4 -p gpu=6 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='22' AND type='default'" -p cpu=3 -p core=22 -p cpuset=5 -p gpu=6 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='23' AND type='default'" -p cpu=3 -p core=23 -p cpuset=6 -p gpu=6 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='24' AND type='default'" -p cpu=3 -p core=24 -p cpuset=7 -p gpu=6 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='25' AND type='default'" -p cpu=4 -p core=25 -p cpuset=8 -p gpu=7 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='26' AND type='default'" -p cpu=4 -p core=26 -p cpuset=9 -p gpu=7 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='27' AND type='default'" -p cpu=4 -p core=27 -p cpuset=10 -p gpu=7 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='28' AND type='default'" -p cpu=4 -p core=28 -p cpuset=11 -p gpu=7 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='29' AND type='default'" -p cpu=4 -p core=29 -p cpuset=12 -p gpu=8 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='30' AND type='default'" -p cpu=4 -p core=30 -p cpuset=13 -p gpu=8 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='31' AND type='default'" -p cpu=4 -p core=31 -p cpuset=14 -p gpu=8 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='32' AND type='default'" -p cpu=4 -p core=32 -p cpuset=15 -p gpu=8 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 echo; echo 'Setting properties for clustera-2.fakesite.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' and type='default'" -p ip='172.16.64.2' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw-fakesite' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 9L1CBX2' -p eth_count=1 -p eth_kavlan_count=0 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='GeForce RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='NO' -p cluster_priority=201906 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
+oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' and type='default'" -p ip='172.16.64.2' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw-fakesite' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 9L1CBX2' -p eth_count=1 -p eth_kavlan_count=0 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='NO' -p cluster_priority=201906 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
 
 echo '================================================================================'
diff --git a/spec/output/chassis_unset_table_stdout.txt b/spec/output/chassis_unset_table_stdout.txt
index ff22c49a17b..78c01fb6074 100644
--- a/spec/output/chassis_unset_table_stdout.txt
+++ b/spec/output/chassis_unset_table_stdout.txt
@@ -1,36 +1,36 @@
 +---------- + -------------------- + ----- + ----- + -------- + ---- + -------------------- + ------------------------------ + ------------------------------+
 |   cluster | host                 | cpu   | core  | cpuset   | gpu  | gpudevice            | cpumodel                       | gpumodel                      |
 +---------- + -------------------- + ----- + ----- + -------- + ---- + -------------------- + ------------------------------ + ------------------------------+
-|  clustera | clustera-1           | 1     | 1     | 0        | 1    | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 1     | 2     | 1        | 1    | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 1     | 3     | 2        | 1    | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 1     | 4     | 3        | 1    | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 1     | 5     | 4        | 2    | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 1     | 6     | 5        | 2    | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 1     | 7     | 6        | 2    | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 1     | 8     | 7        | 2    | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 2     | 9     | 8        | 3    | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 2     | 10    | 9        | 3    | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 2     | 11    | 10       | 3    | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 2     | 12    | 11       | 3    | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 2     | 13    | 12       | 4    | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 2     | 14    | 13       | 4    | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 2     | 15    | 14       | 4    | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 2     | 16    | 15       | 4    | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 3     | 17    | 0        | 5    | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 3     | 18    | 1        | 5    | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 3     | 19    | 2        | 5    | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 3     | 20    | 3        | 5    | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 3     | 21    | 4        | 6    | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 3     | 22    | 5        | 6    | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 3     | 23    | 6        | 6    | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 3     | 24    | 7        | 6    | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 4     | 25    | 8        | 7    | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 4     | 26    | 9        | 7    | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 4     | 27    | 10       | 7    | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 4     | 28    | 11       | 7    | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 4     | 29    | 12       | 8    | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 4     | 30    | 13       | 8    | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 4     | 31    | 14       | 8    | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 4     | 32    | 15       | 8    | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
+|  clustera | clustera-1           | 1     | 1     | 0        | 1    | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 1     | 2     | 1        | 1    | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 1     | 3     | 2        | 1    | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 1     | 4     | 3        | 1    | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 1     | 5     | 4        | 2    | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 1     | 6     | 5        | 2    | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 1     | 7     | 6        | 2    | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 1     | 8     | 7        | 2    | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 2     | 9     | 8        | 3    | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 2     | 10    | 9        | 3    | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 2     | 11    | 10       | 3    | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 2     | 12    | 11       | 3    | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 2     | 13    | 12       | 4    | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 2     | 14    | 13       | 4    | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 2     | 15    | 14       | 4    | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 2     | 16    | 15       | 4    | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 3     | 17    | 0        | 5    | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 3     | 18    | 1        | 5    | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 3     | 19    | 2        | 5    | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 3     | 20    | 3        | 5    | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 3     | 21    | 4        | 6    | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 3     | 22    | 5        | 6    | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 3     | 23    | 6        | 6    | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 3     | 24    | 7        | 6    | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 4     | 25    | 8        | 7    | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 4     | 26    | 9        | 7    | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 4     | 27    | 10       | 7    | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 4     | 28    | 11       | 7    | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 4     | 29    | 12       | 8    | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 4     | 30    | 13       | 8    | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 4     | 31    | 14       | 8    | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 4     | 32    | 15       | 8    | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
 +---------- + -------------------- + ----- + ----- + -------- + ---- + -------------------- + ------------------------------ + ------------------------------+
diff --git a/spec/output/configured_misconfigured_cores_diff_stdout.txt b/spec/output/configured_misconfigured_cores_diff_stdout.txt
index 87dceb7c4d0..a67e0aa51e2 100644
--- a/spec/output/configured_misconfigured_cores_diff_stdout.txt
+++ b/spec/output/configured_misconfigured_cores_diff_stdout.txt
@@ -18,7 +18,7 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "eth_rate", 10]
     ["+", "exotic", "NO"]
     ["+", "gpu_count", 4]
-    ["+", "gpu_model", "GeForce RTX 2080 Ti"]
+    ["+", "gpu_model", "NVIDIA GeForce RTX 2080 Ti"]
     ["+", "ib", "NO"]
     ["+", "ib_count", 0]
     ["+", "ib_rate", 0]
@@ -59,7 +59,7 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "eth_rate", 10]
     ["+", "exotic", "NO"]
     ["+", "gpu_count", 4]
-    ["+", "gpu_model", "GeForce RTX 2080 Ti"]
+    ["+", "gpu_model", "NVIDIA GeForce RTX 2080 Ti"]
     ["+", "ib", "NO"]
     ["+", "ib_count", 0]
     ["+", "ib_rate", 0]
diff --git a/spec/output/configured_misconfigured_cores_print_stdout.txt b/spec/output/configured_misconfigured_cores_print_stdout.txt
index 383e6d76d70..9aea4ca6ded 100644
--- a/spec/output/configured_misconfigured_cores_print_stdout.txt
+++ b/spec/output/configured_misconfigured_cores_print_stdout.txt
@@ -95,24 +95,24 @@ property_exist 'diskpath' || oarproperty -a diskpath --varchar
 ###################################
 # clustera-1.fakesite.grid5000.fr
 ###################################
-oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=5 -p core=33 -p cpuset=0 -p gpu=1 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=5 -p core=34 -p cpuset=1 -p gpu=1 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=5 -p core=35 -p cpuset=2 -p gpu=1 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=5 -p core=36 -p cpuset=3 -p gpu=1 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=5 -p core=37 -p cpuset=4 -p gpu=2 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=5 -p core=38 -p cpuset=5 -p gpu=2 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=5 -p core=39 -p cpuset=6 -p gpu=2 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=5 -p core=40 -p cpuset=7 -p gpu=2 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=6 -p core=41 -p cpuset=8 -p gpu=3 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=6 -p core=42 -p cpuset=9 -p gpu=3 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=6 -p core=43 -p cpuset=10 -p gpu=3 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=6 -p core=44 -p cpuset=11 -p gpu=3 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=6 -p core=45 -p cpuset=12 -p gpu=4 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=6 -p core=46 -p cpuset=13 -p gpu=4 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=6 -p core=47 -p cpuset=14 -p gpu=4 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=6 -p core=48 -p cpuset=15 -p gpu=4 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=5 -p core=33 -p cpuset=0 -p gpu=1 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=5 -p core=34 -p cpuset=1 -p gpu=1 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=5 -p core=35 -p cpuset=2 -p gpu=1 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=5 -p core=36 -p cpuset=3 -p gpu=1 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=5 -p core=37 -p cpuset=4 -p gpu=2 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=5 -p core=38 -p cpuset=5 -p gpu=2 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=5 -p core=39 -p cpuset=6 -p gpu=2 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=5 -p core=40 -p cpuset=7 -p gpu=2 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=6 -p core=41 -p cpuset=8 -p gpu=3 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=6 -p core=42 -p cpuset=9 -p gpu=3 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=6 -p core=43 -p cpuset=10 -p gpu=3 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=6 -p core=44 -p cpuset=11 -p gpu=3 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=6 -p core=45 -p cpuset=12 -p gpu=4 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=6 -p core=46 -p cpuset=13 -p gpu=4 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=6 -p core=47 -p cpuset=14 -p gpu=4 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=6 -p core=48 -p cpuset=15 -p gpu=4 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 echo; echo 'Setting properties for clustera-1.fakesite.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' and type='default'" -p ip='172.16.64.1' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw-fakesite' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 FL1CBX2' -p eth_count=1 -p eth_kavlan_count=0 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='GeForce RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='NO' -p cluster_priority=201906 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
+oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' and type='default'" -p ip='172.16.64.1' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw-fakesite' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 FL1CBX2' -p eth_count=1 -p eth_kavlan_count=0 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='NO' -p cluster_priority=201906 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
 
 echo '================================================================================'
 
@@ -120,23 +120,23 @@ echo '==========================================================================
 ###################################
 # clustera-2.fakesite.grid5000.fr
 ###################################
-oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=7 -p core=49 -p cpuset=0 -p gpu=5 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=7 -p core=50 -p cpuset=1 -p gpu=5 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=7 -p core=51 -p cpuset=2 -p gpu=5 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=7 -p core=52 -p cpuset=3 -p gpu=5 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=7 -p core=53 -p cpuset=4 -p gpu=6 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=7 -p core=54 -p cpuset=5 -p gpu=6 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=7 -p core=55 -p cpuset=6 -p gpu=6 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=7 -p core=56 -p cpuset=7 -p gpu=6 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=8 -p core=57 -p cpuset=8 -p gpu=7 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=8 -p core=58 -p cpuset=9 -p gpu=7 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=8 -p core=59 -p cpuset=10 -p gpu=7 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=8 -p core=60 -p cpuset=11 -p gpu=7 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=8 -p core=61 -p cpuset=12 -p gpu=8 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=8 -p core=62 -p cpuset=13 -p gpu=8 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=8 -p core=63 -p cpuset=14 -p gpu=8 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=8 -p core=64 -p cpuset=15 -p gpu=8 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=7 -p core=49 -p cpuset=0 -p gpu=5 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=7 -p core=50 -p cpuset=1 -p gpu=5 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=7 -p core=51 -p cpuset=2 -p gpu=5 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=7 -p core=52 -p cpuset=3 -p gpu=5 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=7 -p core=53 -p cpuset=4 -p gpu=6 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=7 -p core=54 -p cpuset=5 -p gpu=6 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=7 -p core=55 -p cpuset=6 -p gpu=6 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=7 -p core=56 -p cpuset=7 -p gpu=6 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=8 -p core=57 -p cpuset=8 -p gpu=7 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=8 -p core=58 -p cpuset=9 -p gpu=7 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=8 -p core=59 -p cpuset=10 -p gpu=7 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=8 -p core=60 -p cpuset=11 -p gpu=7 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=8 -p core=61 -p cpuset=12 -p gpu=8 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=8 -p core=62 -p cpuset=13 -p gpu=8 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=8 -p core=63 -p cpuset=14 -p gpu=8 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=8 -p core=64 -p cpuset=15 -p gpu=8 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 echo; echo 'Setting properties for clustera-2.fakesite.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' and type='default'" -p ip='172.16.64.2' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw-fakesite' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 9L1CBX2' -p eth_count=1 -p eth_kavlan_count=0 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='GeForce RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='NO' -p cluster_priority=201906 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
+oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' and type='default'" -p ip='172.16.64.2' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw-fakesite' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 9L1CBX2' -p eth_count=1 -p eth_kavlan_count=0 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='NO' -p cluster_priority=201906 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
 
 echo '================================================================================'
diff --git a/spec/output/configured_misconfigured_cores_table_stdout.txt b/spec/output/configured_misconfigured_cores_table_stdout.txt
index 1090ebff98a..4964c44226f 100644
--- a/spec/output/configured_misconfigured_cores_table_stdout.txt
+++ b/spec/output/configured_misconfigured_cores_table_stdout.txt
@@ -1,36 +1,36 @@
 +---------- + -------------------- + ----- + ----- + -------- + ---- + -------------------- + ------------------------------ + ------------------------------+
 |   cluster | host                 | cpu   | core  | cpuset   | gpu  | gpudevice            | cpumodel                       | gpumodel                      |
 +---------- + -------------------- + ----- + ----- + -------- + ---- + -------------------- + ------------------------------ + ------------------------------+
-|  clustera | clustera-1           | 5     | 33    | 0        | 1    | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 5     | 34    | 1        | 1    | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 5     | 35    | 2        | 1    | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 5     | 36    | 3        | 1    | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 5     | 37    | 4        | 2    | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 5     | 38    | 5        | 2    | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 5     | 39    | 6        | 2    | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 5     | 40    | 7        | 2    | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 6     | 41    | 8        | 3    | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 6     | 42    | 9        | 3    | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 6     | 43    | 10       | 3    | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 6     | 44    | 11       | 3    | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 6     | 45    | 12       | 4    | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 6     | 46    | 13       | 4    | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 6     | 47    | 14       | 4    | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 6     | 48    | 15       | 4    | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 7     | 49    | 0        | 5    | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 7     | 50    | 1        | 5    | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 7     | 51    | 2        | 5    | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 7     | 52    | 3        | 5    | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 7     | 53    | 4        | 6    | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 7     | 54    | 5        | 6    | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 7     | 55    | 6        | 6    | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 7     | 56    | 7        | 6    | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 8     | 57    | 8        | 7    | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 8     | 58    | 9        | 7    | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 8     | 59    | 10       | 7    | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 8     | 60    | 11       | 7    | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 8     | 61    | 12       | 8    | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 8     | 62    | 13       | 8    | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 8     | 63    | 14       | 8    | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 8     | 64    | 15       | 8    | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
+|  clustera | clustera-1           | 5     | 33    | 0        | 1    | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 5     | 34    | 1        | 1    | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 5     | 35    | 2        | 1    | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 5     | 36    | 3        | 1    | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 5     | 37    | 4        | 2    | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 5     | 38    | 5        | 2    | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 5     | 39    | 6        | 2    | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 5     | 40    | 7        | 2    | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 6     | 41    | 8        | 3    | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 6     | 42    | 9        | 3    | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 6     | 43    | 10       | 3    | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 6     | 44    | 11       | 3    | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 6     | 45    | 12       | 4    | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 6     | 46    | 13       | 4    | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 6     | 47    | 14       | 4    | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 6     | 48    | 15       | 4    | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 7     | 49    | 0        | 5    | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 7     | 50    | 1        | 5    | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 7     | 51    | 2        | 5    | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 7     | 52    | 3        | 5    | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 7     | 53    | 4        | 6    | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 7     | 54    | 5        | 6    | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 7     | 55    | 6        | 6    | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 7     | 56    | 7        | 6    | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 8     | 57    | 8        | 7    | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 8     | 58    | 9        | 7    | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 8     | 59    | 10       | 7    | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 8     | 60    | 11       | 7    | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 8     | 61    | 12       | 8    | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 8     | 62    | 13       | 8    | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 8     | 63    | 14       | 8    | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 8     | 64    | 15       | 8    | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
 +---------- + -------------------- + ----- + ----- + -------- + ---- + -------------------- + ------------------------------ + ------------------------------+
diff --git a/spec/output/configured_misconfigured_gpu_print_stdout.txt b/spec/output/configured_misconfigured_gpu_print_stdout.txt
index 7796fdcad92..0f697cd8c4d 100644
--- a/spec/output/configured_misconfigured_gpu_print_stdout.txt
+++ b/spec/output/configured_misconfigured_gpu_print_stdout.txt
@@ -95,24 +95,24 @@ property_exist 'diskpath' || oarproperty -a diskpath --varchar
 ###################################
 # clustera-1.fakesite.grid5000.fr
 ###################################
-oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='1' AND type='default'" -p cpu=1 -p core=1 -p cpuset=0 -p gpu=1 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='2' AND type='default'" -p cpu=1 -p core=2 -p cpuset=1 -p gpu=1 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='3' AND type='default'" -p cpu=1 -p core=3 -p cpuset=2 -p gpu=1 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='4' AND type='default'" -p cpu=1 -p core=4 -p cpuset=3 -p gpu=1 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='5' AND type='default'" -p cpu=1 -p core=5 -p cpuset=4 -p gpu=2 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='6' AND type='default'" -p cpu=1 -p core=6 -p cpuset=5 -p gpu=2 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='7' AND type='default'" -p cpu=1 -p core=7 -p cpuset=6 -p gpu=2 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='8' AND type='default'" -p cpu=1 -p core=8 -p cpuset=7 -p gpu=2 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='9' AND type='default'" -p cpu=2 -p core=9 -p cpuset=8 -p gpu=3 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='10' AND type='default'" -p cpu=2 -p core=10 -p cpuset=9 -p gpu=3 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='11' AND type='default'" -p cpu=2 -p core=11 -p cpuset=10 -p gpu=3 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='12' AND type='default'" -p cpu=2 -p core=12 -p cpuset=11 -p gpu=3 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='13' AND type='default'" -p cpu=2 -p core=13 -p cpuset=12 -p gpu=4 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='14' AND type='default'" -p cpu=2 -p core=14 -p cpuset=13 -p gpu=4 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='15' AND type='default'" -p cpu=2 -p core=15 -p cpuset=14 -p gpu=4 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='16' AND type='default'" -p cpu=2 -p core=16 -p cpuset=15 -p gpu=4 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='1' AND type='default'" -p cpu=1 -p core=1 -p cpuset=0 -p gpu=1 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='2' AND type='default'" -p cpu=1 -p core=2 -p cpuset=1 -p gpu=1 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='3' AND type='default'" -p cpu=1 -p core=3 -p cpuset=2 -p gpu=1 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='4' AND type='default'" -p cpu=1 -p core=4 -p cpuset=3 -p gpu=1 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='5' AND type='default'" -p cpu=1 -p core=5 -p cpuset=4 -p gpu=2 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='6' AND type='default'" -p cpu=1 -p core=6 -p cpuset=5 -p gpu=2 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='7' AND type='default'" -p cpu=1 -p core=7 -p cpuset=6 -p gpu=2 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='8' AND type='default'" -p cpu=1 -p core=8 -p cpuset=7 -p gpu=2 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='9' AND type='default'" -p cpu=2 -p core=9 -p cpuset=8 -p gpu=3 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='10' AND type='default'" -p cpu=2 -p core=10 -p cpuset=9 -p gpu=3 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='11' AND type='default'" -p cpu=2 -p core=11 -p cpuset=10 -p gpu=3 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='12' AND type='default'" -p cpu=2 -p core=12 -p cpuset=11 -p gpu=3 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='13' AND type='default'" -p cpu=2 -p core=13 -p cpuset=12 -p gpu=4 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='14' AND type='default'" -p cpu=2 -p core=14 -p cpuset=13 -p gpu=4 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='15' AND type='default'" -p cpu=2 -p core=15 -p cpuset=14 -p gpu=4 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='16' AND type='default'" -p cpu=2 -p core=16 -p cpuset=15 -p gpu=4 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 echo; echo 'Setting properties for clustera-1.fakesite.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' and type='default'" -p ip='172.16.64.1' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw-fakesite' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 FL1CBX2' -p eth_count=1 -p eth_kavlan_count=0 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='GeForce RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='NO' -p cluster_priority=201906 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
+oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' and type='default'" -p ip='172.16.64.1' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw-fakesite' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 FL1CBX2' -p eth_count=1 -p eth_kavlan_count=0 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='NO' -p cluster_priority=201906 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
 
 echo '================================================================================'
 
@@ -120,23 +120,23 @@ echo '==========================================================================
 ###################################
 # clustera-2.fakesite.grid5000.fr
 ###################################
-oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='17' AND type='default'" -p cpu=3 -p core=17 -p cpuset=0 -p gpu=5 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='18' AND type='default'" -p cpu=3 -p core=18 -p cpuset=1 -p gpu=5 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='19' AND type='default'" -p cpu=3 -p core=19 -p cpuset=2 -p gpu=5 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='20' AND type='default'" -p cpu=3 -p core=20 -p cpuset=3 -p gpu=5 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='21' AND type='default'" -p cpu=3 -p core=21 -p cpuset=4 -p gpu=6 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='22' AND type='default'" -p cpu=3 -p core=22 -p cpuset=5 -p gpu=6 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='23' AND type='default'" -p cpu=3 -p core=23 -p cpuset=6 -p gpu=6 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='24' AND type='default'" -p cpu=3 -p core=24 -p cpuset=7 -p gpu=6 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='25' AND type='default'" -p cpu=4 -p core=25 -p cpuset=8 -p gpu=7 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='26' AND type='default'" -p cpu=4 -p core=26 -p cpuset=9 -p gpu=7 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='27' AND type='default'" -p cpu=4 -p core=27 -p cpuset=10 -p gpu=7 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='28' AND type='default'" -p cpu=4 -p core=28 -p cpuset=11 -p gpu=7 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='29' AND type='default'" -p cpu=4 -p core=29 -p cpuset=12 -p gpu=8 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='30' AND type='default'" -p cpu=4 -p core=30 -p cpuset=13 -p gpu=8 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='31' AND type='default'" -p cpu=4 -p core=31 -p cpuset=14 -p gpu=8 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='32' AND type='default'" -p cpu=4 -p core=32 -p cpuset=15 -p gpu=8 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='17' AND type='default'" -p cpu=3 -p core=17 -p cpuset=0 -p gpu=5 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='18' AND type='default'" -p cpu=3 -p core=18 -p cpuset=1 -p gpu=5 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='19' AND type='default'" -p cpu=3 -p core=19 -p cpuset=2 -p gpu=5 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='20' AND type='default'" -p cpu=3 -p core=20 -p cpuset=3 -p gpu=5 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='21' AND type='default'" -p cpu=3 -p core=21 -p cpuset=4 -p gpu=6 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='22' AND type='default'" -p cpu=3 -p core=22 -p cpuset=5 -p gpu=6 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='23' AND type='default'" -p cpu=3 -p core=23 -p cpuset=6 -p gpu=6 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='24' AND type='default'" -p cpu=3 -p core=24 -p cpuset=7 -p gpu=6 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='25' AND type='default'" -p cpu=4 -p core=25 -p cpuset=8 -p gpu=7 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='26' AND type='default'" -p cpu=4 -p core=26 -p cpuset=9 -p gpu=7 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='27' AND type='default'" -p cpu=4 -p core=27 -p cpuset=10 -p gpu=7 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='28' AND type='default'" -p cpu=4 -p core=28 -p cpuset=11 -p gpu=7 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='29' AND type='default'" -p cpu=4 -p core=29 -p cpuset=12 -p gpu=8 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='30' AND type='default'" -p cpu=4 -p core=30 -p cpuset=13 -p gpu=8 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='31' AND type='default'" -p cpu=4 -p core=31 -p cpuset=14 -p gpu=8 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='32' AND type='default'" -p cpu=4 -p core=32 -p cpuset=15 -p gpu=8 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 echo; echo 'Setting properties for clustera-2.fakesite.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' and type='default'" -p ip='172.16.64.2' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw-fakesite' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 9L1CBX2' -p eth_count=1 -p eth_kavlan_count=0 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='GeForce RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='NO' -p cluster_priority=201906 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
+oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' and type='default'" -p ip='172.16.64.2' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw-fakesite' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 9L1CBX2' -p eth_count=1 -p eth_kavlan_count=0 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='NO' -p cluster_priority=201906 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
 
 echo '================================================================================'
diff --git a/spec/output/configured_misconfigured_gpu_table_stdout.txt b/spec/output/configured_misconfigured_gpu_table_stdout.txt
index ff22c49a17b..78c01fb6074 100644
--- a/spec/output/configured_misconfigured_gpu_table_stdout.txt
+++ b/spec/output/configured_misconfigured_gpu_table_stdout.txt
@@ -1,36 +1,36 @@
 +---------- + -------------------- + ----- + ----- + -------- + ---- + -------------------- + ------------------------------ + ------------------------------+
 |   cluster | host                 | cpu   | core  | cpuset   | gpu  | gpudevice            | cpumodel                       | gpumodel                      |
 +---------- + -------------------- + ----- + ----- + -------- + ---- + -------------------- + ------------------------------ + ------------------------------+
-|  clustera | clustera-1           | 1     | 1     | 0        | 1    | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 1     | 2     | 1        | 1    | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 1     | 3     | 2        | 1    | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 1     | 4     | 3        | 1    | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 1     | 5     | 4        | 2    | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 1     | 6     | 5        | 2    | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 1     | 7     | 6        | 2    | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 1     | 8     | 7        | 2    | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 2     | 9     | 8        | 3    | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 2     | 10    | 9        | 3    | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 2     | 11    | 10       | 3    | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 2     | 12    | 11       | 3    | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 2     | 13    | 12       | 4    | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 2     | 14    | 13       | 4    | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 2     | 15    | 14       | 4    | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 2     | 16    | 15       | 4    | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 3     | 17    | 0        | 5    | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 3     | 18    | 1        | 5    | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 3     | 19    | 2        | 5    | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 3     | 20    | 3        | 5    | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 3     | 21    | 4        | 6    | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 3     | 22    | 5        | 6    | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 3     | 23    | 6        | 6    | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 3     | 24    | 7        | 6    | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 4     | 25    | 8        | 7    | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 4     | 26    | 9        | 7    | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 4     | 27    | 10       | 7    | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 4     | 28    | 11       | 7    | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 4     | 29    | 12       | 8    | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 4     | 30    | 13       | 8    | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 4     | 31    | 14       | 8    | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 4     | 32    | 15       | 8    | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
+|  clustera | clustera-1           | 1     | 1     | 0        | 1    | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 1     | 2     | 1        | 1    | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 1     | 3     | 2        | 1    | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 1     | 4     | 3        | 1    | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 1     | 5     | 4        | 2    | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 1     | 6     | 5        | 2    | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 1     | 7     | 6        | 2    | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 1     | 8     | 7        | 2    | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 2     | 9     | 8        | 3    | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 2     | 10    | 9        | 3    | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 2     | 11    | 10       | 3    | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 2     | 12    | 11       | 3    | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 2     | 13    | 12       | 4    | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 2     | 14    | 13       | 4    | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 2     | 15    | 14       | 4    | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 2     | 16    | 15       | 4    | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 3     | 17    | 0        | 5    | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 3     | 18    | 1        | 5    | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 3     | 19    | 2        | 5    | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 3     | 20    | 3        | 5    | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 3     | 21    | 4        | 6    | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 3     | 22    | 5        | 6    | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 3     | 23    | 6        | 6    | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 3     | 24    | 7        | 6    | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 4     | 25    | 8        | 7    | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 4     | 26    | 9        | 7    | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 4     | 27    | 10       | 7    | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 4     | 28    | 11       | 7    | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 4     | 29    | 12       | 8    | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 4     | 30    | 13       | 8    | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 4     | 31    | 14       | 8    | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 4     | 32    | 15       | 8    | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
 +---------- + -------------------- + ----- + ----- + -------- + ---- + -------------------- + ------------------------------ + ------------------------------+
diff --git a/spec/output/configured_missing_network_interfaces_print_stdout.txt b/spec/output/configured_missing_network_interfaces_print_stdout.txt
index 283ee9a7342..10dde04f638 100644
--- a/spec/output/configured_missing_network_interfaces_print_stdout.txt
+++ b/spec/output/configured_missing_network_interfaces_print_stdout.txt
@@ -95,22 +95,22 @@ property_exist 'disk_reservation_count' || oarproperty -a disk_reservation_count
 ###################################
 # clustera-1.fakesite.grid5000.fr
 ###################################
-oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='1' AND type='default'" -p cpu=1 -p core=1 -p cpuset=0 -p gpu=1 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='2' AND type='default'" -p cpu=1 -p core=2 -p cpuset=1 -p gpu=1 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='3' AND type='default'" -p cpu=1 -p core=3 -p cpuset=2 -p gpu=1 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='4' AND type='default'" -p cpu=1 -p core=4 -p cpuset=3 -p gpu=1 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='5' AND type='default'" -p cpu=1 -p core=5 -p cpuset=4 -p gpu=2 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='6' AND type='default'" -p cpu=1 -p core=6 -p cpuset=5 -p gpu=2 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='7' AND type='default'" -p cpu=1 -p core=7 -p cpuset=6 -p gpu=2 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='8' AND type='default'" -p cpu=1 -p core=8 -p cpuset=7 -p gpu=2 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='9' AND type='default'" -p cpu=2 -p core=9 -p cpuset=8 -p gpu=3 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='10' AND type='default'" -p cpu=2 -p core=10 -p cpuset=9 -p gpu=3 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='11' AND type='default'" -p cpu=2 -p core=11 -p cpuset=10 -p gpu=3 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='12' AND type='default'" -p cpu=2 -p core=12 -p cpuset=11 -p gpu=3 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='13' AND type='default'" -p cpu=2 -p core=13 -p cpuset=12 -p gpu=4 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='14' AND type='default'" -p cpu=2 -p core=14 -p cpuset=13 -p gpu=4 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='15' AND type='default'" -p cpu=2 -p core=15 -p cpuset=14 -p gpu=4 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='16' AND type='default'" -p cpu=2 -p core=16 -p cpuset=15 -p gpu=4 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='1' AND type='default'" -p cpu=1 -p core=1 -p cpuset=0 -p gpu=1 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='2' AND type='default'" -p cpu=1 -p core=2 -p cpuset=1 -p gpu=1 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='3' AND type='default'" -p cpu=1 -p core=3 -p cpuset=2 -p gpu=1 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='4' AND type='default'" -p cpu=1 -p core=4 -p cpuset=3 -p gpu=1 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='5' AND type='default'" -p cpu=1 -p core=5 -p cpuset=4 -p gpu=2 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='6' AND type='default'" -p cpu=1 -p core=6 -p cpuset=5 -p gpu=2 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='7' AND type='default'" -p cpu=1 -p core=7 -p cpuset=6 -p gpu=2 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='8' AND type='default'" -p cpu=1 -p core=8 -p cpuset=7 -p gpu=2 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='9' AND type='default'" -p cpu=2 -p core=9 -p cpuset=8 -p gpu=3 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='10' AND type='default'" -p cpu=2 -p core=10 -p cpuset=9 -p gpu=3 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='11' AND type='default'" -p cpu=2 -p core=11 -p cpuset=10 -p gpu=3 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='12' AND type='default'" -p cpu=2 -p core=12 -p cpuset=11 -p gpu=3 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='13' AND type='default'" -p cpu=2 -p core=13 -p cpuset=12 -p gpu=4 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='14' AND type='default'" -p cpu=2 -p core=14 -p cpuset=13 -p gpu=4 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='15' AND type='default'" -p cpu=2 -p core=15 -p cpuset=14 -p gpu=4 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='16' AND type='default'" -p cpu=2 -p core=16 -p cpuset=15 -p gpu=4 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 echo ; echo 'Not setting properties for clustera-1.fakesite.grid5000.fr: node is not available in ref-api'; echo
 
 echo '================================================================================'
@@ -119,23 +119,23 @@ echo '==========================================================================
 ###################################
 # clustera-2.fakesite.grid5000.fr
 ###################################
-oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='17' AND type='default'" -p cpu=3 -p core=17 -p cpuset=0 -p gpu=5 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='18' AND type='default'" -p cpu=3 -p core=18 -p cpuset=1 -p gpu=5 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='19' AND type='default'" -p cpu=3 -p core=19 -p cpuset=2 -p gpu=5 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='20' AND type='default'" -p cpu=3 -p core=20 -p cpuset=3 -p gpu=5 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='21' AND type='default'" -p cpu=3 -p core=21 -p cpuset=4 -p gpu=6 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='22' AND type='default'" -p cpu=3 -p core=22 -p cpuset=5 -p gpu=6 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='23' AND type='default'" -p cpu=3 -p core=23 -p cpuset=6 -p gpu=6 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='24' AND type='default'" -p cpu=3 -p core=24 -p cpuset=7 -p gpu=6 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='25' AND type='default'" -p cpu=4 -p core=25 -p cpuset=8 -p gpu=7 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='26' AND type='default'" -p cpu=4 -p core=26 -p cpuset=9 -p gpu=7 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='27' AND type='default'" -p cpu=4 -p core=27 -p cpuset=10 -p gpu=7 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='28' AND type='default'" -p cpu=4 -p core=28 -p cpuset=11 -p gpu=7 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='29' AND type='default'" -p cpu=4 -p core=29 -p cpuset=12 -p gpu=8 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='30' AND type='default'" -p cpu=4 -p core=30 -p cpuset=13 -p gpu=8 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='31' AND type='default'" -p cpu=4 -p core=31 -p cpuset=14 -p gpu=8 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='32' AND type='default'" -p cpu=4 -p core=32 -p cpuset=15 -p gpu=8 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='17' AND type='default'" -p cpu=3 -p core=17 -p cpuset=0 -p gpu=5 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='18' AND type='default'" -p cpu=3 -p core=18 -p cpuset=1 -p gpu=5 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='19' AND type='default'" -p cpu=3 -p core=19 -p cpuset=2 -p gpu=5 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='20' AND type='default'" -p cpu=3 -p core=20 -p cpuset=3 -p gpu=5 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='21' AND type='default'" -p cpu=3 -p core=21 -p cpuset=4 -p gpu=6 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='22' AND type='default'" -p cpu=3 -p core=22 -p cpuset=5 -p gpu=6 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='23' AND type='default'" -p cpu=3 -p core=23 -p cpuset=6 -p gpu=6 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='24' AND type='default'" -p cpu=3 -p core=24 -p cpuset=7 -p gpu=6 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='25' AND type='default'" -p cpu=4 -p core=25 -p cpuset=8 -p gpu=7 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='26' AND type='default'" -p cpu=4 -p core=26 -p cpuset=9 -p gpu=7 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='27' AND type='default'" -p cpu=4 -p core=27 -p cpuset=10 -p gpu=7 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='28' AND type='default'" -p cpu=4 -p core=28 -p cpuset=11 -p gpu=7 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='29' AND type='default'" -p cpu=4 -p core=29 -p cpuset=12 -p gpu=8 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='30' AND type='default'" -p cpu=4 -p core=30 -p cpuset=13 -p gpu=8 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='31' AND type='default'" -p cpu=4 -p core=31 -p cpuset=14 -p gpu=8 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='32' AND type='default'" -p cpu=4 -p core=32 -p cpuset=15 -p gpu=8 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 echo; echo 'Setting properties for clustera-2.fakesite.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' and type='default'" -p ip='172.16.64.2' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw-fakesite' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 9L1CBX2' -p eth_count=1 -p eth_kavlan_count=0 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='GeForce RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='NO' -p cluster_priority=201906 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
+oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' and type='default'" -p ip='172.16.64.2' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw-fakesite' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 9L1CBX2' -p eth_count=1 -p eth_kavlan_count=0 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='NO' -p cluster_priority=201906 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
 
 echo '================================================================================'
diff --git a/spec/output/configured_missing_network_interfaces_table_stdout.txt b/spec/output/configured_missing_network_interfaces_table_stdout.txt
index 563f35f8b07..d5974ec5fc0 100644
--- a/spec/output/configured_missing_network_interfaces_table_stdout.txt
+++ b/spec/output/configured_missing_network_interfaces_table_stdout.txt
@@ -2,36 +2,36 @@ Error (missing property) while processing node clustera-1: Node clustera-1 does
 +---------- + -------------------- + ----- + ----- + -------- + ---- + -------------------- + ------------------------------ + ------------------------------+
 |   cluster | host                 | cpu   | core  | cpuset   | gpu  | gpudevice            | cpumodel                       | gpumodel                      |
 +---------- + -------------------- + ----- + ----- + -------- + ---- + -------------------- + ------------------------------ + ------------------------------+
-|  clustera | clustera-1           | 1     | 1     | 0        | 1    | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 1     | 2     | 1        | 1    | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 1     | 3     | 2        | 1    | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 1     | 4     | 3        | 1    | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 1     | 5     | 4        | 2    | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 1     | 6     | 5        | 2    | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 1     | 7     | 6        | 2    | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 1     | 8     | 7        | 2    | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 2     | 9     | 8        | 3    | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 2     | 10    | 9        | 3    | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 2     | 11    | 10       | 3    | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 2     | 12    | 11       | 3    | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 2     | 13    | 12       | 4    | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 2     | 14    | 13       | 4    | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 2     | 15    | 14       | 4    | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 2     | 16    | 15       | 4    | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 3     | 17    | 0        | 5    | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 3     | 18    | 1        | 5    | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 3     | 19    | 2        | 5    | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 3     | 20    | 3        | 5    | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 3     | 21    | 4        | 6    | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 3     | 22    | 5        | 6    | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 3     | 23    | 6        | 6    | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 3     | 24    | 7        | 6    | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 4     | 25    | 8        | 7    | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 4     | 26    | 9        | 7    | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 4     | 27    | 10       | 7    | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 4     | 28    | 11       | 7    | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 4     | 29    | 12       | 8    | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 4     | 30    | 13       | 8    | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 4     | 31    | 14       | 8    | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 4     | 32    | 15       | 8    | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
+|  clustera | clustera-1           | 1     | 1     | 0        | 1    | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 1     | 2     | 1        | 1    | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 1     | 3     | 2        | 1    | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 1     | 4     | 3        | 1    | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 1     | 5     | 4        | 2    | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 1     | 6     | 5        | 2    | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 1     | 7     | 6        | 2    | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 1     | 8     | 7        | 2    | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 2     | 9     | 8        | 3    | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 2     | 10    | 9        | 3    | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 2     | 11    | 10       | 3    | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 2     | 12    | 11       | 3    | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 2     | 13    | 12       | 4    | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 2     | 14    | 13       | 4    | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 2     | 15    | 14       | 4    | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 2     | 16    | 15       | 4    | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 3     | 17    | 0        | 5    | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 3     | 18    | 1        | 5    | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 3     | 19    | 2        | 5    | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 3     | 20    | 3        | 5    | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 3     | 21    | 4        | 6    | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 3     | 22    | 5        | 6    | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 3     | 23    | 6        | 6    | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 3     | 24    | 7        | 6    | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 4     | 25    | 8        | 7    | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 4     | 26    | 9        | 7    | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 4     | 27    | 10       | 7    | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 4     | 28    | 11       | 7    | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 4     | 29    | 12       | 8    | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 4     | 30    | 13       | 8    | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 4     | 31    | 14       | 8    | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 4     | 32    | 15       | 8    | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
 +---------- + -------------------- + ----- + ----- + -------- + ---- + -------------------- + ------------------------------ + ------------------------------+
diff --git a/spec/output/configured_with_disk_diff_stdout.txt b/spec/output/configured_with_disk_diff_stdout.txt
index 437cd45ebac..5d41a3f7bee 100644
--- a/spec/output/configured_with_disk_diff_stdout.txt
+++ b/spec/output/configured_with_disk_diff_stdout.txt
@@ -18,7 +18,7 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "eth_rate", 10]
     ["+", "exotic", "NO"]
     ["+", "gpu_count", 4]
-    ["+", "gpu_model", "GeForce RTX 2080 Ti"]
+    ["+", "gpu_model", "NVIDIA GeForce RTX 2080 Ti"]
     ["+", "ib", "NO"]
     ["+", "ib_count", 0]
     ["+", "ib_rate", 0]
@@ -59,7 +59,7 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "eth_rate", 10]
     ["+", "exotic", "NO"]
     ["+", "gpu_count", 4]
-    ["+", "gpu_model", "GeForce RTX 2080 Ti"]
+    ["+", "gpu_model", "NVIDIA GeForce RTX 2080 Ti"]
     ["+", "ib", "NO"]
     ["+", "ib_count", 0]
     ["+", "ib_rate", 0]
diff --git a/spec/output/configured_with_disk_print_stdout.txt b/spec/output/configured_with_disk_print_stdout.txt
index 1592cb5b00d..52357c13f7c 100644
--- a/spec/output/configured_with_disk_print_stdout.txt
+++ b/spec/output/configured_with_disk_print_stdout.txt
@@ -95,24 +95,24 @@ property_exist 'diskpath' || oarproperty -a diskpath --varchar
 ###################################
 # clustera-1.fakesite.grid5000.fr
 ###################################
-oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=5 -p core=33 -p cpuset=0 -p gpu=9 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=5 -p core=34 -p cpuset=1 -p gpu=9 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=5 -p core=35 -p cpuset=2 -p gpu=9 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=5 -p core=36 -p cpuset=3 -p gpu=9 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=5 -p core=37 -p cpuset=4 -p gpu=10 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=5 -p core=38 -p cpuset=5 -p gpu=10 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=5 -p core=39 -p cpuset=6 -p gpu=10 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=5 -p core=40 -p cpuset=7 -p gpu=10 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=6 -p core=41 -p cpuset=8 -p gpu=11 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=6 -p core=42 -p cpuset=9 -p gpu=11 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=6 -p core=43 -p cpuset=10 -p gpu=11 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=6 -p core=44 -p cpuset=11 -p gpu=11 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=6 -p core=45 -p cpuset=12 -p gpu=12 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=6 -p core=46 -p cpuset=13 -p gpu=12 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=6 -p core=47 -p cpuset=14 -p gpu=12 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=6 -p core=48 -p cpuset=15 -p gpu=12 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=5 -p core=33 -p cpuset=0 -p gpu=9 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=5 -p core=34 -p cpuset=1 -p gpu=9 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=5 -p core=35 -p cpuset=2 -p gpu=9 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=5 -p core=36 -p cpuset=3 -p gpu=9 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=5 -p core=37 -p cpuset=4 -p gpu=10 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=5 -p core=38 -p cpuset=5 -p gpu=10 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=5 -p core=39 -p cpuset=6 -p gpu=10 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=5 -p core=40 -p cpuset=7 -p gpu=10 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=6 -p core=41 -p cpuset=8 -p gpu=11 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=6 -p core=42 -p cpuset=9 -p gpu=11 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=6 -p core=43 -p cpuset=10 -p gpu=11 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=6 -p core=44 -p cpuset=11 -p gpu=11 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=6 -p core=45 -p cpuset=12 -p gpu=12 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=6 -p core=46 -p cpuset=13 -p gpu=12 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=6 -p core=47 -p cpuset=14 -p gpu=12 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=6 -p core=48 -p cpuset=15 -p gpu=12 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 echo; echo 'Setting properties for clustera-1.fakesite.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' and type='default'" -p ip='172.16.64.1' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw-fakesite' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 FL1CBX2' -p eth_count=1 -p eth_kavlan_count=0 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='GeForce RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='NO' -p cluster_priority=201906 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
+oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' and type='default'" -p ip='172.16.64.1' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw-fakesite' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 FL1CBX2' -p eth_count=1 -p eth_kavlan_count=0 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='NO' -p cluster_priority=201906 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
 
 echo '================================================================================'
 
@@ -120,23 +120,23 @@ echo '==========================================================================
 ###################################
 # clustera-2.fakesite.grid5000.fr
 ###################################
-oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=7 -p core=49 -p cpuset=0 -p gpu=13 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=7 -p core=50 -p cpuset=1 -p gpu=13 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=7 -p core=51 -p cpuset=2 -p gpu=13 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=7 -p core=52 -p cpuset=3 -p gpu=13 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=7 -p core=53 -p cpuset=4 -p gpu=14 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=7 -p core=54 -p cpuset=5 -p gpu=14 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=7 -p core=55 -p cpuset=6 -p gpu=14 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=7 -p core=56 -p cpuset=7 -p gpu=14 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=8 -p core=57 -p cpuset=8 -p gpu=15 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=8 -p core=58 -p cpuset=9 -p gpu=15 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=8 -p core=59 -p cpuset=10 -p gpu=15 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=8 -p core=60 -p cpuset=11 -p gpu=15 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=8 -p core=61 -p cpuset=12 -p gpu=16 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=8 -p core=62 -p cpuset=13 -p gpu=16 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=8 -p core=63 -p cpuset=14 -p gpu=16 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=8 -p core=64 -p cpuset=15 -p gpu=16 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=7 -p core=49 -p cpuset=0 -p gpu=13 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=7 -p core=50 -p cpuset=1 -p gpu=13 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=7 -p core=51 -p cpuset=2 -p gpu=13 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=7 -p core=52 -p cpuset=3 -p gpu=13 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=7 -p core=53 -p cpuset=4 -p gpu=14 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=7 -p core=54 -p cpuset=5 -p gpu=14 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=7 -p core=55 -p cpuset=6 -p gpu=14 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=7 -p core=56 -p cpuset=7 -p gpu=14 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=8 -p core=57 -p cpuset=8 -p gpu=15 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=8 -p core=58 -p cpuset=9 -p gpu=15 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=8 -p core=59 -p cpuset=10 -p gpu=15 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=8 -p core=60 -p cpuset=11 -p gpu=15 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=8 -p core=61 -p cpuset=12 -p gpu=16 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=8 -p core=62 -p cpuset=13 -p gpu=16 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=8 -p core=63 -p cpuset=14 -p gpu=16 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=8 -p core=64 -p cpuset=15 -p gpu=16 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 echo; echo 'Setting properties for clustera-2.fakesite.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' and type='default'" -p ip='172.16.64.2' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw-fakesite' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 9L1CBX2' -p eth_count=1 -p eth_kavlan_count=0 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='GeForce RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='NO' -p cluster_priority=201906 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
+oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' and type='default'" -p ip='172.16.64.2' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw-fakesite' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 9L1CBX2' -p eth_count=1 -p eth_kavlan_count=0 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='NO' -p cluster_priority=201906 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
 
 echo '================================================================================'
diff --git a/spec/output/configured_with_disk_table_stdout.txt b/spec/output/configured_with_disk_table_stdout.txt
index 61ea618d71d..e74b511b992 100644
--- a/spec/output/configured_with_disk_table_stdout.txt
+++ b/spec/output/configured_with_disk_table_stdout.txt
@@ -1,36 +1,36 @@
 +---------- + -------------------- + ----- + ----- + -------- + ---- + -------------------- + ------------------------------ + ------------------------------+
 |   cluster | host                 | cpu   | core  | cpuset   | gpu  | gpudevice            | cpumodel                       | gpumodel                      |
 +---------- + -------------------- + ----- + ----- + -------- + ---- + -------------------- + ------------------------------ + ------------------------------+
-|  clustera | clustera-1           | 5     | 33    | 0        | 9    | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 5     | 34    | 1        | 9    | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 5     | 35    | 2        | 9    | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 5     | 36    | 3        | 9    | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 5     | 37    | 4        | 10   | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 5     | 38    | 5        | 10   | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 5     | 39    | 6        | 10   | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 5     | 40    | 7        | 10   | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 6     | 41    | 8        | 11   | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 6     | 42    | 9        | 11   | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 6     | 43    | 10       | 11   | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 6     | 44    | 11       | 11   | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 6     | 45    | 12       | 12   | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 6     | 46    | 13       | 12   | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 6     | 47    | 14       | 12   | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 6     | 48    | 15       | 12   | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 7     | 49    | 0        | 13   | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 7     | 50    | 1        | 13   | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 7     | 51    | 2        | 13   | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 7     | 52    | 3        | 13   | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 7     | 53    | 4        | 14   | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 7     | 54    | 5        | 14   | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 7     | 55    | 6        | 14   | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 7     | 56    | 7        | 14   | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 8     | 57    | 8        | 15   | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 8     | 58    | 9        | 15   | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 8     | 59    | 10       | 15   | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 8     | 60    | 11       | 15   | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 8     | 61    | 12       | 16   | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 8     | 62    | 13       | 16   | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 8     | 63    | 14       | 16   | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 8     | 64    | 15       | 16   | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
+|  clustera | clustera-1           | 5     | 33    | 0        | 9    | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 5     | 34    | 1        | 9    | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 5     | 35    | 2        | 9    | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 5     | 36    | 3        | 9    | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 5     | 37    | 4        | 10   | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 5     | 38    | 5        | 10   | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 5     | 39    | 6        | 10   | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 5     | 40    | 7        | 10   | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 6     | 41    | 8        | 11   | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 6     | 42    | 9        | 11   | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 6     | 43    | 10       | 11   | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 6     | 44    | 11       | 11   | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 6     | 45    | 12       | 12   | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 6     | 46    | 13       | 12   | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 6     | 47    | 14       | 12   | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 6     | 48    | 15       | 12   | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 7     | 49    | 0        | 13   | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 7     | 50    | 1        | 13   | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 7     | 51    | 2        | 13   | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 7     | 52    | 3        | 13   | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 7     | 53    | 4        | 14   | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 7     | 54    | 5        | 14   | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 7     | 55    | 6        | 14   | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 7     | 56    | 7        | 14   | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 8     | 57    | 8        | 15   | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 8     | 58    | 9        | 15   | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 8     | 59    | 10       | 15   | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 8     | 60    | 11       | 15   | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 8     | 61    | 12       | 16   | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 8     | 62    | 13       | 16   | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 8     | 63    | 14       | 16   | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 8     | 64    | 15       | 16   | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
 +---------- + -------------------- + ----- + ----- + -------- + ---- + -------------------- + ------------------------------ + ------------------------------+
diff --git a/spec/output/configured_without_gpu_diff_stdout.txt b/spec/output/configured_without_gpu_diff_stdout.txt
index 8f7fc271919..900be5ed399 100644
--- a/spec/output/configured_without_gpu_diff_stdout.txt
+++ b/spec/output/configured_without_gpu_diff_stdout.txt
@@ -18,7 +18,7 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "eth_rate", 10]
     ["+", "exotic", "NO"]
     ["+", "gpu_count", 4]
-    ["+", "gpu_model", "GeForce RTX 2080 Ti"]
+    ["+", "gpu_model", "NVIDIA GeForce RTX 2080 Ti"]
     ["+", "ib", "NO"]
     ["+", "ib_count", 0]
     ["+", "ib_rate", 0]
@@ -59,7 +59,7 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "eth_rate", 10]
     ["+", "exotic", "NO"]
     ["+", "gpu_count", 4]
-    ["+", "gpu_model", "GeForce RTX 2080 Ti"]
+    ["+", "gpu_model", "NVIDIA GeForce RTX 2080 Ti"]
     ["+", "ib", "NO"]
     ["+", "ib_count", 0]
     ["+", "ib_rate", 0]
diff --git a/spec/output/configured_without_gpu_print_stdout.txt b/spec/output/configured_without_gpu_print_stdout.txt
index 383e6d76d70..9aea4ca6ded 100644
--- a/spec/output/configured_without_gpu_print_stdout.txt
+++ b/spec/output/configured_without_gpu_print_stdout.txt
@@ -95,24 +95,24 @@ property_exist 'diskpath' || oarproperty -a diskpath --varchar
 ###################################
 # clustera-1.fakesite.grid5000.fr
 ###################################
-oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=5 -p core=33 -p cpuset=0 -p gpu=1 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=5 -p core=34 -p cpuset=1 -p gpu=1 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=5 -p core=35 -p cpuset=2 -p gpu=1 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=5 -p core=36 -p cpuset=3 -p gpu=1 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=5 -p core=37 -p cpuset=4 -p gpu=2 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=5 -p core=38 -p cpuset=5 -p gpu=2 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=5 -p core=39 -p cpuset=6 -p gpu=2 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=5 -p core=40 -p cpuset=7 -p gpu=2 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=6 -p core=41 -p cpuset=8 -p gpu=3 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=6 -p core=42 -p cpuset=9 -p gpu=3 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=6 -p core=43 -p cpuset=10 -p gpu=3 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=6 -p core=44 -p cpuset=11 -p gpu=3 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=6 -p core=45 -p cpuset=12 -p gpu=4 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=6 -p core=46 -p cpuset=13 -p gpu=4 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=6 -p core=47 -p cpuset=14 -p gpu=4 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=6 -p core=48 -p cpuset=15 -p gpu=4 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=5 -p core=33 -p cpuset=0 -p gpu=1 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=5 -p core=34 -p cpuset=1 -p gpu=1 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=5 -p core=35 -p cpuset=2 -p gpu=1 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=5 -p core=36 -p cpuset=3 -p gpu=1 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=5 -p core=37 -p cpuset=4 -p gpu=2 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=5 -p core=38 -p cpuset=5 -p gpu=2 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=5 -p core=39 -p cpuset=6 -p gpu=2 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=5 -p core=40 -p cpuset=7 -p gpu=2 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=6 -p core=41 -p cpuset=8 -p gpu=3 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=6 -p core=42 -p cpuset=9 -p gpu=3 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=6 -p core=43 -p cpuset=10 -p gpu=3 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=6 -p core=44 -p cpuset=11 -p gpu=3 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=6 -p core=45 -p cpuset=12 -p gpu=4 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=6 -p core=46 -p cpuset=13 -p gpu=4 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=6 -p core=47 -p cpuset=14 -p gpu=4 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=6 -p core=48 -p cpuset=15 -p gpu=4 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 echo; echo 'Setting properties for clustera-1.fakesite.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' and type='default'" -p ip='172.16.64.1' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw-fakesite' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 FL1CBX2' -p eth_count=1 -p eth_kavlan_count=0 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='GeForce RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='NO' -p cluster_priority=201906 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
+oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' and type='default'" -p ip='172.16.64.1' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw-fakesite' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 FL1CBX2' -p eth_count=1 -p eth_kavlan_count=0 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='NO' -p cluster_priority=201906 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
 
 echo '================================================================================'
 
@@ -120,23 +120,23 @@ echo '==========================================================================
 ###################################
 # clustera-2.fakesite.grid5000.fr
 ###################################
-oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=7 -p core=49 -p cpuset=0 -p gpu=5 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=7 -p core=50 -p cpuset=1 -p gpu=5 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=7 -p core=51 -p cpuset=2 -p gpu=5 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=7 -p core=52 -p cpuset=3 -p gpu=5 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=7 -p core=53 -p cpuset=4 -p gpu=6 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=7 -p core=54 -p cpuset=5 -p gpu=6 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=7 -p core=55 -p cpuset=6 -p gpu=6 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=7 -p core=56 -p cpuset=7 -p gpu=6 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=8 -p core=57 -p cpuset=8 -p gpu=7 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=8 -p core=58 -p cpuset=9 -p gpu=7 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=8 -p core=59 -p cpuset=10 -p gpu=7 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=8 -p core=60 -p cpuset=11 -p gpu=7 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=8 -p core=61 -p cpuset=12 -p gpu=8 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=8 -p core=62 -p cpuset=13 -p gpu=8 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=8 -p core=63 -p cpuset=14 -p gpu=8 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=8 -p core=64 -p cpuset=15 -p gpu=8 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=7 -p core=49 -p cpuset=0 -p gpu=5 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=7 -p core=50 -p cpuset=1 -p gpu=5 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=7 -p core=51 -p cpuset=2 -p gpu=5 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=7 -p core=52 -p cpuset=3 -p gpu=5 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=7 -p core=53 -p cpuset=4 -p gpu=6 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=7 -p core=54 -p cpuset=5 -p gpu=6 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=7 -p core=55 -p cpuset=6 -p gpu=6 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=7 -p core=56 -p cpuset=7 -p gpu=6 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=8 -p core=57 -p cpuset=8 -p gpu=7 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=8 -p core=58 -p cpuset=9 -p gpu=7 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=8 -p core=59 -p cpuset=10 -p gpu=7 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=8 -p core=60 -p cpuset=11 -p gpu=7 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=8 -p core=61 -p cpuset=12 -p gpu=8 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=8 -p core=62 -p cpuset=13 -p gpu=8 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=8 -p core=63 -p cpuset=14 -p gpu=8 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=8 -p core=64 -p cpuset=15 -p gpu=8 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 echo; echo 'Setting properties for clustera-2.fakesite.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' and type='default'" -p ip='172.16.64.2' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw-fakesite' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 9L1CBX2' -p eth_count=1 -p eth_kavlan_count=0 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='GeForce RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='NO' -p cluster_priority=201906 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
+oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' and type='default'" -p ip='172.16.64.2' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw-fakesite' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 9L1CBX2' -p eth_count=1 -p eth_kavlan_count=0 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='NO' -p cluster_priority=201906 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
 
 echo '================================================================================'
diff --git a/spec/output/configured_without_gpu_table_stdout.txt b/spec/output/configured_without_gpu_table_stdout.txt
index 1090ebff98a..4964c44226f 100644
--- a/spec/output/configured_without_gpu_table_stdout.txt
+++ b/spec/output/configured_without_gpu_table_stdout.txt
@@ -1,36 +1,36 @@
 +---------- + -------------------- + ----- + ----- + -------- + ---- + -------------------- + ------------------------------ + ------------------------------+
 |   cluster | host                 | cpu   | core  | cpuset   | gpu  | gpudevice            | cpumodel                       | gpumodel                      |
 +---------- + -------------------- + ----- + ----- + -------- + ---- + -------------------- + ------------------------------ + ------------------------------+
-|  clustera | clustera-1           | 5     | 33    | 0        | 1    | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 5     | 34    | 1        | 1    | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 5     | 35    | 2        | 1    | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 5     | 36    | 3        | 1    | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 5     | 37    | 4        | 2    | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 5     | 38    | 5        | 2    | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 5     | 39    | 6        | 2    | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 5     | 40    | 7        | 2    | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 6     | 41    | 8        | 3    | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 6     | 42    | 9        | 3    | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 6     | 43    | 10       | 3    | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 6     | 44    | 11       | 3    | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 6     | 45    | 12       | 4    | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 6     | 46    | 13       | 4    | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 6     | 47    | 14       | 4    | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 6     | 48    | 15       | 4    | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 7     | 49    | 0        | 5    | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 7     | 50    | 1        | 5    | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 7     | 51    | 2        | 5    | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 7     | 52    | 3        | 5    | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 7     | 53    | 4        | 6    | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 7     | 54    | 5        | 6    | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 7     | 55    | 6        | 6    | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 7     | 56    | 7        | 6    | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 8     | 57    | 8        | 7    | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 8     | 58    | 9        | 7    | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 8     | 59    | 10       | 7    | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 8     | 60    | 11       | 7    | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 8     | 61    | 12       | 8    | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 8     | 62    | 13       | 8    | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 8     | 63    | 14       | 8    | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 8     | 64    | 15       | 8    | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
+|  clustera | clustera-1           | 5     | 33    | 0        | 1    | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 5     | 34    | 1        | 1    | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 5     | 35    | 2        | 1    | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 5     | 36    | 3        | 1    | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 5     | 37    | 4        | 2    | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 5     | 38    | 5        | 2    | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 5     | 39    | 6        | 2    | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 5     | 40    | 7        | 2    | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 6     | 41    | 8        | 3    | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 6     | 42    | 9        | 3    | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 6     | 43    | 10       | 3    | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 6     | 44    | 11       | 3    | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 6     | 45    | 12       | 4    | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 6     | 46    | 13       | 4    | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 6     | 47    | 14       | 4    | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 6     | 48    | 15       | 4    | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 7     | 49    | 0        | 5    | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 7     | 50    | 1        | 5    | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 7     | 51    | 2        | 5    | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 7     | 52    | 3        | 5    | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 7     | 53    | 4        | 6    | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 7     | 54    | 5        | 6    | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 7     | 55    | 6        | 6    | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 7     | 56    | 7        | 6    | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 8     | 57    | 8        | 7    | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 8     | 58    | 9        | 7    | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 8     | 59    | 10       | 7    | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 8     | 60    | 11       | 7    | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 8     | 61    | 12       | 8    | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 8     | 62    | 13       | 8    | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 8     | 63    | 14       | 8    | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 8     | 64    | 15       | 8    | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
 +---------- + -------------------- + ----- + ----- + -------- + ---- + -------------------- + ------------------------------ + ------------------------------+
diff --git a/spec/output/different_value_wattmeters_print_stdout.txt b/spec/output/different_value_wattmeters_print_stdout.txt
index db086ef26b1..3722dfbd9eb 100644
--- a/spec/output/different_value_wattmeters_print_stdout.txt
+++ b/spec/output/different_value_wattmeters_print_stdout.txt
@@ -93,24 +93,24 @@ property_exist 'disk_reservation_count' || oarproperty -a disk_reservation_count
 ###################################
 # clustera-1.fakesite.grid5000.fr
 ###################################
-oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='1' AND type='default'" -p cpu=1 -p core=1 -p cpuset=0 -p gpu=1 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='2' AND type='default'" -p cpu=1 -p core=2 -p cpuset=1 -p gpu=1 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='3' AND type='default'" -p cpu=1 -p core=3 -p cpuset=2 -p gpu=1 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='4' AND type='default'" -p cpu=1 -p core=4 -p cpuset=3 -p gpu=1 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='5' AND type='default'" -p cpu=1 -p core=5 -p cpuset=4 -p gpu=2 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='6' AND type='default'" -p cpu=1 -p core=6 -p cpuset=5 -p gpu=2 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='7' AND type='default'" -p cpu=1 -p core=7 -p cpuset=6 -p gpu=2 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='8' AND type='default'" -p cpu=1 -p core=8 -p cpuset=7 -p gpu=2 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='9' AND type='default'" -p cpu=2 -p core=9 -p cpuset=8 -p gpu=3 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='10' AND type='default'" -p cpu=2 -p core=10 -p cpuset=9 -p gpu=3 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='11' AND type='default'" -p cpu=2 -p core=11 -p cpuset=10 -p gpu=3 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='12' AND type='default'" -p cpu=2 -p core=12 -p cpuset=11 -p gpu=3 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='13' AND type='default'" -p cpu=2 -p core=13 -p cpuset=12 -p gpu=4 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='14' AND type='default'" -p cpu=2 -p core=14 -p cpuset=13 -p gpu=4 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='15' AND type='default'" -p cpu=2 -p core=15 -p cpuset=14 -p gpu=4 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='16' AND type='default'" -p cpu=2 -p core=16 -p cpuset=15 -p gpu=4 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='1' AND type='default'" -p cpu=1 -p core=1 -p cpuset=0 -p gpu=1 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='2' AND type='default'" -p cpu=1 -p core=2 -p cpuset=1 -p gpu=1 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='3' AND type='default'" -p cpu=1 -p core=3 -p cpuset=2 -p gpu=1 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='4' AND type='default'" -p cpu=1 -p core=4 -p cpuset=3 -p gpu=1 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='5' AND type='default'" -p cpu=1 -p core=5 -p cpuset=4 -p gpu=2 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='6' AND type='default'" -p cpu=1 -p core=6 -p cpuset=5 -p gpu=2 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='7' AND type='default'" -p cpu=1 -p core=7 -p cpuset=6 -p gpu=2 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='8' AND type='default'" -p cpu=1 -p core=8 -p cpuset=7 -p gpu=2 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='9' AND type='default'" -p cpu=2 -p core=9 -p cpuset=8 -p gpu=3 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='10' AND type='default'" -p cpu=2 -p core=10 -p cpuset=9 -p gpu=3 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='11' AND type='default'" -p cpu=2 -p core=11 -p cpuset=10 -p gpu=3 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='12' AND type='default'" -p cpu=2 -p core=12 -p cpuset=11 -p gpu=3 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='13' AND type='default'" -p cpu=2 -p core=13 -p cpuset=12 -p gpu=4 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='14' AND type='default'" -p cpu=2 -p core=14 -p cpuset=13 -p gpu=4 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='15' AND type='default'" -p cpu=2 -p core=15 -p cpuset=14 -p gpu=4 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='16' AND type='default'" -p cpu=2 -p core=16 -p cpuset=15 -p gpu=4 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 echo; echo 'Setting properties for clustera-1.fakesite.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' and type='default'" -p ip='172.16.64.1' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw-fakesite' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 FL1CBX2' -p eth_count=1 -p eth_kavlan_count=0 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='GeForce RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='NO' -p cluster_priority=201906 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
+oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' and type='default'" -p ip='172.16.64.1' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw-fakesite' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 FL1CBX2' -p eth_count=1 -p eth_kavlan_count=0 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='NO' -p cluster_priority=201906 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
 
 echo '================================================================================'
 
@@ -118,23 +118,23 @@ echo '==========================================================================
 ###################################
 # clustera-2.fakesite.grid5000.fr
 ###################################
-oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='17' AND type='default'" -p cpu=3 -p core=17 -p cpuset=0 -p gpu=5 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='18' AND type='default'" -p cpu=3 -p core=18 -p cpuset=1 -p gpu=5 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='19' AND type='default'" -p cpu=3 -p core=19 -p cpuset=2 -p gpu=5 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='20' AND type='default'" -p cpu=3 -p core=20 -p cpuset=3 -p gpu=5 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='21' AND type='default'" -p cpu=3 -p core=21 -p cpuset=4 -p gpu=6 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='22' AND type='default'" -p cpu=3 -p core=22 -p cpuset=5 -p gpu=6 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='23' AND type='default'" -p cpu=3 -p core=23 -p cpuset=6 -p gpu=6 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='24' AND type='default'" -p cpu=3 -p core=24 -p cpuset=7 -p gpu=6 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='25' AND type='default'" -p cpu=4 -p core=25 -p cpuset=8 -p gpu=7 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='26' AND type='default'" -p cpu=4 -p core=26 -p cpuset=9 -p gpu=7 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='27' AND type='default'" -p cpu=4 -p core=27 -p cpuset=10 -p gpu=7 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='28' AND type='default'" -p cpu=4 -p core=28 -p cpuset=11 -p gpu=7 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='29' AND type='default'" -p cpu=4 -p core=29 -p cpuset=12 -p gpu=8 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='30' AND type='default'" -p cpu=4 -p core=30 -p cpuset=13 -p gpu=8 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='31' AND type='default'" -p cpu=4 -p core=31 -p cpuset=14 -p gpu=8 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='32' AND type='default'" -p cpu=4 -p core=32 -p cpuset=15 -p gpu=8 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='17' AND type='default'" -p cpu=3 -p core=17 -p cpuset=0 -p gpu=5 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='18' AND type='default'" -p cpu=3 -p core=18 -p cpuset=1 -p gpu=5 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='19' AND type='default'" -p cpu=3 -p core=19 -p cpuset=2 -p gpu=5 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='20' AND type='default'" -p cpu=3 -p core=20 -p cpuset=3 -p gpu=5 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='21' AND type='default'" -p cpu=3 -p core=21 -p cpuset=4 -p gpu=6 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='22' AND type='default'" -p cpu=3 -p core=22 -p cpuset=5 -p gpu=6 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='23' AND type='default'" -p cpu=3 -p core=23 -p cpuset=6 -p gpu=6 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='24' AND type='default'" -p cpu=3 -p core=24 -p cpuset=7 -p gpu=6 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='25' AND type='default'" -p cpu=4 -p core=25 -p cpuset=8 -p gpu=7 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='26' AND type='default'" -p cpu=4 -p core=26 -p cpuset=9 -p gpu=7 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='27' AND type='default'" -p cpu=4 -p core=27 -p cpuset=10 -p gpu=7 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='28' AND type='default'" -p cpu=4 -p core=28 -p cpuset=11 -p gpu=7 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='29' AND type='default'" -p cpu=4 -p core=29 -p cpuset=12 -p gpu=8 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='30' AND type='default'" -p cpu=4 -p core=30 -p cpuset=13 -p gpu=8 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='31' AND type='default'" -p cpu=4 -p core=31 -p cpuset=14 -p gpu=8 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='32' AND type='default'" -p cpu=4 -p core=32 -p cpuset=15 -p gpu=8 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 echo; echo 'Setting properties for clustera-2.fakesite.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' and type='default'" -p ip='172.16.64.2' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw-fakesite' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 9L1CBX2' -p eth_count=1 -p eth_kavlan_count=0 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='GeForce RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='NO' -p cluster_priority=201906 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
+oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' and type='default'" -p ip='172.16.64.2' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw-fakesite' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 9L1CBX2' -p eth_count=1 -p eth_kavlan_count=0 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='NO' -p cluster_priority=201906 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
 
 echo '================================================================================'
diff --git a/spec/output/different_value_wattmeters_table_stdout.txt b/spec/output/different_value_wattmeters_table_stdout.txt
index ff22c49a17b..78c01fb6074 100644
--- a/spec/output/different_value_wattmeters_table_stdout.txt
+++ b/spec/output/different_value_wattmeters_table_stdout.txt
@@ -1,36 +1,36 @@
 +---------- + -------------------- + ----- + ----- + -------- + ---- + -------------------- + ------------------------------ + ------------------------------+
 |   cluster | host                 | cpu   | core  | cpuset   | gpu  | gpudevice            | cpumodel                       | gpumodel                      |
 +---------- + -------------------- + ----- + ----- + -------- + ---- + -------------------- + ------------------------------ + ------------------------------+
-|  clustera | clustera-1           | 1     | 1     | 0        | 1    | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 1     | 2     | 1        | 1    | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 1     | 3     | 2        | 1    | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 1     | 4     | 3        | 1    | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 1     | 5     | 4        | 2    | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 1     | 6     | 5        | 2    | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 1     | 7     | 6        | 2    | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 1     | 8     | 7        | 2    | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 2     | 9     | 8        | 3    | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 2     | 10    | 9        | 3    | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 2     | 11    | 10       | 3    | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 2     | 12    | 11       | 3    | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 2     | 13    | 12       | 4    | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 2     | 14    | 13       | 4    | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 2     | 15    | 14       | 4    | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 2     | 16    | 15       | 4    | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 3     | 17    | 0        | 5    | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 3     | 18    | 1        | 5    | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 3     | 19    | 2        | 5    | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 3     | 20    | 3        | 5    | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 3     | 21    | 4        | 6    | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 3     | 22    | 5        | 6    | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 3     | 23    | 6        | 6    | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 3     | 24    | 7        | 6    | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 4     | 25    | 8        | 7    | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 4     | 26    | 9        | 7    | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 4     | 27    | 10       | 7    | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 4     | 28    | 11       | 7    | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 4     | 29    | 12       | 8    | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 4     | 30    | 13       | 8    | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 4     | 31    | 14       | 8    | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 4     | 32    | 15       | 8    | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
+|  clustera | clustera-1           | 1     | 1     | 0        | 1    | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 1     | 2     | 1        | 1    | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 1     | 3     | 2        | 1    | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 1     | 4     | 3        | 1    | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 1     | 5     | 4        | 2    | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 1     | 6     | 5        | 2    | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 1     | 7     | 6        | 2    | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 1     | 8     | 7        | 2    | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 2     | 9     | 8        | 3    | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 2     | 10    | 9        | 3    | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 2     | 11    | 10       | 3    | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 2     | 12    | 11       | 3    | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 2     | 13    | 12       | 4    | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 2     | 14    | 13       | 4    | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 2     | 15    | 14       | 4    | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 2     | 16    | 15       | 4    | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 3     | 17    | 0        | 5    | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 3     | 18    | 1        | 5    | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 3     | 19    | 2        | 5    | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 3     | 20    | 3        | 5    | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 3     | 21    | 4        | 6    | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 3     | 22    | 5        | 6    | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 3     | 23    | 6        | 6    | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 3     | 24    | 7        | 6    | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 4     | 25    | 8        | 7    | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 4     | 26    | 9        | 7    | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 4     | 27    | 10       | 7    | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 4     | 28    | 11       | 7    | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 4     | 29    | 12       | 8    | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 4     | 30    | 13       | 8    | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 4     | 31    | 14       | 8    | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 4     | 32    | 15       | 8    | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
 +---------- + -------------------- + ----- + ----- + -------- + ---- + -------------------- + ------------------------------ + ------------------------------+
diff --git a/spec/output/empty_diff_stdout.txt b/spec/output/empty_diff_stdout.txt
index 38c9d8816c4..0d6c27dce83 100644
--- a/spec/output/empty_diff_stdout.txt
+++ b/spec/output/empty_diff_stdout.txt
@@ -18,7 +18,7 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "eth_rate", 10]
     ["+", "exotic", "NO"]
     ["+", "gpu_count", 4]
-    ["+", "gpu_model", "GeForce RTX 2080 Ti"]
+    ["+", "gpu_model", "NVIDIA GeForce RTX 2080 Ti"]
     ["+", "ib", "NO"]
     ["+", "ib_count", 0]
     ["+", "ib_rate", 0]
@@ -59,7 +59,7 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "eth_rate", 10]
     ["+", "exotic", "NO"]
     ["+", "gpu_count", 4]
-    ["+", "gpu_model", "GeForce RTX 2080 Ti"]
+    ["+", "gpu_model", "NVIDIA GeForce RTX 2080 Ti"]
     ["+", "ib", "NO"]
     ["+", "ib_count", 0]
     ["+", "ib_rate", 0]
diff --git a/spec/output/empty_print_stdout.txt b/spec/output/empty_print_stdout.txt
index 8220b8346ea..86f5aa75fd1 100644
--- a/spec/output/empty_print_stdout.txt
+++ b/spec/output/empty_print_stdout.txt
@@ -93,24 +93,24 @@ property_exist 'disk_reservation_count' || oarproperty -a disk_reservation_count
 ###################################
 # clustera-1.fakesite.grid5000.fr
 ###################################
-oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=1 -p core=1 -p cpuset=0 -p gpu=1 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=1 -p core=2 -p cpuset=1 -p gpu=1 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=1 -p core=3 -p cpuset=2 -p gpu=1 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=1 -p core=4 -p cpuset=3 -p gpu=1 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=1 -p core=5 -p cpuset=4 -p gpu=2 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=1 -p core=6 -p cpuset=5 -p gpu=2 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=1 -p core=7 -p cpuset=6 -p gpu=2 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=1 -p core=8 -p cpuset=7 -p gpu=2 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=2 -p core=9 -p cpuset=8 -p gpu=3 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=2 -p core=10 -p cpuset=9 -p gpu=3 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=2 -p core=11 -p cpuset=10 -p gpu=3 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=2 -p core=12 -p cpuset=11 -p gpu=3 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=2 -p core=13 -p cpuset=12 -p gpu=4 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=2 -p core=14 -p cpuset=13 -p gpu=4 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=2 -p core=15 -p cpuset=14 -p gpu=4 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=2 -p core=16 -p cpuset=15 -p gpu=4 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=1 -p core=1 -p cpuset=0 -p gpu=1 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=1 -p core=2 -p cpuset=1 -p gpu=1 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=1 -p core=3 -p cpuset=2 -p gpu=1 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=1 -p core=4 -p cpuset=3 -p gpu=1 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=1 -p core=5 -p cpuset=4 -p gpu=2 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=1 -p core=6 -p cpuset=5 -p gpu=2 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=1 -p core=7 -p cpuset=6 -p gpu=2 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=1 -p core=8 -p cpuset=7 -p gpu=2 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=2 -p core=9 -p cpuset=8 -p gpu=3 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=2 -p core=10 -p cpuset=9 -p gpu=3 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=2 -p core=11 -p cpuset=10 -p gpu=3 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=2 -p core=12 -p cpuset=11 -p gpu=3 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=2 -p core=13 -p cpuset=12 -p gpu=4 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=2 -p core=14 -p cpuset=13 -p gpu=4 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=2 -p core=15 -p cpuset=14 -p gpu=4 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=2 -p core=16 -p cpuset=15 -p gpu=4 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 echo; echo 'Setting properties for clustera-1.fakesite.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' and type='default'" -p ip='172.16.64.1' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw-fakesite' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 FL1CBX2' -p eth_count=1 -p eth_kavlan_count=0 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='GeForce RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='NO' -p cluster_priority=201906 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
+oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' and type='default'" -p ip='172.16.64.1' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw-fakesite' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 FL1CBX2' -p eth_count=1 -p eth_kavlan_count=0 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='NO' -p cluster_priority=201906 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
 
 echo '================================================================================'
 
@@ -118,23 +118,23 @@ echo '==========================================================================
 ###################################
 # clustera-2.fakesite.grid5000.fr
 ###################################
-oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=3 -p core=17 -p cpuset=0 -p gpu=5 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=3 -p core=18 -p cpuset=1 -p gpu=5 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=3 -p core=19 -p cpuset=2 -p gpu=5 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=3 -p core=20 -p cpuset=3 -p gpu=5 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=3 -p core=21 -p cpuset=4 -p gpu=6 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=3 -p core=22 -p cpuset=5 -p gpu=6 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=3 -p core=23 -p cpuset=6 -p gpu=6 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=3 -p core=24 -p cpuset=7 -p gpu=6 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=4 -p core=25 -p cpuset=8 -p gpu=7 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=4 -p core=26 -p cpuset=9 -p gpu=7 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=4 -p core=27 -p cpuset=10 -p gpu=7 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=4 -p core=28 -p cpuset=11 -p gpu=7 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=4 -p core=29 -p cpuset=12 -p gpu=8 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=4 -p core=30 -p cpuset=13 -p gpu=8 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=4 -p core=31 -p cpuset=14 -p gpu=8 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=4 -p core=32 -p cpuset=15 -p gpu=8 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=3 -p core=17 -p cpuset=0 -p gpu=5 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=3 -p core=18 -p cpuset=1 -p gpu=5 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=3 -p core=19 -p cpuset=2 -p gpu=5 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=3 -p core=20 -p cpuset=3 -p gpu=5 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=3 -p core=21 -p cpuset=4 -p gpu=6 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=3 -p core=22 -p cpuset=5 -p gpu=6 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=3 -p core=23 -p cpuset=6 -p gpu=6 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=3 -p core=24 -p cpuset=7 -p gpu=6 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=4 -p core=25 -p cpuset=8 -p gpu=7 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=4 -p core=26 -p cpuset=9 -p gpu=7 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=4 -p core=27 -p cpuset=10 -p gpu=7 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=4 -p core=28 -p cpuset=11 -p gpu=7 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=4 -p core=29 -p cpuset=12 -p gpu=8 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=4 -p core=30 -p cpuset=13 -p gpu=8 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=4 -p core=31 -p cpuset=14 -p gpu=8 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=4 -p core=32 -p cpuset=15 -p gpu=8 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 echo; echo 'Setting properties for clustera-2.fakesite.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' and type='default'" -p ip='172.16.64.2' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw-fakesite' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 9L1CBX2' -p eth_count=1 -p eth_kavlan_count=0 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='GeForce RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='NO' -p cluster_priority=201906 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
+oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' and type='default'" -p ip='172.16.64.2' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw-fakesite' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 9L1CBX2' -p eth_count=1 -p eth_kavlan_count=0 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='NO' -p cluster_priority=201906 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
 
 echo '================================================================================'
diff --git a/spec/output/empty_round_robin_diff_stdout.txt b/spec/output/empty_round_robin_diff_stdout.txt
index 38c9d8816c4..0d6c27dce83 100644
--- a/spec/output/empty_round_robin_diff_stdout.txt
+++ b/spec/output/empty_round_robin_diff_stdout.txt
@@ -18,7 +18,7 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "eth_rate", 10]
     ["+", "exotic", "NO"]
     ["+", "gpu_count", 4]
-    ["+", "gpu_model", "GeForce RTX 2080 Ti"]
+    ["+", "gpu_model", "NVIDIA GeForce RTX 2080 Ti"]
     ["+", "ib", "NO"]
     ["+", "ib_count", 0]
     ["+", "ib_rate", 0]
@@ -59,7 +59,7 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "eth_rate", 10]
     ["+", "exotic", "NO"]
     ["+", "gpu_count", 4]
-    ["+", "gpu_model", "GeForce RTX 2080 Ti"]
+    ["+", "gpu_model", "NVIDIA GeForce RTX 2080 Ti"]
     ["+", "ib", "NO"]
     ["+", "ib_count", 0]
     ["+", "ib_rate", 0]
diff --git a/spec/output/empty_round_robin_print_stdout.txt b/spec/output/empty_round_robin_print_stdout.txt
index fb3f1866593..3d60edebb23 100644
--- a/spec/output/empty_round_robin_print_stdout.txt
+++ b/spec/output/empty_round_robin_print_stdout.txt
@@ -93,24 +93,24 @@ property_exist 'disk_reservation_count' || oarproperty -a disk_reservation_count
 ###################################
 # clustera-1.fakesite.grid5000.fr
 ###################################
-oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=1 -p core=1 -p cpuset=0 -p gpu=1 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=1 -p core=2 -p cpuset=2 -p gpu=1 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=1 -p core=3 -p cpuset=4 -p gpu=1 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=1 -p core=4 -p cpuset=6 -p gpu=1 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=1 -p core=5 -p cpuset=8 -p gpu=2 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=1 -p core=6 -p cpuset=10 -p gpu=2 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=1 -p core=7 -p cpuset=12 -p gpu=2 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=1 -p core=8 -p cpuset=14 -p gpu=2 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=2 -p core=9 -p cpuset=1 -p gpu=3 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=2 -p core=10 -p cpuset=3 -p gpu=3 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=2 -p core=11 -p cpuset=5 -p gpu=3 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=2 -p core=12 -p cpuset=7 -p gpu=3 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=2 -p core=13 -p cpuset=9 -p gpu=4 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=2 -p core=14 -p cpuset=11 -p gpu=4 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=2 -p core=15 -p cpuset=13 -p gpu=4 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=2 -p core=16 -p cpuset=15 -p gpu=4 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=1 -p core=1 -p cpuset=0 -p gpu=1 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=1 -p core=2 -p cpuset=2 -p gpu=1 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=1 -p core=3 -p cpuset=4 -p gpu=1 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=1 -p core=4 -p cpuset=6 -p gpu=1 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=1 -p core=5 -p cpuset=8 -p gpu=2 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=1 -p core=6 -p cpuset=10 -p gpu=2 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=1 -p core=7 -p cpuset=12 -p gpu=2 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=1 -p core=8 -p cpuset=14 -p gpu=2 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=2 -p core=9 -p cpuset=1 -p gpu=3 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=2 -p core=10 -p cpuset=3 -p gpu=3 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=2 -p core=11 -p cpuset=5 -p gpu=3 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=2 -p core=12 -p cpuset=7 -p gpu=3 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=2 -p core=13 -p cpuset=9 -p gpu=4 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=2 -p core=14 -p cpuset=11 -p gpu=4 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=2 -p core=15 -p cpuset=13 -p gpu=4 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=2 -p core=16 -p cpuset=15 -p gpu=4 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 echo; echo 'Setting properties for clustera-1.fakesite.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' and type='default'" -p ip='172.16.64.1' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw-fakesite' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 FL1CBX2' -p eth_count=1 -p eth_kavlan_count=0 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='GeForce RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='NO' -p cluster_priority=201906 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
+oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' and type='default'" -p ip='172.16.64.1' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw-fakesite' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 FL1CBX2' -p eth_count=1 -p eth_kavlan_count=0 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='NO' -p cluster_priority=201906 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
 
 echo '================================================================================'
 
@@ -118,23 +118,23 @@ echo '==========================================================================
 ###################################
 # clustera-2.fakesite.grid5000.fr
 ###################################
-oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=3 -p core=17 -p cpuset=0 -p gpu=5 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=3 -p core=18 -p cpuset=2 -p gpu=5 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=3 -p core=19 -p cpuset=4 -p gpu=5 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=3 -p core=20 -p cpuset=6 -p gpu=5 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=3 -p core=21 -p cpuset=8 -p gpu=6 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=3 -p core=22 -p cpuset=10 -p gpu=6 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=3 -p core=23 -p cpuset=12 -p gpu=6 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=3 -p core=24 -p cpuset=14 -p gpu=6 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=4 -p core=25 -p cpuset=1 -p gpu=7 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=4 -p core=26 -p cpuset=3 -p gpu=7 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=4 -p core=27 -p cpuset=5 -p gpu=7 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=4 -p core=28 -p cpuset=7 -p gpu=7 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=4 -p core=29 -p cpuset=9 -p gpu=8 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=4 -p core=30 -p cpuset=11 -p gpu=8 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=4 -p core=31 -p cpuset=13 -p gpu=8 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=4 -p core=32 -p cpuset=15 -p gpu=8 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=3 -p core=17 -p cpuset=0 -p gpu=5 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=3 -p core=18 -p cpuset=2 -p gpu=5 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=3 -p core=19 -p cpuset=4 -p gpu=5 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=3 -p core=20 -p cpuset=6 -p gpu=5 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=3 -p core=21 -p cpuset=8 -p gpu=6 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=3 -p core=22 -p cpuset=10 -p gpu=6 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=3 -p core=23 -p cpuset=12 -p gpu=6 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=3 -p core=24 -p cpuset=14 -p gpu=6 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=4 -p core=25 -p cpuset=1 -p gpu=7 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=4 -p core=26 -p cpuset=3 -p gpu=7 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=4 -p core=27 -p cpuset=5 -p gpu=7 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=4 -p core=28 -p cpuset=7 -p gpu=7 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=4 -p core=29 -p cpuset=9 -p gpu=8 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=4 -p core=30 -p cpuset=11 -p gpu=8 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=4 -p core=31 -p cpuset=13 -p gpu=8 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=4 -p core=32 -p cpuset=15 -p gpu=8 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 echo; echo 'Setting properties for clustera-2.fakesite.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' and type='default'" -p ip='172.16.64.2' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw-fakesite' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 9L1CBX2' -p eth_count=1 -p eth_kavlan_count=0 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='GeForce RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='NO' -p cluster_priority=201906 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
+oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' and type='default'" -p ip='172.16.64.2' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw-fakesite' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 9L1CBX2' -p eth_count=1 -p eth_kavlan_count=0 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='NO' -p cluster_priority=201906 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
 
 echo '================================================================================'
diff --git a/spec/output/empty_round_robin_table_stdout.txt b/spec/output/empty_round_robin_table_stdout.txt
index 45b1de4234d..1777ecbd361 100644
--- a/spec/output/empty_round_robin_table_stdout.txt
+++ b/spec/output/empty_round_robin_table_stdout.txt
@@ -1,36 +1,36 @@
 +---------- + -------------------- + ----- + ----- + -------- + ---- + -------------------- + ------------------------------ + ------------------------------+
 |   cluster | host                 | cpu   | core  | cpuset   | gpu  | gpudevice            | cpumodel                       | gpumodel                      |
 +---------- + -------------------- + ----- + ----- + -------- + ---- + -------------------- + ------------------------------ + ------------------------------+
-|  clustera | clustera-1           | 1     | 1     | 0        | 1    | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 1     | 2     | 2        | 1    | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 1     | 3     | 4        | 1    | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 1     | 4     | 6        | 1    | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 1     | 5     | 8        | 2    | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 1     | 6     | 10       | 2    | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 1     | 7     | 12       | 2    | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 1     | 8     | 14       | 2    | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 2     | 9     | 1        | 3    | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 2     | 10    | 3        | 3    | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 2     | 11    | 5        | 3    | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 2     | 12    | 7        | 3    | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 2     | 13    | 9        | 4    | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 2     | 14    | 11       | 4    | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 2     | 15    | 13       | 4    | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 2     | 16    | 15       | 4    | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 3     | 17    | 0        | 5    | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 3     | 18    | 2        | 5    | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 3     | 19    | 4        | 5    | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 3     | 20    | 6        | 5    | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 3     | 21    | 8        | 6    | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 3     | 22    | 10       | 6    | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 3     | 23    | 12       | 6    | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 3     | 24    | 14       | 6    | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 4     | 25    | 1        | 7    | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 4     | 26    | 3        | 7    | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 4     | 27    | 5        | 7    | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 4     | 28    | 7        | 7    | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 4     | 29    | 9        | 8    | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 4     | 30    | 11       | 8    | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 4     | 31    | 13       | 8    | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 4     | 32    | 15       | 8    | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
+|  clustera | clustera-1           | 1     | 1     | 0        | 1    | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 1     | 2     | 2        | 1    | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 1     | 3     | 4        | 1    | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 1     | 4     | 6        | 1    | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 1     | 5     | 8        | 2    | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 1     | 6     | 10       | 2    | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 1     | 7     | 12       | 2    | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 1     | 8     | 14       | 2    | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 2     | 9     | 1        | 3    | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 2     | 10    | 3        | 3    | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 2     | 11    | 5        | 3    | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 2     | 12    | 7        | 3    | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 2     | 13    | 9        | 4    | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 2     | 14    | 11       | 4    | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 2     | 15    | 13       | 4    | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 2     | 16    | 15       | 4    | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 3     | 17    | 0        | 5    | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 3     | 18    | 2        | 5    | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 3     | 19    | 4        | 5    | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 3     | 20    | 6        | 5    | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 3     | 21    | 8        | 6    | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 3     | 22    | 10       | 6    | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 3     | 23    | 12       | 6    | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 3     | 24    | 14       | 6    | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 4     | 25    | 1        | 7    | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 4     | 26    | 3        | 7    | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 4     | 27    | 5        | 7    | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 4     | 28    | 7        | 7    | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 4     | 29    | 9        | 8    | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 4     | 30    | 11       | 8    | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 4     | 31    | 13       | 8    | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 4     | 32    | 15       | 8    | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
 +---------- + -------------------- + ----- + ----- + -------- + ---- + -------------------- + ------------------------------ + ------------------------------+
diff --git a/spec/output/empty_table_stdout.txt b/spec/output/empty_table_stdout.txt
index ff22c49a17b..78c01fb6074 100644
--- a/spec/output/empty_table_stdout.txt
+++ b/spec/output/empty_table_stdout.txt
@@ -1,36 +1,36 @@
 +---------- + -------------------- + ----- + ----- + -------- + ---- + -------------------- + ------------------------------ + ------------------------------+
 |   cluster | host                 | cpu   | core  | cpuset   | gpu  | gpudevice            | cpumodel                       | gpumodel                      |
 +---------- + -------------------- + ----- + ----- + -------- + ---- + -------------------- + ------------------------------ + ------------------------------+
-|  clustera | clustera-1           | 1     | 1     | 0        | 1    | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 1     | 2     | 1        | 1    | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 1     | 3     | 2        | 1    | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 1     | 4     | 3        | 1    | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 1     | 5     | 4        | 2    | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 1     | 6     | 5        | 2    | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 1     | 7     | 6        | 2    | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 1     | 8     | 7        | 2    | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 2     | 9     | 8        | 3    | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 2     | 10    | 9        | 3    | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 2     | 11    | 10       | 3    | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 2     | 12    | 11       | 3    | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 2     | 13    | 12       | 4    | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 2     | 14    | 13       | 4    | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 2     | 15    | 14       | 4    | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 2     | 16    | 15       | 4    | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 3     | 17    | 0        | 5    | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 3     | 18    | 1        | 5    | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 3     | 19    | 2        | 5    | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 3     | 20    | 3        | 5    | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 3     | 21    | 4        | 6    | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 3     | 22    | 5        | 6    | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 3     | 23    | 6        | 6    | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 3     | 24    | 7        | 6    | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 4     | 25    | 8        | 7    | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 4     | 26    | 9        | 7    | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 4     | 27    | 10       | 7    | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 4     | 28    | 11       | 7    | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 4     | 29    | 12       | 8    | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 4     | 30    | 13       | 8    | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 4     | 31    | 14       | 8    | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 4     | 32    | 15       | 8    | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
+|  clustera | clustera-1           | 1     | 1     | 0        | 1    | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 1     | 2     | 1        | 1    | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 1     | 3     | 2        | 1    | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 1     | 4     | 3        | 1    | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 1     | 5     | 4        | 2    | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 1     | 6     | 5        | 2    | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 1     | 7     | 6        | 2    | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 1     | 8     | 7        | 2    | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 2     | 9     | 8        | 3    | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 2     | 10    | 9        | 3    | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 2     | 11    | 10       | 3    | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 2     | 12    | 11       | 3    | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 2     | 13    | 12       | 4    | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 2     | 14    | 13       | 4    | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 2     | 15    | 14       | 4    | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 2     | 16    | 15       | 4    | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 3     | 17    | 0        | 5    | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 3     | 18    | 1        | 5    | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 3     | 19    | 2        | 5    | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 3     | 20    | 3        | 5    | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 3     | 21    | 4        | 6    | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 3     | 22    | 5        | 6    | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 3     | 23    | 6        | 6    | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 3     | 24    | 7        | 6    | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 4     | 25    | 8        | 7    | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 4     | 26    | 9        | 7    | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 4     | 27    | 10       | 7    | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 4     | 28    | 11       | 7    | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 4     | 29    | 12       | 8    | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 4     | 30    | 13       | 8    | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 4     | 31    | 14       | 8    | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 4     | 32    | 15       | 8    | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
 +---------- + -------------------- + ----- + ----- + -------- + ---- + -------------------- + ------------------------------ + ------------------------------+
diff --git a/spec/output/empty_with_disk_diff_stdout.txt b/spec/output/empty_with_disk_diff_stdout.txt
index 38c9d8816c4..0d6c27dce83 100644
--- a/spec/output/empty_with_disk_diff_stdout.txt
+++ b/spec/output/empty_with_disk_diff_stdout.txt
@@ -18,7 +18,7 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "eth_rate", 10]
     ["+", "exotic", "NO"]
     ["+", "gpu_count", 4]
-    ["+", "gpu_model", "GeForce RTX 2080 Ti"]
+    ["+", "gpu_model", "NVIDIA GeForce RTX 2080 Ti"]
     ["+", "ib", "NO"]
     ["+", "ib_count", 0]
     ["+", "ib_rate", 0]
@@ -59,7 +59,7 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "eth_rate", 10]
     ["+", "exotic", "NO"]
     ["+", "gpu_count", 4]
-    ["+", "gpu_model", "GeForce RTX 2080 Ti"]
+    ["+", "gpu_model", "NVIDIA GeForce RTX 2080 Ti"]
     ["+", "ib", "NO"]
     ["+", "ib_count", 0]
     ["+", "ib_rate", 0]
diff --git a/spec/output/empty_with_disk_print_stdout.txt b/spec/output/empty_with_disk_print_stdout.txt
index 9c1b19ae871..e7ff73ad0d1 100644
--- a/spec/output/empty_with_disk_print_stdout.txt
+++ b/spec/output/empty_with_disk_print_stdout.txt
@@ -95,24 +95,24 @@ property_exist 'diskpath' || oarproperty -a diskpath --varchar
 ###################################
 # clustera-1.fakesite.grid5000.fr
 ###################################
-oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=1 -p core=1 -p cpuset=0 -p gpu=1 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=1 -p core=2 -p cpuset=1 -p gpu=1 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=1 -p core=3 -p cpuset=2 -p gpu=1 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=1 -p core=4 -p cpuset=3 -p gpu=1 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=1 -p core=5 -p cpuset=4 -p gpu=2 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=1 -p core=6 -p cpuset=5 -p gpu=2 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=1 -p core=7 -p cpuset=6 -p gpu=2 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=1 -p core=8 -p cpuset=7 -p gpu=2 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=2 -p core=9 -p cpuset=8 -p gpu=3 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=2 -p core=10 -p cpuset=9 -p gpu=3 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=2 -p core=11 -p cpuset=10 -p gpu=3 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=2 -p core=12 -p cpuset=11 -p gpu=3 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=2 -p core=13 -p cpuset=12 -p gpu=4 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=2 -p core=14 -p cpuset=13 -p gpu=4 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=2 -p core=15 -p cpuset=14 -p gpu=4 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=2 -p core=16 -p cpuset=15 -p gpu=4 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=1 -p core=1 -p cpuset=0 -p gpu=1 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=1 -p core=2 -p cpuset=1 -p gpu=1 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=1 -p core=3 -p cpuset=2 -p gpu=1 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=1 -p core=4 -p cpuset=3 -p gpu=1 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=1 -p core=5 -p cpuset=4 -p gpu=2 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=1 -p core=6 -p cpuset=5 -p gpu=2 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=1 -p core=7 -p cpuset=6 -p gpu=2 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=1 -p core=8 -p cpuset=7 -p gpu=2 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=2 -p core=9 -p cpuset=8 -p gpu=3 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=2 -p core=10 -p cpuset=9 -p gpu=3 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=2 -p core=11 -p cpuset=10 -p gpu=3 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=2 -p core=12 -p cpuset=11 -p gpu=3 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=2 -p core=13 -p cpuset=12 -p gpu=4 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=2 -p core=14 -p cpuset=13 -p gpu=4 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=2 -p core=15 -p cpuset=14 -p gpu=4 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=2 -p core=16 -p cpuset=15 -p gpu=4 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 echo; echo 'Setting properties for clustera-1.fakesite.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' and type='default'" -p ip='172.16.64.1' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw-fakesite' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 FL1CBX2' -p eth_count=1 -p eth_kavlan_count=0 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='GeForce RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='NO' -p cluster_priority=201906 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
+oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' and type='default'" -p ip='172.16.64.1' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw-fakesite' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 FL1CBX2' -p eth_count=1 -p eth_kavlan_count=0 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='NO' -p cluster_priority=201906 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
 
 echo '================================================================================'
 
@@ -120,23 +120,23 @@ echo '==========================================================================
 ###################################
 # clustera-2.fakesite.grid5000.fr
 ###################################
-oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=3 -p core=17 -p cpuset=0 -p gpu=5 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=3 -p core=18 -p cpuset=1 -p gpu=5 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=3 -p core=19 -p cpuset=2 -p gpu=5 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=3 -p core=20 -p cpuset=3 -p gpu=5 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=3 -p core=21 -p cpuset=4 -p gpu=6 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=3 -p core=22 -p cpuset=5 -p gpu=6 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=3 -p core=23 -p cpuset=6 -p gpu=6 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=3 -p core=24 -p cpuset=7 -p gpu=6 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=4 -p core=25 -p cpuset=8 -p gpu=7 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=4 -p core=26 -p cpuset=9 -p gpu=7 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=4 -p core=27 -p cpuset=10 -p gpu=7 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=4 -p core=28 -p cpuset=11 -p gpu=7 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=4 -p core=29 -p cpuset=12 -p gpu=8 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=4 -p core=30 -p cpuset=13 -p gpu=8 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=4 -p core=31 -p cpuset=14 -p gpu=8 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=4 -p core=32 -p cpuset=15 -p gpu=8 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=3 -p core=17 -p cpuset=0 -p gpu=5 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=3 -p core=18 -p cpuset=1 -p gpu=5 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=3 -p core=19 -p cpuset=2 -p gpu=5 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=3 -p core=20 -p cpuset=3 -p gpu=5 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=3 -p core=21 -p cpuset=4 -p gpu=6 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=3 -p core=22 -p cpuset=5 -p gpu=6 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=3 -p core=23 -p cpuset=6 -p gpu=6 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=3 -p core=24 -p cpuset=7 -p gpu=6 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=4 -p core=25 -p cpuset=8 -p gpu=7 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=4 -p core=26 -p cpuset=9 -p gpu=7 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=4 -p core=27 -p cpuset=10 -p gpu=7 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=4 -p core=28 -p cpuset=11 -p gpu=7 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=4 -p core=29 -p cpuset=12 -p gpu=8 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=4 -p core=30 -p cpuset=13 -p gpu=8 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=4 -p core=31 -p cpuset=14 -p gpu=8 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=4 -p core=32 -p cpuset=15 -p gpu=8 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 echo; echo 'Setting properties for clustera-2.fakesite.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' and type='default'" -p ip='172.16.64.2' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw-fakesite' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 9L1CBX2' -p eth_count=1 -p eth_kavlan_count=0 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='GeForce RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='NO' -p cluster_priority=201906 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
+oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' and type='default'" -p ip='172.16.64.2' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw-fakesite' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 9L1CBX2' -p eth_count=1 -p eth_kavlan_count=0 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='NO' -p cluster_priority=201906 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
 
 echo '================================================================================'
diff --git a/spec/output/empty_with_disk_table_stdout.txt b/spec/output/empty_with_disk_table_stdout.txt
index ff22c49a17b..78c01fb6074 100644
--- a/spec/output/empty_with_disk_table_stdout.txt
+++ b/spec/output/empty_with_disk_table_stdout.txt
@@ -1,36 +1,36 @@
 +---------- + -------------------- + ----- + ----- + -------- + ---- + -------------------- + ------------------------------ + ------------------------------+
 |   cluster | host                 | cpu   | core  | cpuset   | gpu  | gpudevice            | cpumodel                       | gpumodel                      |
 +---------- + -------------------- + ----- + ----- + -------- + ---- + -------------------- + ------------------------------ + ------------------------------+
-|  clustera | clustera-1           | 1     | 1     | 0        | 1    | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 1     | 2     | 1        | 1    | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 1     | 3     | 2        | 1    | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 1     | 4     | 3        | 1    | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 1     | 5     | 4        | 2    | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 1     | 6     | 5        | 2    | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 1     | 7     | 6        | 2    | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 1     | 8     | 7        | 2    | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 2     | 9     | 8        | 3    | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 2     | 10    | 9        | 3    | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 2     | 11    | 10       | 3    | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 2     | 12    | 11       | 3    | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 2     | 13    | 12       | 4    | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 2     | 14    | 13       | 4    | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 2     | 15    | 14       | 4    | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 2     | 16    | 15       | 4    | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 3     | 17    | 0        | 5    | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 3     | 18    | 1        | 5    | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 3     | 19    | 2        | 5    | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 3     | 20    | 3        | 5    | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 3     | 21    | 4        | 6    | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 3     | 22    | 5        | 6    | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 3     | 23    | 6        | 6    | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 3     | 24    | 7        | 6    | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 4     | 25    | 8        | 7    | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 4     | 26    | 9        | 7    | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 4     | 27    | 10       | 7    | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 4     | 28    | 11       | 7    | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 4     | 29    | 12       | 8    | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 4     | 30    | 13       | 8    | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 4     | 31    | 14       | 8    | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 4     | 32    | 15       | 8    | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
+|  clustera | clustera-1           | 1     | 1     | 0        | 1    | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 1     | 2     | 1        | 1    | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 1     | 3     | 2        | 1    | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 1     | 4     | 3        | 1    | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 1     | 5     | 4        | 2    | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 1     | 6     | 5        | 2    | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 1     | 7     | 6        | 2    | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 1     | 8     | 7        | 2    | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 2     | 9     | 8        | 3    | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 2     | 10    | 9        | 3    | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 2     | 11    | 10       | 3    | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 2     | 12    | 11       | 3    | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 2     | 13    | 12       | 4    | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 2     | 14    | 13       | 4    | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 2     | 15    | 14       | 4    | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 2     | 16    | 15       | 4    | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 3     | 17    | 0        | 5    | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 3     | 18    | 1        | 5    | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 3     | 19    | 2        | 5    | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 3     | 20    | 3        | 5    | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 3     | 21    | 4        | 6    | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 3     | 22    | 5        | 6    | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 3     | 23    | 6        | 6    | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 3     | 24    | 7        | 6    | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 4     | 25    | 8        | 7    | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 4     | 26    | 9        | 7    | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 4     | 27    | 10       | 7    | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 4     | 28    | 11       | 7    | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 4     | 29    | 12       | 8    | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 4     | 30    | 13       | 8    | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 4     | 31    | 14       | 8    | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 4     | 32    | 15       | 8    | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
 +---------- + -------------------- + ----- + ----- + -------- + ---- + -------------------- + ------------------------------ + ------------------------------+
diff --git a/spec/output/empty_without_gpu_diff_stdout.txt b/spec/output/empty_without_gpu_diff_stdout.txt
index 38c9d8816c4..0d6c27dce83 100644
--- a/spec/output/empty_without_gpu_diff_stdout.txt
+++ b/spec/output/empty_without_gpu_diff_stdout.txt
@@ -18,7 +18,7 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "eth_rate", 10]
     ["+", "exotic", "NO"]
     ["+", "gpu_count", 4]
-    ["+", "gpu_model", "GeForce RTX 2080 Ti"]
+    ["+", "gpu_model", "NVIDIA GeForce RTX 2080 Ti"]
     ["+", "ib", "NO"]
     ["+", "ib_count", 0]
     ["+", "ib_rate", 0]
@@ -59,7 +59,7 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "eth_rate", 10]
     ["+", "exotic", "NO"]
     ["+", "gpu_count", 4]
-    ["+", "gpu_model", "GeForce RTX 2080 Ti"]
+    ["+", "gpu_model", "NVIDIA GeForce RTX 2080 Ti"]
     ["+", "ib", "NO"]
     ["+", "ib_count", 0]
     ["+", "ib_rate", 0]
diff --git a/spec/output/empty_without_gpu_print_stdout.txt b/spec/output/empty_without_gpu_print_stdout.txt
index 9c1b19ae871..e7ff73ad0d1 100644
--- a/spec/output/empty_without_gpu_print_stdout.txt
+++ b/spec/output/empty_without_gpu_print_stdout.txt
@@ -95,24 +95,24 @@ property_exist 'diskpath' || oarproperty -a diskpath --varchar
 ###################################
 # clustera-1.fakesite.grid5000.fr
 ###################################
-oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=1 -p core=1 -p cpuset=0 -p gpu=1 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=1 -p core=2 -p cpuset=1 -p gpu=1 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=1 -p core=3 -p cpuset=2 -p gpu=1 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=1 -p core=4 -p cpuset=3 -p gpu=1 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=1 -p core=5 -p cpuset=4 -p gpu=2 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=1 -p core=6 -p cpuset=5 -p gpu=2 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=1 -p core=7 -p cpuset=6 -p gpu=2 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=1 -p core=8 -p cpuset=7 -p gpu=2 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=2 -p core=9 -p cpuset=8 -p gpu=3 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=2 -p core=10 -p cpuset=9 -p gpu=3 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=2 -p core=11 -p cpuset=10 -p gpu=3 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=2 -p core=12 -p cpuset=11 -p gpu=3 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=2 -p core=13 -p cpuset=12 -p gpu=4 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=2 -p core=14 -p cpuset=13 -p gpu=4 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=2 -p core=15 -p cpuset=14 -p gpu=4 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=2 -p core=16 -p cpuset=15 -p gpu=4 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=1 -p core=1 -p cpuset=0 -p gpu=1 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=1 -p core=2 -p cpuset=1 -p gpu=1 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=1 -p core=3 -p cpuset=2 -p gpu=1 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=1 -p core=4 -p cpuset=3 -p gpu=1 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=1 -p core=5 -p cpuset=4 -p gpu=2 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=1 -p core=6 -p cpuset=5 -p gpu=2 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=1 -p core=7 -p cpuset=6 -p gpu=2 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=1 -p core=8 -p cpuset=7 -p gpu=2 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=2 -p core=9 -p cpuset=8 -p gpu=3 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=2 -p core=10 -p cpuset=9 -p gpu=3 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=2 -p core=11 -p cpuset=10 -p gpu=3 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=2 -p core=12 -p cpuset=11 -p gpu=3 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=2 -p core=13 -p cpuset=12 -p gpu=4 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=2 -p core=14 -p cpuset=13 -p gpu=4 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=2 -p core=15 -p cpuset=14 -p gpu=4 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=2 -p core=16 -p cpuset=15 -p gpu=4 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 echo; echo 'Setting properties for clustera-1.fakesite.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' and type='default'" -p ip='172.16.64.1' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw-fakesite' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 FL1CBX2' -p eth_count=1 -p eth_kavlan_count=0 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='GeForce RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='NO' -p cluster_priority=201906 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
+oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' and type='default'" -p ip='172.16.64.1' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw-fakesite' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 FL1CBX2' -p eth_count=1 -p eth_kavlan_count=0 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='NO' -p cluster_priority=201906 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
 
 echo '================================================================================'
 
@@ -120,23 +120,23 @@ echo '==========================================================================
 ###################################
 # clustera-2.fakesite.grid5000.fr
 ###################################
-oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=3 -p core=17 -p cpuset=0 -p gpu=5 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=3 -p core=18 -p cpuset=1 -p gpu=5 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=3 -p core=19 -p cpuset=2 -p gpu=5 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=3 -p core=20 -p cpuset=3 -p gpu=5 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=3 -p core=21 -p cpuset=4 -p gpu=6 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=3 -p core=22 -p cpuset=5 -p gpu=6 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=3 -p core=23 -p cpuset=6 -p gpu=6 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=3 -p core=24 -p cpuset=7 -p gpu=6 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=4 -p core=25 -p cpuset=8 -p gpu=7 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=4 -p core=26 -p cpuset=9 -p gpu=7 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=4 -p core=27 -p cpuset=10 -p gpu=7 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=4 -p core=28 -p cpuset=11 -p gpu=7 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=4 -p core=29 -p cpuset=12 -p gpu=8 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=4 -p core=30 -p cpuset=13 -p gpu=8 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=4 -p core=31 -p cpuset=14 -p gpu=8 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=4 -p core=32 -p cpuset=15 -p gpu=8 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=3 -p core=17 -p cpuset=0 -p gpu=5 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=3 -p core=18 -p cpuset=1 -p gpu=5 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=3 -p core=19 -p cpuset=2 -p gpu=5 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=3 -p core=20 -p cpuset=3 -p gpu=5 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=3 -p core=21 -p cpuset=4 -p gpu=6 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=3 -p core=22 -p cpuset=5 -p gpu=6 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=3 -p core=23 -p cpuset=6 -p gpu=6 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=3 -p core=24 -p cpuset=7 -p gpu=6 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=4 -p core=25 -p cpuset=8 -p gpu=7 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=4 -p core=26 -p cpuset=9 -p gpu=7 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=4 -p core=27 -p cpuset=10 -p gpu=7 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=4 -p core=28 -p cpuset=11 -p gpu=7 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=4 -p core=29 -p cpuset=12 -p gpu=8 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=4 -p core=30 -p cpuset=13 -p gpu=8 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=4 -p core=31 -p cpuset=14 -p gpu=8 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=4 -p core=32 -p cpuset=15 -p gpu=8 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 echo; echo 'Setting properties for clustera-2.fakesite.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' and type='default'" -p ip='172.16.64.2' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw-fakesite' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 9L1CBX2' -p eth_count=1 -p eth_kavlan_count=0 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='GeForce RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='NO' -p cluster_priority=201906 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
+oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' and type='default'" -p ip='172.16.64.2' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw-fakesite' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 9L1CBX2' -p eth_count=1 -p eth_kavlan_count=0 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='NO' -p cluster_priority=201906 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
 
 echo '================================================================================'
diff --git a/spec/output/empty_without_gpu_table_stdout.txt b/spec/output/empty_without_gpu_table_stdout.txt
index ff22c49a17b..78c01fb6074 100644
--- a/spec/output/empty_without_gpu_table_stdout.txt
+++ b/spec/output/empty_without_gpu_table_stdout.txt
@@ -1,36 +1,36 @@
 +---------- + -------------------- + ----- + ----- + -------- + ---- + -------------------- + ------------------------------ + ------------------------------+
 |   cluster | host                 | cpu   | core  | cpuset   | gpu  | gpudevice            | cpumodel                       | gpumodel                      |
 +---------- + -------------------- + ----- + ----- + -------- + ---- + -------------------- + ------------------------------ + ------------------------------+
-|  clustera | clustera-1           | 1     | 1     | 0        | 1    | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 1     | 2     | 1        | 1    | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 1     | 3     | 2        | 1    | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 1     | 4     | 3        | 1    | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 1     | 5     | 4        | 2    | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 1     | 6     | 5        | 2    | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 1     | 7     | 6        | 2    | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 1     | 8     | 7        | 2    | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 2     | 9     | 8        | 3    | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 2     | 10    | 9        | 3    | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 2     | 11    | 10       | 3    | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 2     | 12    | 11       | 3    | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 2     | 13    | 12       | 4    | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 2     | 14    | 13       | 4    | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 2     | 15    | 14       | 4    | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 2     | 16    | 15       | 4    | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 3     | 17    | 0        | 5    | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 3     | 18    | 1        | 5    | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 3     | 19    | 2        | 5    | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 3     | 20    | 3        | 5    | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 3     | 21    | 4        | 6    | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 3     | 22    | 5        | 6    | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 3     | 23    | 6        | 6    | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 3     | 24    | 7        | 6    | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 4     | 25    | 8        | 7    | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 4     | 26    | 9        | 7    | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 4     | 27    | 10       | 7    | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 4     | 28    | 11       | 7    | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 4     | 29    | 12       | 8    | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 4     | 30    | 13       | 8    | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 4     | 31    | 14       | 8    | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 4     | 32    | 15       | 8    | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
+|  clustera | clustera-1           | 1     | 1     | 0        | 1    | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 1     | 2     | 1        | 1    | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 1     | 3     | 2        | 1    | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 1     | 4     | 3        | 1    | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 1     | 5     | 4        | 2    | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 1     | 6     | 5        | 2    | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 1     | 7     | 6        | 2    | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 1     | 8     | 7        | 2    | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 2     | 9     | 8        | 3    | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 2     | 10    | 9        | 3    | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 2     | 11    | 10       | 3    | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 2     | 12    | 11       | 3    | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 2     | 13    | 12       | 4    | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 2     | 14    | 13       | 4    | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 2     | 15    | 14       | 4    | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 2     | 16    | 15       | 4    | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 3     | 17    | 0        | 5    | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 3     | 18    | 1        | 5    | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 3     | 19    | 2        | 5    | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 3     | 20    | 3        | 5    | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 3     | 21    | 4        | 6    | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 3     | 22    | 5        | 6    | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 3     | 23    | 6        | 6    | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 3     | 24    | 7        | 6    | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 4     | 25    | 8        | 7    | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 4     | 26    | 9        | 7    | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 4     | 27    | 10       | 7    | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 4     | 28    | 11       | 7    | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 4     | 29    | 12       | 8    | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 4     | 30    | 13       | 8    | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 4     | 31    | 14       | 8    | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 4     | 32    | 15       | 8    | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
 +---------- + -------------------- + ----- + ----- + -------- + ---- + -------------------- + ------------------------------ + ------------------------------+
diff --git a/spec/output/graffiti-all-gpus_diff_stdout.txt b/spec/output/graffiti-all-gpus_diff_stdout.txt
index 5fac025605b..7ae661fae5d 100644
--- a/spec/output/graffiti-all-gpus_diff_stdout.txt
+++ b/spec/output/graffiti-all-gpus_diff_stdout.txt
@@ -1,6 +1,6 @@
 Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for added, ['~', 'key', 'old value', 'new value'] for changed
   clustera-1:
-    ["~", "gpu_model", "RTX 2080 Ti", "GeForce RTX 2080 Ti"]
+    ["~", "gpu_model", "RTX 2080 Ti", "NVIDIA GeForce RTX 2080 Ti"]
     ["~", "wattmeter", "MULTIPLE", "NO"]
     ["+", "core_count", 16]
     ["+", "cpu_count", 2]
diff --git a/spec/output/graffiti-all-gpus_print_stdout.txt b/spec/output/graffiti-all-gpus_print_stdout.txt
index 2434d82fc33..5832b0a9fa5 100644
--- a/spec/output/graffiti-all-gpus_print_stdout.txt
+++ b/spec/output/graffiti-all-gpus_print_stdout.txt
@@ -93,24 +93,24 @@ property_exist 'disk_reservation_count' || oarproperty -a disk_reservation_count
 ###################################
 # clustera-1.nancy.grid5000.fr
 ###################################
-oarnodesetting --sql "host='clustera-1.nancy.grid5000.fr' AND resource_id='9651' AND type='default'" -p cpu=1615 -p core=8527 -p cpuset=0 -p gpu=53 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-1.nancy.grid5000.fr' AND resource_id='9652' AND type='default'" -p cpu=1615 -p core=8528 -p cpuset=2 -p gpu=53 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-1.nancy.grid5000.fr' AND resource_id='9653' AND type='default'" -p cpu=1615 -p core=8529 -p cpuset=4 -p gpu=53 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-1.nancy.grid5000.fr' AND resource_id='9654' AND type='default'" -p cpu=1615 -p core=8530 -p cpuset=6 -p gpu=53 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-1.nancy.grid5000.fr' AND resource_id='9655' AND type='default'" -p cpu=1615 -p core=8531 -p cpuset=8 -p gpu=54 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-1.nancy.grid5000.fr' AND resource_id='9656' AND type='default'" -p cpu=1615 -p core=8532 -p cpuset=10 -p gpu=54 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-1.nancy.grid5000.fr' AND resource_id='9657' AND type='default'" -p cpu=1615 -p core=8533 -p cpuset=12 -p gpu=54 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-1.nancy.grid5000.fr' AND resource_id='9658' AND type='default'" -p cpu=1615 -p core=8534 -p cpuset=14 -p gpu=54 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-1.nancy.grid5000.fr' AND resource_id='9659' AND type='default'" -p cpu=1616 -p core=8535 -p cpuset=1 -p gpu=55 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-1.nancy.grid5000.fr' AND resource_id='9660' AND type='default'" -p cpu=1616 -p core=8536 -p cpuset=3 -p gpu=55 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-1.nancy.grid5000.fr' AND resource_id='9661' AND type='default'" -p cpu=1616 -p core=8537 -p cpuset=5 -p gpu=55 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-1.nancy.grid5000.fr' AND resource_id='9662' AND type='default'" -p cpu=1616 -p core=8538 -p cpuset=7 -p gpu=55 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-1.nancy.grid5000.fr' AND resource_id='9663' AND type='default'" -p cpu=1616 -p core=8539 -p cpuset=9 -p gpu=56 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting --sql "host='clustera-1.nancy.grid5000.fr' AND resource_id='9664' AND type='default'" -p cpu=1616 -p core=8540 -p cpuset=11 -p gpu=56 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting --sql "host='clustera-1.nancy.grid5000.fr' AND resource_id='9665' AND type='default'" -p cpu=1616 -p core=8541 -p cpuset=13 -p gpu=56 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting --sql "host='clustera-1.nancy.grid5000.fr' AND resource_id='9666' AND type='default'" -p cpu=1616 -p core=8542 -p cpuset=15 -p gpu=56 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-1.nancy.grid5000.fr' AND resource_id='9651' AND type='default'" -p cpu=1615 -p core=8527 -p cpuset=0 -p gpu=53 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-1.nancy.grid5000.fr' AND resource_id='9652' AND type='default'" -p cpu=1615 -p core=8528 -p cpuset=2 -p gpu=53 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-1.nancy.grid5000.fr' AND resource_id='9653' AND type='default'" -p cpu=1615 -p core=8529 -p cpuset=4 -p gpu=53 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-1.nancy.grid5000.fr' AND resource_id='9654' AND type='default'" -p cpu=1615 -p core=8530 -p cpuset=6 -p gpu=53 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-1.nancy.grid5000.fr' AND resource_id='9655' AND type='default'" -p cpu=1615 -p core=8531 -p cpuset=8 -p gpu=54 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-1.nancy.grid5000.fr' AND resource_id='9656' AND type='default'" -p cpu=1615 -p core=8532 -p cpuset=10 -p gpu=54 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-1.nancy.grid5000.fr' AND resource_id='9657' AND type='default'" -p cpu=1615 -p core=8533 -p cpuset=12 -p gpu=54 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-1.nancy.grid5000.fr' AND resource_id='9658' AND type='default'" -p cpu=1615 -p core=8534 -p cpuset=14 -p gpu=54 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-1.nancy.grid5000.fr' AND resource_id='9659' AND type='default'" -p cpu=1616 -p core=8535 -p cpuset=1 -p gpu=55 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-1.nancy.grid5000.fr' AND resource_id='9660' AND type='default'" -p cpu=1616 -p core=8536 -p cpuset=3 -p gpu=55 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-1.nancy.grid5000.fr' AND resource_id='9661' AND type='default'" -p cpu=1616 -p core=8537 -p cpuset=5 -p gpu=55 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-1.nancy.grid5000.fr' AND resource_id='9662' AND type='default'" -p cpu=1616 -p core=8538 -p cpuset=7 -p gpu=55 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-1.nancy.grid5000.fr' AND resource_id='9663' AND type='default'" -p cpu=1616 -p core=8539 -p cpuset=9 -p gpu=56 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-1.nancy.grid5000.fr' AND resource_id='9664' AND type='default'" -p cpu=1616 -p core=8540 -p cpuset=11 -p gpu=56 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-1.nancy.grid5000.fr' AND resource_id='9665' AND type='default'" -p cpu=1616 -p core=8541 -p cpuset=13 -p gpu=56 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-1.nancy.grid5000.fr' AND resource_id='9666' AND type='default'" -p cpu=1616 -p core=8542 -p cpuset=15 -p gpu=56 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 echo; echo 'Setting properties for clustera-1.nancy.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-1.nancy.grid5000.fr' and type='default'" -p ip='172.16.64.1' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 FL1CBX2' -p eth_count=1 -p eth_kavlan_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='GeForce RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='NO' -p cluster_priority=201906 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
+oarnodesetting --sql "host='clustera-1.nancy.grid5000.fr' and type='default'" -p ip='172.16.64.1' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 FL1CBX2' -p eth_count=1 -p eth_kavlan_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='NO' -p cluster_priority=201906 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
 
 echo '================================================================================'
 
@@ -118,24 +118,24 @@ echo '==========================================================================
 ###################################
 # clustera-2.nancy.grid5000.fr
 ###################################
-oarnodesetting --sql "host='clustera-2.nancy.grid5000.fr' AND resource_id='9667' AND type='default'" -p cpu=1617 -p core=8543 -p cpuset=0 -p gpu=57 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-2.nancy.grid5000.fr' AND resource_id='9668' AND type='default'" -p cpu=1617 -p core=8544 -p cpuset=2 -p gpu=57 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-2.nancy.grid5000.fr' AND resource_id='9669' AND type='default'" -p cpu=1617 -p core=8545 -p cpuset=4 -p gpu=57 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-2.nancy.grid5000.fr' AND resource_id='9670' AND type='default'" -p cpu=1617 -p core=8546 -p cpuset=6 -p gpu=57 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-2.nancy.grid5000.fr' AND resource_id='9671' AND type='default'" -p cpu=1617 -p core=8547 -p cpuset=8 -p gpu=58 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-2.nancy.grid5000.fr' AND resource_id='9672' AND type='default'" -p cpu=1617 -p core=8548 -p cpuset=10 -p gpu=58 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-2.nancy.grid5000.fr' AND resource_id='9673' AND type='default'" -p cpu=1617 -p core=8549 -p cpuset=12 -p gpu=58 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-2.nancy.grid5000.fr' AND resource_id='9674' AND type='default'" -p cpu=1617 -p core=8550 -p cpuset=14 -p gpu=58 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-2.nancy.grid5000.fr' AND resource_id='9675' AND type='default'" -p cpu=1618 -p core=8551 -p cpuset=1 -p gpu=59 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-2.nancy.grid5000.fr' AND resource_id='9676' AND type='default'" -p cpu=1618 -p core=8552 -p cpuset=3 -p gpu=59 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-2.nancy.grid5000.fr' AND resource_id='9677' AND type='default'" -p cpu=1618 -p core=8553 -p cpuset=5 -p gpu=59 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-2.nancy.grid5000.fr' AND resource_id='9678' AND type='default'" -p cpu=1618 -p core=8554 -p cpuset=7 -p gpu=59 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-2.nancy.grid5000.fr' AND resource_id='9679' AND type='default'" -p cpu=1618 -p core=8555 -p cpuset=9 -p gpu=60 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting --sql "host='clustera-2.nancy.grid5000.fr' AND resource_id='9680' AND type='default'" -p cpu=1618 -p core=8556 -p cpuset=11 -p gpu=60 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting --sql "host='clustera-2.nancy.grid5000.fr' AND resource_id='9681' AND type='default'" -p cpu=1618 -p core=8557 -p cpuset=13 -p gpu=60 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting --sql "host='clustera-2.nancy.grid5000.fr' AND resource_id='9682' AND type='default'" -p cpu=1618 -p core=8558 -p cpuset=15 -p gpu=60 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-2.nancy.grid5000.fr' AND resource_id='9667' AND type='default'" -p cpu=1617 -p core=8543 -p cpuset=0 -p gpu=57 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-2.nancy.grid5000.fr' AND resource_id='9668' AND type='default'" -p cpu=1617 -p core=8544 -p cpuset=2 -p gpu=57 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-2.nancy.grid5000.fr' AND resource_id='9669' AND type='default'" -p cpu=1617 -p core=8545 -p cpuset=4 -p gpu=57 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-2.nancy.grid5000.fr' AND resource_id='9670' AND type='default'" -p cpu=1617 -p core=8546 -p cpuset=6 -p gpu=57 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-2.nancy.grid5000.fr' AND resource_id='9671' AND type='default'" -p cpu=1617 -p core=8547 -p cpuset=8 -p gpu=58 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-2.nancy.grid5000.fr' AND resource_id='9672' AND type='default'" -p cpu=1617 -p core=8548 -p cpuset=10 -p gpu=58 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-2.nancy.grid5000.fr' AND resource_id='9673' AND type='default'" -p cpu=1617 -p core=8549 -p cpuset=12 -p gpu=58 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-2.nancy.grid5000.fr' AND resource_id='9674' AND type='default'" -p cpu=1617 -p core=8550 -p cpuset=14 -p gpu=58 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-2.nancy.grid5000.fr' AND resource_id='9675' AND type='default'" -p cpu=1618 -p core=8551 -p cpuset=1 -p gpu=59 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-2.nancy.grid5000.fr' AND resource_id='9676' AND type='default'" -p cpu=1618 -p core=8552 -p cpuset=3 -p gpu=59 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-2.nancy.grid5000.fr' AND resource_id='9677' AND type='default'" -p cpu=1618 -p core=8553 -p cpuset=5 -p gpu=59 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-2.nancy.grid5000.fr' AND resource_id='9678' AND type='default'" -p cpu=1618 -p core=8554 -p cpuset=7 -p gpu=59 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-2.nancy.grid5000.fr' AND resource_id='9679' AND type='default'" -p cpu=1618 -p core=8555 -p cpuset=9 -p gpu=60 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-2.nancy.grid5000.fr' AND resource_id='9680' AND type='default'" -p cpu=1618 -p core=8556 -p cpuset=11 -p gpu=60 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-2.nancy.grid5000.fr' AND resource_id='9681' AND type='default'" -p cpu=1618 -p core=8557 -p cpuset=13 -p gpu=60 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-2.nancy.grid5000.fr' AND resource_id='9682' AND type='default'" -p cpu=1618 -p core=8558 -p cpuset=15 -p gpu=60 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 echo; echo 'Setting properties for clustera-2.nancy.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-2.nancy.grid5000.fr' and type='default'" -p ip='172.16.64.2' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 9L1CBX2' -p eth_count=1 -p eth_kavlan_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='GeForce RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='NO' -p cluster_priority=201906 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
+oarnodesetting --sql "host='clustera-2.nancy.grid5000.fr' and type='default'" -p ip='172.16.64.2' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 9L1CBX2' -p eth_count=1 -p eth_kavlan_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='NO' -p cluster_priority=201906 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
 
 echo '================================================================================'
 
@@ -143,24 +143,24 @@ echo '==========================================================================
 ###################################
 # clustera-3.nancy.grid5000.fr
 ###################################
-oarnodesetting --sql "host='clustera-3.nancy.grid5000.fr' AND resource_id='9683' AND type='default'" -p cpu=1619 -p core=8559 -p cpuset=0 -p gpu=61 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-3.nancy.grid5000.fr' AND resource_id='9684' AND type='default'" -p cpu=1619 -p core=8560 -p cpuset=2 -p gpu=61 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-3.nancy.grid5000.fr' AND resource_id='9685' AND type='default'" -p cpu=1619 -p core=8561 -p cpuset=4 -p gpu=61 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-3.nancy.grid5000.fr' AND resource_id='9686' AND type='default'" -p cpu=1619 -p core=8562 -p cpuset=6 -p gpu=61 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-3.nancy.grid5000.fr' AND resource_id='9687' AND type='default'" -p cpu=1619 -p core=8563 -p cpuset=8 -p gpu=62 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-3.nancy.grid5000.fr' AND resource_id='9688' AND type='default'" -p cpu=1619 -p core=8564 -p cpuset=10 -p gpu=62 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-3.nancy.grid5000.fr' AND resource_id='9689' AND type='default'" -p cpu=1619 -p core=8565 -p cpuset=12 -p gpu=62 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-3.nancy.grid5000.fr' AND resource_id='9690' AND type='default'" -p cpu=1619 -p core=8566 -p cpuset=14 -p gpu=62 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-3.nancy.grid5000.fr' AND resource_id='9691' AND type='default'" -p cpu=1620 -p core=8567 -p cpuset=1 -p gpu=63 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-3.nancy.grid5000.fr' AND resource_id='9692' AND type='default'" -p cpu=1620 -p core=8568 -p cpuset=3 -p gpu=63 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-3.nancy.grid5000.fr' AND resource_id='9693' AND type='default'" -p cpu=1620 -p core=8569 -p cpuset=5 -p gpu=63 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-3.nancy.grid5000.fr' AND resource_id='9694' AND type='default'" -p cpu=1620 -p core=8570 -p cpuset=7 -p gpu=63 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-3.nancy.grid5000.fr' AND resource_id='9695' AND type='default'" -p cpu=1620 -p core=8571 -p cpuset=9 -p gpu=64 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting --sql "host='clustera-3.nancy.grid5000.fr' AND resource_id='9696' AND type='default'" -p cpu=1620 -p core=8572 -p cpuset=11 -p gpu=64 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting --sql "host='clustera-3.nancy.grid5000.fr' AND resource_id='9697' AND type='default'" -p cpu=1620 -p core=8573 -p cpuset=13 -p gpu=64 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting --sql "host='clustera-3.nancy.grid5000.fr' AND resource_id='9698' AND type='default'" -p cpu=1620 -p core=8574 -p cpuset=15 -p gpu=64 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-3.nancy.grid5000.fr' AND resource_id='9683' AND type='default'" -p cpu=1619 -p core=8559 -p cpuset=0 -p gpu=61 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-3.nancy.grid5000.fr' AND resource_id='9684' AND type='default'" -p cpu=1619 -p core=8560 -p cpuset=2 -p gpu=61 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-3.nancy.grid5000.fr' AND resource_id='9685' AND type='default'" -p cpu=1619 -p core=8561 -p cpuset=4 -p gpu=61 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-3.nancy.grid5000.fr' AND resource_id='9686' AND type='default'" -p cpu=1619 -p core=8562 -p cpuset=6 -p gpu=61 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-3.nancy.grid5000.fr' AND resource_id='9687' AND type='default'" -p cpu=1619 -p core=8563 -p cpuset=8 -p gpu=62 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-3.nancy.grid5000.fr' AND resource_id='9688' AND type='default'" -p cpu=1619 -p core=8564 -p cpuset=10 -p gpu=62 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-3.nancy.grid5000.fr' AND resource_id='9689' AND type='default'" -p cpu=1619 -p core=8565 -p cpuset=12 -p gpu=62 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-3.nancy.grid5000.fr' AND resource_id='9690' AND type='default'" -p cpu=1619 -p core=8566 -p cpuset=14 -p gpu=62 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-3.nancy.grid5000.fr' AND resource_id='9691' AND type='default'" -p cpu=1620 -p core=8567 -p cpuset=1 -p gpu=63 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-3.nancy.grid5000.fr' AND resource_id='9692' AND type='default'" -p cpu=1620 -p core=8568 -p cpuset=3 -p gpu=63 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-3.nancy.grid5000.fr' AND resource_id='9693' AND type='default'" -p cpu=1620 -p core=8569 -p cpuset=5 -p gpu=63 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-3.nancy.grid5000.fr' AND resource_id='9694' AND type='default'" -p cpu=1620 -p core=8570 -p cpuset=7 -p gpu=63 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-3.nancy.grid5000.fr' AND resource_id='9695' AND type='default'" -p cpu=1620 -p core=8571 -p cpuset=9 -p gpu=64 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-3.nancy.grid5000.fr' AND resource_id='9696' AND type='default'" -p cpu=1620 -p core=8572 -p cpuset=11 -p gpu=64 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-3.nancy.grid5000.fr' AND resource_id='9697' AND type='default'" -p cpu=1620 -p core=8573 -p cpuset=13 -p gpu=64 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-3.nancy.grid5000.fr' AND resource_id='9698' AND type='default'" -p cpu=1620 -p core=8574 -p cpuset=15 -p gpu=64 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 echo; echo 'Setting properties for clustera-3.nancy.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-3.nancy.grid5000.fr' and type='default'" -p ip='172.16.64.3' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 BL1CBX2' -p eth_count=1 -p eth_kavlan_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='GeForce RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='NO' -p cluster_priority=201906 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
+oarnodesetting --sql "host='clustera-3.nancy.grid5000.fr' and type='default'" -p ip='172.16.64.3' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 BL1CBX2' -p eth_count=1 -p eth_kavlan_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='NO' -p cluster_priority=201906 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
 
 echo '================================================================================'
 
@@ -168,24 +168,24 @@ echo '==========================================================================
 ###################################
 # clustera-4.nancy.grid5000.fr
 ###################################
-oarnodesetting --sql "host='clustera-4.nancy.grid5000.fr' AND resource_id='9699' AND type='default'" -p cpu=1621 -p core=8575 -p cpuset=0 -p gpu=65 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-4.nancy.grid5000.fr' AND resource_id='9700' AND type='default'" -p cpu=1621 -p core=8576 -p cpuset=2 -p gpu=65 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-4.nancy.grid5000.fr' AND resource_id='9701' AND type='default'" -p cpu=1621 -p core=8577 -p cpuset=4 -p gpu=65 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-4.nancy.grid5000.fr' AND resource_id='9702' AND type='default'" -p cpu=1621 -p core=8578 -p cpuset=6 -p gpu=65 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-4.nancy.grid5000.fr' AND resource_id='9703' AND type='default'" -p cpu=1621 -p core=8579 -p cpuset=8 -p gpu=66 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-4.nancy.grid5000.fr' AND resource_id='9704' AND type='default'" -p cpu=1621 -p core=8580 -p cpuset=10 -p gpu=66 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-4.nancy.grid5000.fr' AND resource_id='9705' AND type='default'" -p cpu=1621 -p core=8581 -p cpuset=12 -p gpu=66 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-4.nancy.grid5000.fr' AND resource_id='9706' AND type='default'" -p cpu=1621 -p core=8582 -p cpuset=14 -p gpu=66 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-4.nancy.grid5000.fr' AND resource_id='9707' AND type='default'" -p cpu=1622 -p core=8583 -p cpuset=1 -p gpu=67 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-4.nancy.grid5000.fr' AND resource_id='9708' AND type='default'" -p cpu=1622 -p core=8584 -p cpuset=3 -p gpu=67 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-4.nancy.grid5000.fr' AND resource_id='9709' AND type='default'" -p cpu=1622 -p core=8585 -p cpuset=5 -p gpu=67 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-4.nancy.grid5000.fr' AND resource_id='9710' AND type='default'" -p cpu=1622 -p core=8586 -p cpuset=7 -p gpu=67 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-4.nancy.grid5000.fr' AND resource_id='9711' AND type='default'" -p cpu=1622 -p core=8587 -p cpuset=9 -p gpu=68 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting --sql "host='clustera-4.nancy.grid5000.fr' AND resource_id='9712' AND type='default'" -p cpu=1622 -p core=8588 -p cpuset=11 -p gpu=68 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting --sql "host='clustera-4.nancy.grid5000.fr' AND resource_id='9713' AND type='default'" -p cpu=1622 -p core=8589 -p cpuset=13 -p gpu=68 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting --sql "host='clustera-4.nancy.grid5000.fr' AND resource_id='9714' AND type='default'" -p cpu=1622 -p core=8590 -p cpuset=15 -p gpu=68 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-4.nancy.grid5000.fr' AND resource_id='9699' AND type='default'" -p cpu=1621 -p core=8575 -p cpuset=0 -p gpu=65 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-4.nancy.grid5000.fr' AND resource_id='9700' AND type='default'" -p cpu=1621 -p core=8576 -p cpuset=2 -p gpu=65 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-4.nancy.grid5000.fr' AND resource_id='9701' AND type='default'" -p cpu=1621 -p core=8577 -p cpuset=4 -p gpu=65 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-4.nancy.grid5000.fr' AND resource_id='9702' AND type='default'" -p cpu=1621 -p core=8578 -p cpuset=6 -p gpu=65 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-4.nancy.grid5000.fr' AND resource_id='9703' AND type='default'" -p cpu=1621 -p core=8579 -p cpuset=8 -p gpu=66 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-4.nancy.grid5000.fr' AND resource_id='9704' AND type='default'" -p cpu=1621 -p core=8580 -p cpuset=10 -p gpu=66 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-4.nancy.grid5000.fr' AND resource_id='9705' AND type='default'" -p cpu=1621 -p core=8581 -p cpuset=12 -p gpu=66 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-4.nancy.grid5000.fr' AND resource_id='9706' AND type='default'" -p cpu=1621 -p core=8582 -p cpuset=14 -p gpu=66 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-4.nancy.grid5000.fr' AND resource_id='9707' AND type='default'" -p cpu=1622 -p core=8583 -p cpuset=1 -p gpu=67 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-4.nancy.grid5000.fr' AND resource_id='9708' AND type='default'" -p cpu=1622 -p core=8584 -p cpuset=3 -p gpu=67 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-4.nancy.grid5000.fr' AND resource_id='9709' AND type='default'" -p cpu=1622 -p core=8585 -p cpuset=5 -p gpu=67 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-4.nancy.grid5000.fr' AND resource_id='9710' AND type='default'" -p cpu=1622 -p core=8586 -p cpuset=7 -p gpu=67 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-4.nancy.grid5000.fr' AND resource_id='9711' AND type='default'" -p cpu=1622 -p core=8587 -p cpuset=9 -p gpu=68 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-4.nancy.grid5000.fr' AND resource_id='9712' AND type='default'" -p cpu=1622 -p core=8588 -p cpuset=11 -p gpu=68 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-4.nancy.grid5000.fr' AND resource_id='9713' AND type='default'" -p cpu=1622 -p core=8589 -p cpuset=13 -p gpu=68 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-4.nancy.grid5000.fr' AND resource_id='9714' AND type='default'" -p cpu=1622 -p core=8590 -p cpuset=15 -p gpu=68 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 echo; echo 'Setting properties for clustera-4.nancy.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-4.nancy.grid5000.fr' and type='default'" -p ip='172.16.64.4' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 DL1CBX2' -p eth_count=1 -p eth_kavlan_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='GeForce RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='NO' -p cluster_priority=201906 -p max_walltime=172800 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
+oarnodesetting --sql "host='clustera-4.nancy.grid5000.fr' and type='default'" -p ip='172.16.64.4' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 DL1CBX2' -p eth_count=1 -p eth_kavlan_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='NO' -p cluster_priority=201906 -p max_walltime=172800 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
 
 echo '================================================================================'
 
@@ -193,24 +193,24 @@ echo '==========================================================================
 ###################################
 # clustera-5.nancy.grid5000.fr
 ###################################
-oarnodesetting --sql "host='clustera-5.nancy.grid5000.fr' AND resource_id='9715' AND type='default'" -p cpu=1623 -p core=8591 -p cpuset=0 -p gpu=69 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-5.nancy.grid5000.fr' AND resource_id='9716' AND type='default'" -p cpu=1623 -p core=8592 -p cpuset=2 -p gpu=69 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-5.nancy.grid5000.fr' AND resource_id='9717' AND type='default'" -p cpu=1623 -p core=8593 -p cpuset=4 -p gpu=69 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-5.nancy.grid5000.fr' AND resource_id='9718' AND type='default'" -p cpu=1623 -p core=8594 -p cpuset=6 -p gpu=69 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-5.nancy.grid5000.fr' AND resource_id='9719' AND type='default'" -p cpu=1623 -p core=8595 -p cpuset=8 -p gpu=70 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-5.nancy.grid5000.fr' AND resource_id='9720' AND type='default'" -p cpu=1623 -p core=8596 -p cpuset=10 -p gpu=70 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-5.nancy.grid5000.fr' AND resource_id='9721' AND type='default'" -p cpu=1623 -p core=8597 -p cpuset=12 -p gpu=70 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-5.nancy.grid5000.fr' AND resource_id='9722' AND type='default'" -p cpu=1623 -p core=8598 -p cpuset=14 -p gpu=70 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-5.nancy.grid5000.fr' AND resource_id='9723' AND type='default'" -p cpu=1624 -p core=8599 -p cpuset=1 -p gpu=71 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-5.nancy.grid5000.fr' AND resource_id='9724' AND type='default'" -p cpu=1624 -p core=8600 -p cpuset=3 -p gpu=71 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-5.nancy.grid5000.fr' AND resource_id='9725' AND type='default'" -p cpu=1624 -p core=8601 -p cpuset=5 -p gpu=71 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-5.nancy.grid5000.fr' AND resource_id='9726' AND type='default'" -p cpu=1624 -p core=8602 -p cpuset=7 -p gpu=71 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-5.nancy.grid5000.fr' AND resource_id='9727' AND type='default'" -p cpu=1624 -p core=8603 -p cpuset=9 -p gpu=72 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting --sql "host='clustera-5.nancy.grid5000.fr' AND resource_id='9728' AND type='default'" -p cpu=1624 -p core=8604 -p cpuset=11 -p gpu=72 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting --sql "host='clustera-5.nancy.grid5000.fr' AND resource_id='9729' AND type='default'" -p cpu=1624 -p core=8605 -p cpuset=13 -p gpu=72 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting --sql "host='clustera-5.nancy.grid5000.fr' AND resource_id='9730' AND type='default'" -p cpu=1624 -p core=8606 -p cpuset=15 -p gpu=72 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-5.nancy.grid5000.fr' AND resource_id='9715' AND type='default'" -p cpu=1623 -p core=8591 -p cpuset=0 -p gpu=69 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-5.nancy.grid5000.fr' AND resource_id='9716' AND type='default'" -p cpu=1623 -p core=8592 -p cpuset=2 -p gpu=69 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-5.nancy.grid5000.fr' AND resource_id='9717' AND type='default'" -p cpu=1623 -p core=8593 -p cpuset=4 -p gpu=69 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-5.nancy.grid5000.fr' AND resource_id='9718' AND type='default'" -p cpu=1623 -p core=8594 -p cpuset=6 -p gpu=69 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-5.nancy.grid5000.fr' AND resource_id='9719' AND type='default'" -p cpu=1623 -p core=8595 -p cpuset=8 -p gpu=70 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-5.nancy.grid5000.fr' AND resource_id='9720' AND type='default'" -p cpu=1623 -p core=8596 -p cpuset=10 -p gpu=70 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-5.nancy.grid5000.fr' AND resource_id='9721' AND type='default'" -p cpu=1623 -p core=8597 -p cpuset=12 -p gpu=70 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-5.nancy.grid5000.fr' AND resource_id='9722' AND type='default'" -p cpu=1623 -p core=8598 -p cpuset=14 -p gpu=70 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-5.nancy.grid5000.fr' AND resource_id='9723' AND type='default'" -p cpu=1624 -p core=8599 -p cpuset=1 -p gpu=71 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-5.nancy.grid5000.fr' AND resource_id='9724' AND type='default'" -p cpu=1624 -p core=8600 -p cpuset=3 -p gpu=71 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-5.nancy.grid5000.fr' AND resource_id='9725' AND type='default'" -p cpu=1624 -p core=8601 -p cpuset=5 -p gpu=71 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-5.nancy.grid5000.fr' AND resource_id='9726' AND type='default'" -p cpu=1624 -p core=8602 -p cpuset=7 -p gpu=71 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-5.nancy.grid5000.fr' AND resource_id='9727' AND type='default'" -p cpu=1624 -p core=8603 -p cpuset=9 -p gpu=72 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-5.nancy.grid5000.fr' AND resource_id='9728' AND type='default'" -p cpu=1624 -p core=8604 -p cpuset=11 -p gpu=72 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-5.nancy.grid5000.fr' AND resource_id='9729' AND type='default'" -p cpu=1624 -p core=8605 -p cpuset=13 -p gpu=72 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-5.nancy.grid5000.fr' AND resource_id='9730' AND type='default'" -p cpu=1624 -p core=8606 -p cpuset=15 -p gpu=72 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 echo; echo 'Setting properties for clustera-5.nancy.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-5.nancy.grid5000.fr' and type='default'" -p ip='172.16.64.5' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 CL1CBX2' -p eth_count=1 -p eth_kavlan_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='GeForce RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='NO' -p cluster_priority=201906 -p max_walltime=172800 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
+oarnodesetting --sql "host='clustera-5.nancy.grid5000.fr' and type='default'" -p ip='172.16.64.5' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 CL1CBX2' -p eth_count=1 -p eth_kavlan_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='NO' -p cluster_priority=201906 -p max_walltime=172800 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
 
 echo '================================================================================'
 
@@ -218,24 +218,24 @@ echo '==========================================================================
 ###################################
 # clustera-6.nancy.grid5000.fr
 ###################################
-oarnodesetting --sql "host='clustera-6.nancy.grid5000.fr' AND resource_id='9731' AND type='default'" -p cpu=1625 -p core=8607 -p cpuset=0 -p gpu=73 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-6.nancy.grid5000.fr' AND resource_id='9732' AND type='default'" -p cpu=1625 -p core=8608 -p cpuset=2 -p gpu=73 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-6.nancy.grid5000.fr' AND resource_id='9733' AND type='default'" -p cpu=1625 -p core=8609 -p cpuset=4 -p gpu=73 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-6.nancy.grid5000.fr' AND resource_id='9734' AND type='default'" -p cpu=1625 -p core=8610 -p cpuset=6 -p gpu=73 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-6.nancy.grid5000.fr' AND resource_id='9735' AND type='default'" -p cpu=1625 -p core=8611 -p cpuset=8 -p gpu=74 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-6.nancy.grid5000.fr' AND resource_id='9736' AND type='default'" -p cpu=1625 -p core=8612 -p cpuset=10 -p gpu=74 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-6.nancy.grid5000.fr' AND resource_id='9737' AND type='default'" -p cpu=1625 -p core=8613 -p cpuset=12 -p gpu=74 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-6.nancy.grid5000.fr' AND resource_id='9738' AND type='default'" -p cpu=1625 -p core=8614 -p cpuset=14 -p gpu=74 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-6.nancy.grid5000.fr' AND resource_id='9739' AND type='default'" -p cpu=1626 -p core=8615 -p cpuset=1 -p gpu=75 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-6.nancy.grid5000.fr' AND resource_id='9740' AND type='default'" -p cpu=1626 -p core=8616 -p cpuset=3 -p gpu=75 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-6.nancy.grid5000.fr' AND resource_id='9741' AND type='default'" -p cpu=1626 -p core=8617 -p cpuset=5 -p gpu=75 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-6.nancy.grid5000.fr' AND resource_id='9742' AND type='default'" -p cpu=1626 -p core=8618 -p cpuset=7 -p gpu=75 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-6.nancy.grid5000.fr' AND resource_id='9743' AND type='default'" -p cpu=1626 -p core=8619 -p cpuset=9 -p gpu=76 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting --sql "host='clustera-6.nancy.grid5000.fr' AND resource_id='9744' AND type='default'" -p cpu=1626 -p core=8620 -p cpuset=11 -p gpu=76 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting --sql "host='clustera-6.nancy.grid5000.fr' AND resource_id='9745' AND type='default'" -p cpu=1626 -p core=8621 -p cpuset=13 -p gpu=76 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting --sql "host='clustera-6.nancy.grid5000.fr' AND resource_id='9746' AND type='default'" -p cpu=1626 -p core=8622 -p cpuset=15 -p gpu=76 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-6.nancy.grid5000.fr' AND resource_id='9731' AND type='default'" -p cpu=1625 -p core=8607 -p cpuset=0 -p gpu=73 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-6.nancy.grid5000.fr' AND resource_id='9732' AND type='default'" -p cpu=1625 -p core=8608 -p cpuset=2 -p gpu=73 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-6.nancy.grid5000.fr' AND resource_id='9733' AND type='default'" -p cpu=1625 -p core=8609 -p cpuset=4 -p gpu=73 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-6.nancy.grid5000.fr' AND resource_id='9734' AND type='default'" -p cpu=1625 -p core=8610 -p cpuset=6 -p gpu=73 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-6.nancy.grid5000.fr' AND resource_id='9735' AND type='default'" -p cpu=1625 -p core=8611 -p cpuset=8 -p gpu=74 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-6.nancy.grid5000.fr' AND resource_id='9736' AND type='default'" -p cpu=1625 -p core=8612 -p cpuset=10 -p gpu=74 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-6.nancy.grid5000.fr' AND resource_id='9737' AND type='default'" -p cpu=1625 -p core=8613 -p cpuset=12 -p gpu=74 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-6.nancy.grid5000.fr' AND resource_id='9738' AND type='default'" -p cpu=1625 -p core=8614 -p cpuset=14 -p gpu=74 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-6.nancy.grid5000.fr' AND resource_id='9739' AND type='default'" -p cpu=1626 -p core=8615 -p cpuset=1 -p gpu=75 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-6.nancy.grid5000.fr' AND resource_id='9740' AND type='default'" -p cpu=1626 -p core=8616 -p cpuset=3 -p gpu=75 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-6.nancy.grid5000.fr' AND resource_id='9741' AND type='default'" -p cpu=1626 -p core=8617 -p cpuset=5 -p gpu=75 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-6.nancy.grid5000.fr' AND resource_id='9742' AND type='default'" -p cpu=1626 -p core=8618 -p cpuset=7 -p gpu=75 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-6.nancy.grid5000.fr' AND resource_id='9743' AND type='default'" -p cpu=1626 -p core=8619 -p cpuset=9 -p gpu=76 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-6.nancy.grid5000.fr' AND resource_id='9744' AND type='default'" -p cpu=1626 -p core=8620 -p cpuset=11 -p gpu=76 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-6.nancy.grid5000.fr' AND resource_id='9745' AND type='default'" -p cpu=1626 -p core=8621 -p cpuset=13 -p gpu=76 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-6.nancy.grid5000.fr' AND resource_id='9746' AND type='default'" -p cpu=1626 -p core=8622 -p cpuset=15 -p gpu=76 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 echo; echo 'Setting properties for clustera-6.nancy.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-6.nancy.grid5000.fr' and type='default'" -p ip='172.16.64.6' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 8K1CBX2' -p eth_count=1 -p eth_kavlan_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='GeForce RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='NO' -p cluster_priority=201906 -p max_walltime=172800 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
+oarnodesetting --sql "host='clustera-6.nancy.grid5000.fr' and type='default'" -p ip='172.16.64.6' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 8K1CBX2' -p eth_count=1 -p eth_kavlan_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='NO' -p cluster_priority=201906 -p max_walltime=172800 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
 
 echo '================================================================================'
 
@@ -243,24 +243,24 @@ echo '==========================================================================
 ###################################
 # clustera-7.nancy.grid5000.fr
 ###################################
-oarnodesetting --sql "host='clustera-7.nancy.grid5000.fr' AND resource_id='9747' AND type='default'" -p cpu=1627 -p core=8623 -p cpuset=0 -p gpu=77 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-7.nancy.grid5000.fr' AND resource_id='9748' AND type='default'" -p cpu=1627 -p core=8624 -p cpuset=2 -p gpu=77 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-7.nancy.grid5000.fr' AND resource_id='9749' AND type='default'" -p cpu=1627 -p core=8625 -p cpuset=4 -p gpu=77 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-7.nancy.grid5000.fr' AND resource_id='9750' AND type='default'" -p cpu=1627 -p core=8626 -p cpuset=6 -p gpu=77 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-7.nancy.grid5000.fr' AND resource_id='9751' AND type='default'" -p cpu=1627 -p core=8627 -p cpuset=8 -p gpu=78 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-7.nancy.grid5000.fr' AND resource_id='9752' AND type='default'" -p cpu=1627 -p core=8628 -p cpuset=10 -p gpu=78 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-7.nancy.grid5000.fr' AND resource_id='9753' AND type='default'" -p cpu=1627 -p core=8629 -p cpuset=12 -p gpu=78 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-7.nancy.grid5000.fr' AND resource_id='9754' AND type='default'" -p cpu=1627 -p core=8630 -p cpuset=14 -p gpu=78 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-7.nancy.grid5000.fr' AND resource_id='9755' AND type='default'" -p cpu=1628 -p core=8631 -p cpuset=1 -p gpu=79 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-7.nancy.grid5000.fr' AND resource_id='9756' AND type='default'" -p cpu=1628 -p core=8632 -p cpuset=3 -p gpu=79 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-7.nancy.grid5000.fr' AND resource_id='9757' AND type='default'" -p cpu=1628 -p core=8633 -p cpuset=5 -p gpu=79 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-7.nancy.grid5000.fr' AND resource_id='9758' AND type='default'" -p cpu=1628 -p core=8634 -p cpuset=7 -p gpu=79 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-7.nancy.grid5000.fr' AND resource_id='9759' AND type='default'" -p cpu=1628 -p core=8635 -p cpuset=9 -p gpu=80 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting --sql "host='clustera-7.nancy.grid5000.fr' AND resource_id='9760' AND type='default'" -p cpu=1628 -p core=8636 -p cpuset=11 -p gpu=80 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting --sql "host='clustera-7.nancy.grid5000.fr' AND resource_id='9761' AND type='default'" -p cpu=1628 -p core=8637 -p cpuset=13 -p gpu=80 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting --sql "host='clustera-7.nancy.grid5000.fr' AND resource_id='9762' AND type='default'" -p cpu=1628 -p core=8638 -p cpuset=15 -p gpu=80 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-7.nancy.grid5000.fr' AND resource_id='9747' AND type='default'" -p cpu=1627 -p core=8623 -p cpuset=0 -p gpu=77 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-7.nancy.grid5000.fr' AND resource_id='9748' AND type='default'" -p cpu=1627 -p core=8624 -p cpuset=2 -p gpu=77 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-7.nancy.grid5000.fr' AND resource_id='9749' AND type='default'" -p cpu=1627 -p core=8625 -p cpuset=4 -p gpu=77 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-7.nancy.grid5000.fr' AND resource_id='9750' AND type='default'" -p cpu=1627 -p core=8626 -p cpuset=6 -p gpu=77 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-7.nancy.grid5000.fr' AND resource_id='9751' AND type='default'" -p cpu=1627 -p core=8627 -p cpuset=8 -p gpu=78 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-7.nancy.grid5000.fr' AND resource_id='9752' AND type='default'" -p cpu=1627 -p core=8628 -p cpuset=10 -p gpu=78 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-7.nancy.grid5000.fr' AND resource_id='9753' AND type='default'" -p cpu=1627 -p core=8629 -p cpuset=12 -p gpu=78 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-7.nancy.grid5000.fr' AND resource_id='9754' AND type='default'" -p cpu=1627 -p core=8630 -p cpuset=14 -p gpu=78 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-7.nancy.grid5000.fr' AND resource_id='9755' AND type='default'" -p cpu=1628 -p core=8631 -p cpuset=1 -p gpu=79 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-7.nancy.grid5000.fr' AND resource_id='9756' AND type='default'" -p cpu=1628 -p core=8632 -p cpuset=3 -p gpu=79 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-7.nancy.grid5000.fr' AND resource_id='9757' AND type='default'" -p cpu=1628 -p core=8633 -p cpuset=5 -p gpu=79 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-7.nancy.grid5000.fr' AND resource_id='9758' AND type='default'" -p cpu=1628 -p core=8634 -p cpuset=7 -p gpu=79 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-7.nancy.grid5000.fr' AND resource_id='9759' AND type='default'" -p cpu=1628 -p core=8635 -p cpuset=9 -p gpu=80 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-7.nancy.grid5000.fr' AND resource_id='9760' AND type='default'" -p cpu=1628 -p core=8636 -p cpuset=11 -p gpu=80 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-7.nancy.grid5000.fr' AND resource_id='9761' AND type='default'" -p cpu=1628 -p core=8637 -p cpuset=13 -p gpu=80 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-7.nancy.grid5000.fr' AND resource_id='9762' AND type='default'" -p cpu=1628 -p core=8638 -p cpuset=15 -p gpu=80 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 echo; echo 'Setting properties for clustera-7.nancy.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-7.nancy.grid5000.fr' and type='default'" -p ip='172.16.64.7' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 BK1CBX2' -p eth_count=1 -p eth_kavlan_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='GeForce RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='NO' -p cluster_priority=201906 -p max_walltime=604800 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
+oarnodesetting --sql "host='clustera-7.nancy.grid5000.fr' and type='default'" -p ip='172.16.64.7' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 BK1CBX2' -p eth_count=1 -p eth_kavlan_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='NO' -p cluster_priority=201906 -p max_walltime=604800 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
 
 echo '================================================================================'
 
@@ -268,24 +268,24 @@ echo '==========================================================================
 ###################################
 # clustera-8.nancy.grid5000.fr
 ###################################
-oarnodesetting --sql "host='clustera-8.nancy.grid5000.fr' AND resource_id='9763' AND type='default'" -p cpu=1629 -p core=8639 -p cpuset=0 -p gpu=81 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-8.nancy.grid5000.fr' AND resource_id='9764' AND type='default'" -p cpu=1629 -p core=8640 -p cpuset=2 -p gpu=81 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-8.nancy.grid5000.fr' AND resource_id='9765' AND type='default'" -p cpu=1629 -p core=8641 -p cpuset=4 -p gpu=81 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-8.nancy.grid5000.fr' AND resource_id='9766' AND type='default'" -p cpu=1629 -p core=8642 -p cpuset=6 -p gpu=81 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-8.nancy.grid5000.fr' AND resource_id='9767' AND type='default'" -p cpu=1629 -p core=8643 -p cpuset=8 -p gpu=82 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-8.nancy.grid5000.fr' AND resource_id='9768' AND type='default'" -p cpu=1629 -p core=8644 -p cpuset=10 -p gpu=82 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-8.nancy.grid5000.fr' AND resource_id='9769' AND type='default'" -p cpu=1629 -p core=8645 -p cpuset=12 -p gpu=82 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-8.nancy.grid5000.fr' AND resource_id='9770' AND type='default'" -p cpu=1629 -p core=8646 -p cpuset=14 -p gpu=82 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-8.nancy.grid5000.fr' AND resource_id='9771' AND type='default'" -p cpu=1630 -p core=8647 -p cpuset=1 -p gpu=83 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-8.nancy.grid5000.fr' AND resource_id='9772' AND type='default'" -p cpu=1630 -p core=8648 -p cpuset=3 -p gpu=83 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-8.nancy.grid5000.fr' AND resource_id='9773' AND type='default'" -p cpu=1630 -p core=8649 -p cpuset=5 -p gpu=83 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-8.nancy.grid5000.fr' AND resource_id='9774' AND type='default'" -p cpu=1630 -p core=8650 -p cpuset=7 -p gpu=83 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-8.nancy.grid5000.fr' AND resource_id='9775' AND type='default'" -p cpu=1630 -p core=8651 -p cpuset=9 -p gpu=84 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting --sql "host='clustera-8.nancy.grid5000.fr' AND resource_id='9776' AND type='default'" -p cpu=1630 -p core=8652 -p cpuset=11 -p gpu=84 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting --sql "host='clustera-8.nancy.grid5000.fr' AND resource_id='9777' AND type='default'" -p cpu=1630 -p core=8653 -p cpuset=13 -p gpu=84 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting --sql "host='clustera-8.nancy.grid5000.fr' AND resource_id='9778' AND type='default'" -p cpu=1630 -p core=8654 -p cpuset=15 -p gpu=84 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-8.nancy.grid5000.fr' AND resource_id='9763' AND type='default'" -p cpu=1629 -p core=8639 -p cpuset=0 -p gpu=81 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-8.nancy.grid5000.fr' AND resource_id='9764' AND type='default'" -p cpu=1629 -p core=8640 -p cpuset=2 -p gpu=81 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-8.nancy.grid5000.fr' AND resource_id='9765' AND type='default'" -p cpu=1629 -p core=8641 -p cpuset=4 -p gpu=81 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-8.nancy.grid5000.fr' AND resource_id='9766' AND type='default'" -p cpu=1629 -p core=8642 -p cpuset=6 -p gpu=81 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-8.nancy.grid5000.fr' AND resource_id='9767' AND type='default'" -p cpu=1629 -p core=8643 -p cpuset=8 -p gpu=82 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-8.nancy.grid5000.fr' AND resource_id='9768' AND type='default'" -p cpu=1629 -p core=8644 -p cpuset=10 -p gpu=82 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-8.nancy.grid5000.fr' AND resource_id='9769' AND type='default'" -p cpu=1629 -p core=8645 -p cpuset=12 -p gpu=82 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-8.nancy.grid5000.fr' AND resource_id='9770' AND type='default'" -p cpu=1629 -p core=8646 -p cpuset=14 -p gpu=82 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-8.nancy.grid5000.fr' AND resource_id='9771' AND type='default'" -p cpu=1630 -p core=8647 -p cpuset=1 -p gpu=83 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-8.nancy.grid5000.fr' AND resource_id='9772' AND type='default'" -p cpu=1630 -p core=8648 -p cpuset=3 -p gpu=83 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-8.nancy.grid5000.fr' AND resource_id='9773' AND type='default'" -p cpu=1630 -p core=8649 -p cpuset=5 -p gpu=83 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-8.nancy.grid5000.fr' AND resource_id='9774' AND type='default'" -p cpu=1630 -p core=8650 -p cpuset=7 -p gpu=83 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-8.nancy.grid5000.fr' AND resource_id='9775' AND type='default'" -p cpu=1630 -p core=8651 -p cpuset=9 -p gpu=84 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-8.nancy.grid5000.fr' AND resource_id='9776' AND type='default'" -p cpu=1630 -p core=8652 -p cpuset=11 -p gpu=84 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-8.nancy.grid5000.fr' AND resource_id='9777' AND type='default'" -p cpu=1630 -p core=8653 -p cpuset=13 -p gpu=84 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-8.nancy.grid5000.fr' AND resource_id='9778' AND type='default'" -p cpu=1630 -p core=8654 -p cpuset=15 -p gpu=84 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 echo; echo 'Setting properties for clustera-8.nancy.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-8.nancy.grid5000.fr' and type='default'" -p ip='172.16.64.8' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 CK1CBX2' -p eth_count=1 -p eth_kavlan_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='GeForce RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='NO' -p cluster_priority=201906 -p max_walltime=604800 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
+oarnodesetting --sql "host='clustera-8.nancy.grid5000.fr' and type='default'" -p ip='172.16.64.8' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 CK1CBX2' -p eth_count=1 -p eth_kavlan_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='NO' -p cluster_priority=201906 -p max_walltime=604800 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
 
 echo '================================================================================'
 
@@ -293,24 +293,24 @@ echo '==========================================================================
 ###################################
 # clustera-9.nancy.grid5000.fr
 ###################################
-oarnodesetting --sql "host='clustera-9.nancy.grid5000.fr' AND resource_id='9779' AND type='default'" -p cpu=1631 -p core=8655 -p cpuset=0 -p gpu=85 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-9.nancy.grid5000.fr' AND resource_id='9780' AND type='default'" -p cpu=1631 -p core=8656 -p cpuset=2 -p gpu=85 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-9.nancy.grid5000.fr' AND resource_id='9781' AND type='default'" -p cpu=1631 -p core=8657 -p cpuset=4 -p gpu=85 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-9.nancy.grid5000.fr' AND resource_id='9782' AND type='default'" -p cpu=1631 -p core=8658 -p cpuset=6 -p gpu=85 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-9.nancy.grid5000.fr' AND resource_id='9783' AND type='default'" -p cpu=1631 -p core=8659 -p cpuset=8 -p gpu=86 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-9.nancy.grid5000.fr' AND resource_id='9784' AND type='default'" -p cpu=1631 -p core=8660 -p cpuset=10 -p gpu=86 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-9.nancy.grid5000.fr' AND resource_id='9785' AND type='default'" -p cpu=1631 -p core=8661 -p cpuset=12 -p gpu=86 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-9.nancy.grid5000.fr' AND resource_id='9786' AND type='default'" -p cpu=1631 -p core=8662 -p cpuset=14 -p gpu=86 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-9.nancy.grid5000.fr' AND resource_id='9787' AND type='default'" -p cpu=1632 -p core=8663 -p cpuset=1 -p gpu=87 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-9.nancy.grid5000.fr' AND resource_id='9788' AND type='default'" -p cpu=1632 -p core=8664 -p cpuset=3 -p gpu=87 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-9.nancy.grid5000.fr' AND resource_id='9789' AND type='default'" -p cpu=1632 -p core=8665 -p cpuset=5 -p gpu=87 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-9.nancy.grid5000.fr' AND resource_id='9790' AND type='default'" -p cpu=1632 -p core=8666 -p cpuset=7 -p gpu=87 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-9.nancy.grid5000.fr' AND resource_id='9791' AND type='default'" -p cpu=1632 -p core=8667 -p cpuset=9 -p gpu=88 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting --sql "host='clustera-9.nancy.grid5000.fr' AND resource_id='9792' AND type='default'" -p cpu=1632 -p core=8668 -p cpuset=11 -p gpu=88 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting --sql "host='clustera-9.nancy.grid5000.fr' AND resource_id='9793' AND type='default'" -p cpu=1632 -p core=8669 -p cpuset=13 -p gpu=88 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting --sql "host='clustera-9.nancy.grid5000.fr' AND resource_id='9794' AND type='default'" -p cpu=1632 -p core=8670 -p cpuset=15 -p gpu=88 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-9.nancy.grid5000.fr' AND resource_id='9779' AND type='default'" -p cpu=1631 -p core=8655 -p cpuset=0 -p gpu=85 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-9.nancy.grid5000.fr' AND resource_id='9780' AND type='default'" -p cpu=1631 -p core=8656 -p cpuset=2 -p gpu=85 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-9.nancy.grid5000.fr' AND resource_id='9781' AND type='default'" -p cpu=1631 -p core=8657 -p cpuset=4 -p gpu=85 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-9.nancy.grid5000.fr' AND resource_id='9782' AND type='default'" -p cpu=1631 -p core=8658 -p cpuset=6 -p gpu=85 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-9.nancy.grid5000.fr' AND resource_id='9783' AND type='default'" -p cpu=1631 -p core=8659 -p cpuset=8 -p gpu=86 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-9.nancy.grid5000.fr' AND resource_id='9784' AND type='default'" -p cpu=1631 -p core=8660 -p cpuset=10 -p gpu=86 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-9.nancy.grid5000.fr' AND resource_id='9785' AND type='default'" -p cpu=1631 -p core=8661 -p cpuset=12 -p gpu=86 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-9.nancy.grid5000.fr' AND resource_id='9786' AND type='default'" -p cpu=1631 -p core=8662 -p cpuset=14 -p gpu=86 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-9.nancy.grid5000.fr' AND resource_id='9787' AND type='default'" -p cpu=1632 -p core=8663 -p cpuset=1 -p gpu=87 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-9.nancy.grid5000.fr' AND resource_id='9788' AND type='default'" -p cpu=1632 -p core=8664 -p cpuset=3 -p gpu=87 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-9.nancy.grid5000.fr' AND resource_id='9789' AND type='default'" -p cpu=1632 -p core=8665 -p cpuset=5 -p gpu=87 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-9.nancy.grid5000.fr' AND resource_id='9790' AND type='default'" -p cpu=1632 -p core=8666 -p cpuset=7 -p gpu=87 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-9.nancy.grid5000.fr' AND resource_id='9791' AND type='default'" -p cpu=1632 -p core=8667 -p cpuset=9 -p gpu=88 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-9.nancy.grid5000.fr' AND resource_id='9792' AND type='default'" -p cpu=1632 -p core=8668 -p cpuset=11 -p gpu=88 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-9.nancy.grid5000.fr' AND resource_id='9793' AND type='default'" -p cpu=1632 -p core=8669 -p cpuset=13 -p gpu=88 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-9.nancy.grid5000.fr' AND resource_id='9794' AND type='default'" -p cpu=1632 -p core=8670 -p cpuset=15 -p gpu=88 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 echo; echo 'Setting properties for clustera-9.nancy.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-9.nancy.grid5000.fr' and type='default'" -p ip='172.16.64.9' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 9K1CBX2' -p eth_count=1 -p eth_kavlan_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='GeForce RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='NO' -p cluster_priority=201906 -p max_walltime=604800 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
+oarnodesetting --sql "host='clustera-9.nancy.grid5000.fr' and type='default'" -p ip='172.16.64.9' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 9K1CBX2' -p eth_count=1 -p eth_kavlan_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='NO' -p cluster_priority=201906 -p max_walltime=604800 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
 
 echo '================================================================================'
 
@@ -318,24 +318,24 @@ echo '==========================================================================
 ###################################
 # clustera-10.nancy.grid5000.fr
 ###################################
-oarnodesetting --sql "host='clustera-10.nancy.grid5000.fr' AND resource_id='9795' AND type='default'" -p cpu=1633 -p core=8671 -p cpuset=0 -p gpu=89 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-10.nancy.grid5000.fr' AND resource_id='9796' AND type='default'" -p cpu=1633 -p core=8672 -p cpuset=2 -p gpu=89 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-10.nancy.grid5000.fr' AND resource_id='9797' AND type='default'" -p cpu=1633 -p core=8673 -p cpuset=4 -p gpu=89 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-10.nancy.grid5000.fr' AND resource_id='9798' AND type='default'" -p cpu=1633 -p core=8674 -p cpuset=6 -p gpu=89 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-10.nancy.grid5000.fr' AND resource_id='9799' AND type='default'" -p cpu=1633 -p core=8675 -p cpuset=8 -p gpu=90 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-10.nancy.grid5000.fr' AND resource_id='9800' AND type='default'" -p cpu=1633 -p core=8676 -p cpuset=10 -p gpu=90 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-10.nancy.grid5000.fr' AND resource_id='9801' AND type='default'" -p cpu=1633 -p core=8677 -p cpuset=12 -p gpu=90 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-10.nancy.grid5000.fr' AND resource_id='9802' AND type='default'" -p cpu=1633 -p core=8678 -p cpuset=14 -p gpu=90 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-10.nancy.grid5000.fr' AND resource_id='9803' AND type='default'" -p cpu=1634 -p core=8679 -p cpuset=1 -p gpu=91 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-10.nancy.grid5000.fr' AND resource_id='9804' AND type='default'" -p cpu=1634 -p core=8680 -p cpuset=3 -p gpu=91 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-10.nancy.grid5000.fr' AND resource_id='9805' AND type='default'" -p cpu=1634 -p core=8681 -p cpuset=5 -p gpu=91 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-10.nancy.grid5000.fr' AND resource_id='9806' AND type='default'" -p cpu=1634 -p core=8682 -p cpuset=7 -p gpu=91 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-10.nancy.grid5000.fr' AND resource_id='9807' AND type='default'" -p cpu=1634 -p core=8683 -p cpuset=9 -p gpu=92 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting --sql "host='clustera-10.nancy.grid5000.fr' AND resource_id='9808' AND type='default'" -p cpu=1634 -p core=8684 -p cpuset=11 -p gpu=92 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting --sql "host='clustera-10.nancy.grid5000.fr' AND resource_id='9809' AND type='default'" -p cpu=1634 -p core=8685 -p cpuset=13 -p gpu=92 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting --sql "host='clustera-10.nancy.grid5000.fr' AND resource_id='9810' AND type='default'" -p cpu=1634 -p core=8686 -p cpuset=15 -p gpu=92 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-10.nancy.grid5000.fr' AND resource_id='9795' AND type='default'" -p cpu=1633 -p core=8671 -p cpuset=0 -p gpu=89 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-10.nancy.grid5000.fr' AND resource_id='9796' AND type='default'" -p cpu=1633 -p core=8672 -p cpuset=2 -p gpu=89 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-10.nancy.grid5000.fr' AND resource_id='9797' AND type='default'" -p cpu=1633 -p core=8673 -p cpuset=4 -p gpu=89 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-10.nancy.grid5000.fr' AND resource_id='9798' AND type='default'" -p cpu=1633 -p core=8674 -p cpuset=6 -p gpu=89 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-10.nancy.grid5000.fr' AND resource_id='9799' AND type='default'" -p cpu=1633 -p core=8675 -p cpuset=8 -p gpu=90 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-10.nancy.grid5000.fr' AND resource_id='9800' AND type='default'" -p cpu=1633 -p core=8676 -p cpuset=10 -p gpu=90 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-10.nancy.grid5000.fr' AND resource_id='9801' AND type='default'" -p cpu=1633 -p core=8677 -p cpuset=12 -p gpu=90 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-10.nancy.grid5000.fr' AND resource_id='9802' AND type='default'" -p cpu=1633 -p core=8678 -p cpuset=14 -p gpu=90 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-10.nancy.grid5000.fr' AND resource_id='9803' AND type='default'" -p cpu=1634 -p core=8679 -p cpuset=1 -p gpu=91 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-10.nancy.grid5000.fr' AND resource_id='9804' AND type='default'" -p cpu=1634 -p core=8680 -p cpuset=3 -p gpu=91 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-10.nancy.grid5000.fr' AND resource_id='9805' AND type='default'" -p cpu=1634 -p core=8681 -p cpuset=5 -p gpu=91 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-10.nancy.grid5000.fr' AND resource_id='9806' AND type='default'" -p cpu=1634 -p core=8682 -p cpuset=7 -p gpu=91 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-10.nancy.grid5000.fr' AND resource_id='9807' AND type='default'" -p cpu=1634 -p core=8683 -p cpuset=9 -p gpu=92 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-10.nancy.grid5000.fr' AND resource_id='9808' AND type='default'" -p cpu=1634 -p core=8684 -p cpuset=11 -p gpu=92 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-10.nancy.grid5000.fr' AND resource_id='9809' AND type='default'" -p cpu=1634 -p core=8685 -p cpuset=13 -p gpu=92 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-10.nancy.grid5000.fr' AND resource_id='9810' AND type='default'" -p cpu=1634 -p core=8686 -p cpuset=15 -p gpu=92 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 echo; echo 'Setting properties for clustera-10.nancy.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-10.nancy.grid5000.fr' and type='default'" -p ip='172.16.64.10' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 GL1CBX2' -p eth_count=1 -p eth_kavlan_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='GeForce RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='NO' -p cluster_priority=201906 -p max_walltime=604800 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
+oarnodesetting --sql "host='clustera-10.nancy.grid5000.fr' and type='default'" -p ip='172.16.64.10' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 GL1CBX2' -p eth_count=1 -p eth_kavlan_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='NO' -p cluster_priority=201906 -p max_walltime=604800 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
 
 echo '================================================================================'
 
@@ -343,24 +343,24 @@ echo '==========================================================================
 ###################################
 # clustera-11.nancy.grid5000.fr
 ###################################
-oarnodesetting --sql "host='clustera-11.nancy.grid5000.fr' AND resource_id='9811' AND type='default'" -p cpu=1635 -p core=8687 -p cpuset=0 -p gpu=93 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-11.nancy.grid5000.fr' AND resource_id='9812' AND type='default'" -p cpu=1635 -p core=8688 -p cpuset=2 -p gpu=93 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-11.nancy.grid5000.fr' AND resource_id='9813' AND type='default'" -p cpu=1635 -p core=8689 -p cpuset=4 -p gpu=93 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-11.nancy.grid5000.fr' AND resource_id='9814' AND type='default'" -p cpu=1635 -p core=8690 -p cpuset=6 -p gpu=93 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-11.nancy.grid5000.fr' AND resource_id='9815' AND type='default'" -p cpu=1635 -p core=8691 -p cpuset=8 -p gpu=94 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-11.nancy.grid5000.fr' AND resource_id='9816' AND type='default'" -p cpu=1635 -p core=8692 -p cpuset=10 -p gpu=94 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-11.nancy.grid5000.fr' AND resource_id='9817' AND type='default'" -p cpu=1635 -p core=8693 -p cpuset=12 -p gpu=94 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-11.nancy.grid5000.fr' AND resource_id='9818' AND type='default'" -p cpu=1635 -p core=8694 -p cpuset=14 -p gpu=94 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-11.nancy.grid5000.fr' AND resource_id='9819' AND type='default'" -p cpu=1636 -p core=8695 -p cpuset=1 -p gpu=95 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-11.nancy.grid5000.fr' AND resource_id='9820' AND type='default'" -p cpu=1636 -p core=8696 -p cpuset=3 -p gpu=95 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-11.nancy.grid5000.fr' AND resource_id='9821' AND type='default'" -p cpu=1636 -p core=8697 -p cpuset=5 -p gpu=95 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-11.nancy.grid5000.fr' AND resource_id='9822' AND type='default'" -p cpu=1636 -p core=8698 -p cpuset=7 -p gpu=95 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-11.nancy.grid5000.fr' AND resource_id='9823' AND type='default'" -p cpu=1636 -p core=8699 -p cpuset=9 -p gpu=96 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting --sql "host='clustera-11.nancy.grid5000.fr' AND resource_id='9824' AND type='default'" -p cpu=1636 -p core=8700 -p cpuset=11 -p gpu=96 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting --sql "host='clustera-11.nancy.grid5000.fr' AND resource_id='9825' AND type='default'" -p cpu=1636 -p core=8701 -p cpuset=13 -p gpu=96 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting --sql "host='clustera-11.nancy.grid5000.fr' AND resource_id='9826' AND type='default'" -p cpu=1636 -p core=8702 -p cpuset=15 -p gpu=96 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-11.nancy.grid5000.fr' AND resource_id='9811' AND type='default'" -p cpu=1635 -p core=8687 -p cpuset=0 -p gpu=93 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-11.nancy.grid5000.fr' AND resource_id='9812' AND type='default'" -p cpu=1635 -p core=8688 -p cpuset=2 -p gpu=93 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-11.nancy.grid5000.fr' AND resource_id='9813' AND type='default'" -p cpu=1635 -p core=8689 -p cpuset=4 -p gpu=93 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-11.nancy.grid5000.fr' AND resource_id='9814' AND type='default'" -p cpu=1635 -p core=8690 -p cpuset=6 -p gpu=93 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-11.nancy.grid5000.fr' AND resource_id='9815' AND type='default'" -p cpu=1635 -p core=8691 -p cpuset=8 -p gpu=94 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-11.nancy.grid5000.fr' AND resource_id='9816' AND type='default'" -p cpu=1635 -p core=8692 -p cpuset=10 -p gpu=94 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-11.nancy.grid5000.fr' AND resource_id='9817' AND type='default'" -p cpu=1635 -p core=8693 -p cpuset=12 -p gpu=94 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-11.nancy.grid5000.fr' AND resource_id='9818' AND type='default'" -p cpu=1635 -p core=8694 -p cpuset=14 -p gpu=94 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-11.nancy.grid5000.fr' AND resource_id='9819' AND type='default'" -p cpu=1636 -p core=8695 -p cpuset=1 -p gpu=95 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-11.nancy.grid5000.fr' AND resource_id='9820' AND type='default'" -p cpu=1636 -p core=8696 -p cpuset=3 -p gpu=95 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-11.nancy.grid5000.fr' AND resource_id='9821' AND type='default'" -p cpu=1636 -p core=8697 -p cpuset=5 -p gpu=95 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-11.nancy.grid5000.fr' AND resource_id='9822' AND type='default'" -p cpu=1636 -p core=8698 -p cpuset=7 -p gpu=95 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-11.nancy.grid5000.fr' AND resource_id='9823' AND type='default'" -p cpu=1636 -p core=8699 -p cpuset=9 -p gpu=96 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-11.nancy.grid5000.fr' AND resource_id='9824' AND type='default'" -p cpu=1636 -p core=8700 -p cpuset=11 -p gpu=96 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-11.nancy.grid5000.fr' AND resource_id='9825' AND type='default'" -p cpu=1636 -p core=8701 -p cpuset=13 -p gpu=96 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-11.nancy.grid5000.fr' AND resource_id='9826' AND type='default'" -p cpu=1636 -p core=8702 -p cpuset=15 -p gpu=96 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 echo; echo 'Setting properties for clustera-11.nancy.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-11.nancy.grid5000.fr' and type='default'" -p ip='172.16.64.11' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 JL1CBX2' -p eth_count=1 -p eth_kavlan_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='GeForce RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='NO' -p cluster_priority=201906 -p max_walltime=604800 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
+oarnodesetting --sql "host='clustera-11.nancy.grid5000.fr' and type='default'" -p ip='172.16.64.11' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 JL1CBX2' -p eth_count=1 -p eth_kavlan_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='NO' -p cluster_priority=201906 -p max_walltime=604800 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
 
 echo '================================================================================'
 
@@ -368,24 +368,24 @@ echo '==========================================================================
 ###################################
 # clustera-12.nancy.grid5000.fr
 ###################################
-oarnodesetting --sql "host='clustera-12.nancy.grid5000.fr' AND resource_id='9827' AND type='default'" -p cpu=1637 -p core=8703 -p cpuset=0 -p gpu=97 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-12.nancy.grid5000.fr' AND resource_id='9828' AND type='default'" -p cpu=1637 -p core=8704 -p cpuset=2 -p gpu=97 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-12.nancy.grid5000.fr' AND resource_id='9829' AND type='default'" -p cpu=1637 -p core=8705 -p cpuset=4 -p gpu=97 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-12.nancy.grid5000.fr' AND resource_id='9830' AND type='default'" -p cpu=1637 -p core=8706 -p cpuset=6 -p gpu=97 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-12.nancy.grid5000.fr' AND resource_id='9831' AND type='default'" -p cpu=1637 -p core=8707 -p cpuset=8 -p gpu=98 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-12.nancy.grid5000.fr' AND resource_id='9832' AND type='default'" -p cpu=1637 -p core=8708 -p cpuset=10 -p gpu=98 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-12.nancy.grid5000.fr' AND resource_id='9833' AND type='default'" -p cpu=1637 -p core=8709 -p cpuset=12 -p gpu=98 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-12.nancy.grid5000.fr' AND resource_id='9834' AND type='default'" -p cpu=1637 -p core=8710 -p cpuset=14 -p gpu=98 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-12.nancy.grid5000.fr' AND resource_id='9835' AND type='default'" -p cpu=1638 -p core=8711 -p cpuset=1 -p gpu=99 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-12.nancy.grid5000.fr' AND resource_id='9836' AND type='default'" -p cpu=1638 -p core=8712 -p cpuset=3 -p gpu=99 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-12.nancy.grid5000.fr' AND resource_id='9837' AND type='default'" -p cpu=1638 -p core=8713 -p cpuset=5 -p gpu=99 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-12.nancy.grid5000.fr' AND resource_id='9838' AND type='default'" -p cpu=1638 -p core=8714 -p cpuset=7 -p gpu=99 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-12.nancy.grid5000.fr' AND resource_id='9839' AND type='default'" -p cpu=1638 -p core=8715 -p cpuset=9 -p gpu=100 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting --sql "host='clustera-12.nancy.grid5000.fr' AND resource_id='9840' AND type='default'" -p cpu=1638 -p core=8716 -p cpuset=11 -p gpu=100 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting --sql "host='clustera-12.nancy.grid5000.fr' AND resource_id='9841' AND type='default'" -p cpu=1638 -p core=8717 -p cpuset=13 -p gpu=100 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting --sql "host='clustera-12.nancy.grid5000.fr' AND resource_id='9842' AND type='default'" -p cpu=1638 -p core=8718 -p cpuset=15 -p gpu=100 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-12.nancy.grid5000.fr' AND resource_id='9827' AND type='default'" -p cpu=1637 -p core=8703 -p cpuset=0 -p gpu=97 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-12.nancy.grid5000.fr' AND resource_id='9828' AND type='default'" -p cpu=1637 -p core=8704 -p cpuset=2 -p gpu=97 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-12.nancy.grid5000.fr' AND resource_id='9829' AND type='default'" -p cpu=1637 -p core=8705 -p cpuset=4 -p gpu=97 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-12.nancy.grid5000.fr' AND resource_id='9830' AND type='default'" -p cpu=1637 -p core=8706 -p cpuset=6 -p gpu=97 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-12.nancy.grid5000.fr' AND resource_id='9831' AND type='default'" -p cpu=1637 -p core=8707 -p cpuset=8 -p gpu=98 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-12.nancy.grid5000.fr' AND resource_id='9832' AND type='default'" -p cpu=1637 -p core=8708 -p cpuset=10 -p gpu=98 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-12.nancy.grid5000.fr' AND resource_id='9833' AND type='default'" -p cpu=1637 -p core=8709 -p cpuset=12 -p gpu=98 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-12.nancy.grid5000.fr' AND resource_id='9834' AND type='default'" -p cpu=1637 -p core=8710 -p cpuset=14 -p gpu=98 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-12.nancy.grid5000.fr' AND resource_id='9835' AND type='default'" -p cpu=1638 -p core=8711 -p cpuset=1 -p gpu=99 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-12.nancy.grid5000.fr' AND resource_id='9836' AND type='default'" -p cpu=1638 -p core=8712 -p cpuset=3 -p gpu=99 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-12.nancy.grid5000.fr' AND resource_id='9837' AND type='default'" -p cpu=1638 -p core=8713 -p cpuset=5 -p gpu=99 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-12.nancy.grid5000.fr' AND resource_id='9838' AND type='default'" -p cpu=1638 -p core=8714 -p cpuset=7 -p gpu=99 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-12.nancy.grid5000.fr' AND resource_id='9839' AND type='default'" -p cpu=1638 -p core=8715 -p cpuset=9 -p gpu=100 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-12.nancy.grid5000.fr' AND resource_id='9840' AND type='default'" -p cpu=1638 -p core=8716 -p cpuset=11 -p gpu=100 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-12.nancy.grid5000.fr' AND resource_id='9841' AND type='default'" -p cpu=1638 -p core=8717 -p cpuset=13 -p gpu=100 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-12.nancy.grid5000.fr' AND resource_id='9842' AND type='default'" -p cpu=1638 -p core=8718 -p cpuset=15 -p gpu=100 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 echo; echo 'Setting properties for clustera-12.nancy.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-12.nancy.grid5000.fr' and type='default'" -p ip='172.16.64.12' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 HL1CBX2' -p eth_count=1 -p eth_kavlan_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='GeForce RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='NO' -p cluster_priority=201906 -p max_walltime=604800 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
+oarnodesetting --sql "host='clustera-12.nancy.grid5000.fr' and type='default'" -p ip='172.16.64.12' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 HL1CBX2' -p eth_count=1 -p eth_kavlan_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='NO' -p cluster_priority=201906 -p max_walltime=604800 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
 
 echo '================================================================================'
 
@@ -393,23 +393,23 @@ echo '==========================================================================
 ###################################
 # clustera-13.nancy.grid5000.fr
 ###################################
-oarnodesetting --sql "host='clustera-13.nancy.grid5000.fr' AND resource_id='9843' AND type='default'" -p cpu=1639 -p core=8719 -p cpuset=0 -p gpu=101 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-13.nancy.grid5000.fr' AND resource_id='9844' AND type='default'" -p cpu=1639 -p core=8720 -p cpuset=2 -p gpu=101 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-13.nancy.grid5000.fr' AND resource_id='9845' AND type='default'" -p cpu=1639 -p core=8721 -p cpuset=4 -p gpu=101 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-13.nancy.grid5000.fr' AND resource_id='9846' AND type='default'" -p cpu=1639 -p core=8722 -p cpuset=6 -p gpu=101 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-13.nancy.grid5000.fr' AND resource_id='9847' AND type='default'" -p cpu=1639 -p core=8723 -p cpuset=8 -p gpu=102 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-13.nancy.grid5000.fr' AND resource_id='9848' AND type='default'" -p cpu=1639 -p core=8724 -p cpuset=10 -p gpu=102 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-13.nancy.grid5000.fr' AND resource_id='9849' AND type='default'" -p cpu=1639 -p core=8725 -p cpuset=12 -p gpu=102 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-13.nancy.grid5000.fr' AND resource_id='9850' AND type='default'" -p cpu=1639 -p core=8726 -p cpuset=14 -p gpu=102 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-13.nancy.grid5000.fr' AND resource_id='9851' AND type='default'" -p cpu=1640 -p core=8727 -p cpuset=1 -p gpu=103 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-13.nancy.grid5000.fr' AND resource_id='9852' AND type='default'" -p cpu=1640 -p core=8728 -p cpuset=3 -p gpu=103 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-13.nancy.grid5000.fr' AND resource_id='9853' AND type='default'" -p cpu=1640 -p core=8729 -p cpuset=5 -p gpu=103 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-13.nancy.grid5000.fr' AND resource_id='9854' AND type='default'" -p cpu=1640 -p core=8730 -p cpuset=7 -p gpu=103 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-13.nancy.grid5000.fr' AND resource_id='9855' AND type='default'" -p cpu=1640 -p core=8731 -p cpuset=9 -p gpu=104 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting --sql "host='clustera-13.nancy.grid5000.fr' AND resource_id='9856' AND type='default'" -p cpu=1640 -p core=8732 -p cpuset=11 -p gpu=104 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting --sql "host='clustera-13.nancy.grid5000.fr' AND resource_id='9857' AND type='default'" -p cpu=1640 -p core=8733 -p cpuset=13 -p gpu=104 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting --sql "host='clustera-13.nancy.grid5000.fr' AND resource_id='9858' AND type='default'" -p cpu=1640 -p core=8734 -p cpuset=15 -p gpu=104 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-13.nancy.grid5000.fr' AND resource_id='9843' AND type='default'" -p cpu=1639 -p core=8719 -p cpuset=0 -p gpu=101 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-13.nancy.grid5000.fr' AND resource_id='9844' AND type='default'" -p cpu=1639 -p core=8720 -p cpuset=2 -p gpu=101 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-13.nancy.grid5000.fr' AND resource_id='9845' AND type='default'" -p cpu=1639 -p core=8721 -p cpuset=4 -p gpu=101 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-13.nancy.grid5000.fr' AND resource_id='9846' AND type='default'" -p cpu=1639 -p core=8722 -p cpuset=6 -p gpu=101 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-13.nancy.grid5000.fr' AND resource_id='9847' AND type='default'" -p cpu=1639 -p core=8723 -p cpuset=8 -p gpu=102 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-13.nancy.grid5000.fr' AND resource_id='9848' AND type='default'" -p cpu=1639 -p core=8724 -p cpuset=10 -p gpu=102 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-13.nancy.grid5000.fr' AND resource_id='9849' AND type='default'" -p cpu=1639 -p core=8725 -p cpuset=12 -p gpu=102 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-13.nancy.grid5000.fr' AND resource_id='9850' AND type='default'" -p cpu=1639 -p core=8726 -p cpuset=14 -p gpu=102 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-13.nancy.grid5000.fr' AND resource_id='9851' AND type='default'" -p cpu=1640 -p core=8727 -p cpuset=1 -p gpu=103 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-13.nancy.grid5000.fr' AND resource_id='9852' AND type='default'" -p cpu=1640 -p core=8728 -p cpuset=3 -p gpu=103 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-13.nancy.grid5000.fr' AND resource_id='9853' AND type='default'" -p cpu=1640 -p core=8729 -p cpuset=5 -p gpu=103 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-13.nancy.grid5000.fr' AND resource_id='9854' AND type='default'" -p cpu=1640 -p core=8730 -p cpuset=7 -p gpu=103 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-13.nancy.grid5000.fr' AND resource_id='9855' AND type='default'" -p cpu=1640 -p core=8731 -p cpuset=9 -p gpu=104 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-13.nancy.grid5000.fr' AND resource_id='9856' AND type='default'" -p cpu=1640 -p core=8732 -p cpuset=11 -p gpu=104 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-13.nancy.grid5000.fr' AND resource_id='9857' AND type='default'" -p cpu=1640 -p core=8733 -p cpuset=13 -p gpu=104 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-13.nancy.grid5000.fr' AND resource_id='9858' AND type='default'" -p cpu=1640 -p core=8734 -p cpuset=15 -p gpu=104 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 echo; echo 'Setting properties for clustera-13.nancy.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-13.nancy.grid5000.fr' and type='default'" -p ip='172.16.64.13' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 7K1CBX2' -p eth_count=1 -p eth_kavlan_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='GeForce RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='NO' -p cluster_priority=201906 -p max_walltime=604800 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
+oarnodesetting --sql "host='clustera-13.nancy.grid5000.fr' and type='default'" -p ip='172.16.64.13' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 7K1CBX2' -p eth_count=1 -p eth_kavlan_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='NO' -p cluster_priority=201906 -p max_walltime=604800 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
 
 echo '================================================================================'
diff --git a/spec/output/graffiti-all-gpus_table_stdout.txt b/spec/output/graffiti-all-gpus_table_stdout.txt
index 5b7e29d6409..87ec271eaaf 100644
--- a/spec/output/graffiti-all-gpus_table_stdout.txt
+++ b/spec/output/graffiti-all-gpus_table_stdout.txt
@@ -1,212 +1,212 @@
 +---------- + -------------------- + ----- + ----- + -------- + ---- + -------------------- + ------------------------------ + ------------------------------+
 |   cluster | host                 | cpu   | core  | cpuset   | gpu  | gpudevice            | cpumodel                       | gpumodel                      |
 +---------- + -------------------- + ----- + ----- + -------- + ---- + -------------------- + ------------------------------ + ------------------------------+
-|  clustera | clustera-1           | 1615  | 8527  | 0        | 53   | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 1615  | 8528  | 2        | 53   | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 1615  | 8529  | 4        | 53   | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 1615  | 8530  | 6        | 53   | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 1615  | 8531  | 8        | 54   | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 1615  | 8532  | 10       | 54   | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 1615  | 8533  | 12       | 54   | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 1615  | 8534  | 14       | 54   | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 1616  | 8535  | 1        | 55   | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 1616  | 8536  | 3        | 55   | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 1616  | 8537  | 5        | 55   | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 1616  | 8538  | 7        | 55   | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 1616  | 8539  | 9        | 56   | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 1616  | 8540  | 11       | 56   | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 1616  | 8541  | 13       | 56   | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 1616  | 8542  | 15       | 56   | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 1617  | 8543  | 0        | 57   | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 1617  | 8544  | 2        | 57   | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 1617  | 8545  | 4        | 57   | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 1617  | 8546  | 6        | 57   | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 1617  | 8547  | 8        | 58   | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 1617  | 8548  | 10       | 58   | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 1617  | 8549  | 12       | 58   | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 1617  | 8550  | 14       | 58   | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 1618  | 8551  | 1        | 59   | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 1618  | 8552  | 3        | 59   | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 1618  | 8553  | 5        | 59   | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 1618  | 8554  | 7        | 59   | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 1618  | 8555  | 9        | 60   | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 1618  | 8556  | 11       | 60   | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 1618  | 8557  | 13       | 60   | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 1618  | 8558  | 15       | 60   | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-3           | 1619  | 8559  | 0        | 61   | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-3           | 1619  | 8560  | 2        | 61   | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-3           | 1619  | 8561  | 4        | 61   | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-3           | 1619  | 8562  | 6        | 61   | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-3           | 1619  | 8563  | 8        | 62   | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-3           | 1619  | 8564  | 10       | 62   | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-3           | 1619  | 8565  | 12       | 62   | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-3           | 1619  | 8566  | 14       | 62   | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-3           | 1620  | 8567  | 1        | 63   | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-3           | 1620  | 8568  | 3        | 63   | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-3           | 1620  | 8569  | 5        | 63   | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-3           | 1620  | 8570  | 7        | 63   | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-3           | 1620  | 8571  | 9        | 64   | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-3           | 1620  | 8572  | 11       | 64   | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-3           | 1620  | 8573  | 13       | 64   | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-3           | 1620  | 8574  | 15       | 64   | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-4           | 1621  | 8575  | 0        | 65   | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-4           | 1621  | 8576  | 2        | 65   | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-4           | 1621  | 8577  | 4        | 65   | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-4           | 1621  | 8578  | 6        | 65   | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-4           | 1621  | 8579  | 8        | 66   | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-4           | 1621  | 8580  | 10       | 66   | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-4           | 1621  | 8581  | 12       | 66   | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-4           | 1621  | 8582  | 14       | 66   | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-4           | 1622  | 8583  | 1        | 67   | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-4           | 1622  | 8584  | 3        | 67   | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-4           | 1622  | 8585  | 5        | 67   | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-4           | 1622  | 8586  | 7        | 67   | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-4           | 1622  | 8587  | 9        | 68   | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-4           | 1622  | 8588  | 11       | 68   | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-4           | 1622  | 8589  | 13       | 68   | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-4           | 1622  | 8590  | 15       | 68   | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-5           | 1623  | 8591  | 0        | 69   | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-5           | 1623  | 8592  | 2        | 69   | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-5           | 1623  | 8593  | 4        | 69   | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-5           | 1623  | 8594  | 6        | 69   | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-5           | 1623  | 8595  | 8        | 70   | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-5           | 1623  | 8596  | 10       | 70   | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-5           | 1623  | 8597  | 12       | 70   | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-5           | 1623  | 8598  | 14       | 70   | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-5           | 1624  | 8599  | 1        | 71   | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-5           | 1624  | 8600  | 3        | 71   | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-5           | 1624  | 8601  | 5        | 71   | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-5           | 1624  | 8602  | 7        | 71   | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-5           | 1624  | 8603  | 9        | 72   | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-5           | 1624  | 8604  | 11       | 72   | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-5           | 1624  | 8605  | 13       | 72   | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-5           | 1624  | 8606  | 15       | 72   | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-6           | 1625  | 8607  | 0        | 73   | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-6           | 1625  | 8608  | 2        | 73   | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-6           | 1625  | 8609  | 4        | 73   | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-6           | 1625  | 8610  | 6        | 73   | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-6           | 1625  | 8611  | 8        | 74   | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-6           | 1625  | 8612  | 10       | 74   | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-6           | 1625  | 8613  | 12       | 74   | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-6           | 1625  | 8614  | 14       | 74   | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-6           | 1626  | 8615  | 1        | 75   | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-6           | 1626  | 8616  | 3        | 75   | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-6           | 1626  | 8617  | 5        | 75   | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-6           | 1626  | 8618  | 7        | 75   | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-6           | 1626  | 8619  | 9        | 76   | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-6           | 1626  | 8620  | 11       | 76   | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-6           | 1626  | 8621  | 13       | 76   | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-6           | 1626  | 8622  | 15       | 76   | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-7           | 1627  | 8623  | 0        | 77   | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-7           | 1627  | 8624  | 2        | 77   | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-7           | 1627  | 8625  | 4        | 77   | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-7           | 1627  | 8626  | 6        | 77   | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-7           | 1627  | 8627  | 8        | 78   | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-7           | 1627  | 8628  | 10       | 78   | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-7           | 1627  | 8629  | 12       | 78   | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-7           | 1627  | 8630  | 14       | 78   | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-7           | 1628  | 8631  | 1        | 79   | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-7           | 1628  | 8632  | 3        | 79   | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-7           | 1628  | 8633  | 5        | 79   | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-7           | 1628  | 8634  | 7        | 79   | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-7           | 1628  | 8635  | 9        | 80   | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-7           | 1628  | 8636  | 11       | 80   | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-7           | 1628  | 8637  | 13       | 80   | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-7           | 1628  | 8638  | 15       | 80   | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-8           | 1629  | 8639  | 0        | 81   | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-8           | 1629  | 8640  | 2        | 81   | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-8           | 1629  | 8641  | 4        | 81   | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-8           | 1629  | 8642  | 6        | 81   | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-8           | 1629  | 8643  | 8        | 82   | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-8           | 1629  | 8644  | 10       | 82   | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-8           | 1629  | 8645  | 12       | 82   | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-8           | 1629  | 8646  | 14       | 82   | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-8           | 1630  | 8647  | 1        | 83   | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-8           | 1630  | 8648  | 3        | 83   | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-8           | 1630  | 8649  | 5        | 83   | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-8           | 1630  | 8650  | 7        | 83   | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-8           | 1630  | 8651  | 9        | 84   | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-8           | 1630  | 8652  | 11       | 84   | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-8           | 1630  | 8653  | 13       | 84   | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-8           | 1630  | 8654  | 15       | 84   | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-9           | 1631  | 8655  | 0        | 85   | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-9           | 1631  | 8656  | 2        | 85   | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-9           | 1631  | 8657  | 4        | 85   | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-9           | 1631  | 8658  | 6        | 85   | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-9           | 1631  | 8659  | 8        | 86   | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-9           | 1631  | 8660  | 10       | 86   | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-9           | 1631  | 8661  | 12       | 86   | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-9           | 1631  | 8662  | 14       | 86   | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-9           | 1632  | 8663  | 1        | 87   | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-9           | 1632  | 8664  | 3        | 87   | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-9           | 1632  | 8665  | 5        | 87   | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-9           | 1632  | 8666  | 7        | 87   | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-9           | 1632  | 8667  | 9        | 88   | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-9           | 1632  | 8668  | 11       | 88   | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-9           | 1632  | 8669  | 13       | 88   | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-9           | 1632  | 8670  | 15       | 88   | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-10          | 1633  | 8671  | 0        | 89   | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-10          | 1633  | 8672  | 2        | 89   | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-10          | 1633  | 8673  | 4        | 89   | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-10          | 1633  | 8674  | 6        | 89   | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-10          | 1633  | 8675  | 8        | 90   | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-10          | 1633  | 8676  | 10       | 90   | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-10          | 1633  | 8677  | 12       | 90   | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-10          | 1633  | 8678  | 14       | 90   | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-10          | 1634  | 8679  | 1        | 91   | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-10          | 1634  | 8680  | 3        | 91   | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-10          | 1634  | 8681  | 5        | 91   | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-10          | 1634  | 8682  | 7        | 91   | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-10          | 1634  | 8683  | 9        | 92   | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-10          | 1634  | 8684  | 11       | 92   | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-10          | 1634  | 8685  | 13       | 92   | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-10          | 1634  | 8686  | 15       | 92   | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-11          | 1635  | 8687  | 0        | 93   | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-11          | 1635  | 8688  | 2        | 93   | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-11          | 1635  | 8689  | 4        | 93   | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-11          | 1635  | 8690  | 6        | 93   | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-11          | 1635  | 8691  | 8        | 94   | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-11          | 1635  | 8692  | 10       | 94   | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-11          | 1635  | 8693  | 12       | 94   | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-11          | 1635  | 8694  | 14       | 94   | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-11          | 1636  | 8695  | 1        | 95   | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-11          | 1636  | 8696  | 3        | 95   | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-11          | 1636  | 8697  | 5        | 95   | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-11          | 1636  | 8698  | 7        | 95   | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-11          | 1636  | 8699  | 9        | 96   | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-11          | 1636  | 8700  | 11       | 96   | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-11          | 1636  | 8701  | 13       | 96   | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-11          | 1636  | 8702  | 15       | 96   | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-12          | 1637  | 8703  | 0        | 97   | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-12          | 1637  | 8704  | 2        | 97   | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-12          | 1637  | 8705  | 4        | 97   | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-12          | 1637  | 8706  | 6        | 97   | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-12          | 1637  | 8707  | 8        | 98   | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-12          | 1637  | 8708  | 10       | 98   | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-12          | 1637  | 8709  | 12       | 98   | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-12          | 1637  | 8710  | 14       | 98   | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-12          | 1638  | 8711  | 1        | 99   | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-12          | 1638  | 8712  | 3        | 99   | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-12          | 1638  | 8713  | 5        | 99   | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-12          | 1638  | 8714  | 7        | 99   | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-12          | 1638  | 8715  | 9        | 100  | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-12          | 1638  | 8716  | 11       | 100  | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-12          | 1638  | 8717  | 13       | 100  | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-12          | 1638  | 8718  | 15       | 100  | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-13          | 1639  | 8719  | 0        | 101  | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-13          | 1639  | 8720  | 2        | 101  | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-13          | 1639  | 8721  | 4        | 101  | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-13          | 1639  | 8722  | 6        | 101  | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-13          | 1639  | 8723  | 8        | 102  | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-13          | 1639  | 8724  | 10       | 102  | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-13          | 1639  | 8725  | 12       | 102  | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-13          | 1639  | 8726  | 14       | 102  | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-13          | 1640  | 8727  | 1        | 103  | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-13          | 1640  | 8728  | 3        | 103  | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-13          | 1640  | 8729  | 5        | 103  | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-13          | 1640  | 8730  | 7        | 103  | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-13          | 1640  | 8731  | 9        | 104  | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-13          | 1640  | 8732  | 11       | 104  | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-13          | 1640  | 8733  | 13       | 104  | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-13          | 1640  | 8734  | 15       | 104  | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
+|  clustera | clustera-1           | 1615  | 8527  | 0        | 53   | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 1615  | 8528  | 2        | 53   | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 1615  | 8529  | 4        | 53   | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 1615  | 8530  | 6        | 53   | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 1615  | 8531  | 8        | 54   | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 1615  | 8532  | 10       | 54   | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 1615  | 8533  | 12       | 54   | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 1615  | 8534  | 14       | 54   | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 1616  | 8535  | 1        | 55   | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 1616  | 8536  | 3        | 55   | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 1616  | 8537  | 5        | 55   | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 1616  | 8538  | 7        | 55   | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 1616  | 8539  | 9        | 56   | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 1616  | 8540  | 11       | 56   | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 1616  | 8541  | 13       | 56   | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 1616  | 8542  | 15       | 56   | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 1617  | 8543  | 0        | 57   | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 1617  | 8544  | 2        | 57   | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 1617  | 8545  | 4        | 57   | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 1617  | 8546  | 6        | 57   | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 1617  | 8547  | 8        | 58   | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 1617  | 8548  | 10       | 58   | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 1617  | 8549  | 12       | 58   | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 1617  | 8550  | 14       | 58   | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 1618  | 8551  | 1        | 59   | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 1618  | 8552  | 3        | 59   | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 1618  | 8553  | 5        | 59   | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 1618  | 8554  | 7        | 59   | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 1618  | 8555  | 9        | 60   | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 1618  | 8556  | 11       | 60   | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 1618  | 8557  | 13       | 60   | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 1618  | 8558  | 15       | 60   | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-3           | 1619  | 8559  | 0        | 61   | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-3           | 1619  | 8560  | 2        | 61   | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-3           | 1619  | 8561  | 4        | 61   | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-3           | 1619  | 8562  | 6        | 61   | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-3           | 1619  | 8563  | 8        | 62   | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-3           | 1619  | 8564  | 10       | 62   | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-3           | 1619  | 8565  | 12       | 62   | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-3           | 1619  | 8566  | 14       | 62   | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-3           | 1620  | 8567  | 1        | 63   | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-3           | 1620  | 8568  | 3        | 63   | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-3           | 1620  | 8569  | 5        | 63   | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-3           | 1620  | 8570  | 7        | 63   | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-3           | 1620  | 8571  | 9        | 64   | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-3           | 1620  | 8572  | 11       | 64   | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-3           | 1620  | 8573  | 13       | 64   | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-3           | 1620  | 8574  | 15       | 64   | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-4           | 1621  | 8575  | 0        | 65   | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-4           | 1621  | 8576  | 2        | 65   | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-4           | 1621  | 8577  | 4        | 65   | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-4           | 1621  | 8578  | 6        | 65   | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-4           | 1621  | 8579  | 8        | 66   | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-4           | 1621  | 8580  | 10       | 66   | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-4           | 1621  | 8581  | 12       | 66   | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-4           | 1621  | 8582  | 14       | 66   | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-4           | 1622  | 8583  | 1        | 67   | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-4           | 1622  | 8584  | 3        | 67   | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-4           | 1622  | 8585  | 5        | 67   | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-4           | 1622  | 8586  | 7        | 67   | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-4           | 1622  | 8587  | 9        | 68   | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-4           | 1622  | 8588  | 11       | 68   | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-4           | 1622  | 8589  | 13       | 68   | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-4           | 1622  | 8590  | 15       | 68   | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-5           | 1623  | 8591  | 0        | 69   | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-5           | 1623  | 8592  | 2        | 69   | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-5           | 1623  | 8593  | 4        | 69   | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-5           | 1623  | 8594  | 6        | 69   | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-5           | 1623  | 8595  | 8        | 70   | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-5           | 1623  | 8596  | 10       | 70   | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-5           | 1623  | 8597  | 12       | 70   | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-5           | 1623  | 8598  | 14       | 70   | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-5           | 1624  | 8599  | 1        | 71   | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-5           | 1624  | 8600  | 3        | 71   | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-5           | 1624  | 8601  | 5        | 71   | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-5           | 1624  | 8602  | 7        | 71   | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-5           | 1624  | 8603  | 9        | 72   | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-5           | 1624  | 8604  | 11       | 72   | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-5           | 1624  | 8605  | 13       | 72   | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-5           | 1624  | 8606  | 15       | 72   | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-6           | 1625  | 8607  | 0        | 73   | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-6           | 1625  | 8608  | 2        | 73   | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-6           | 1625  | 8609  | 4        | 73   | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-6           | 1625  | 8610  | 6        | 73   | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-6           | 1625  | 8611  | 8        | 74   | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-6           | 1625  | 8612  | 10       | 74   | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-6           | 1625  | 8613  | 12       | 74   | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-6           | 1625  | 8614  | 14       | 74   | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-6           | 1626  | 8615  | 1        | 75   | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-6           | 1626  | 8616  | 3        | 75   | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-6           | 1626  | 8617  | 5        | 75   | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-6           | 1626  | 8618  | 7        | 75   | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-6           | 1626  | 8619  | 9        | 76   | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-6           | 1626  | 8620  | 11       | 76   | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-6           | 1626  | 8621  | 13       | 76   | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-6           | 1626  | 8622  | 15       | 76   | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-7           | 1627  | 8623  | 0        | 77   | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-7           | 1627  | 8624  | 2        | 77   | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-7           | 1627  | 8625  | 4        | 77   | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-7           | 1627  | 8626  | 6        | 77   | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-7           | 1627  | 8627  | 8        | 78   | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-7           | 1627  | 8628  | 10       | 78   | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-7           | 1627  | 8629  | 12       | 78   | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-7           | 1627  | 8630  | 14       | 78   | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-7           | 1628  | 8631  | 1        | 79   | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-7           | 1628  | 8632  | 3        | 79   | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-7           | 1628  | 8633  | 5        | 79   | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-7           | 1628  | 8634  | 7        | 79   | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-7           | 1628  | 8635  | 9        | 80   | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-7           | 1628  | 8636  | 11       | 80   | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-7           | 1628  | 8637  | 13       | 80   | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-7           | 1628  | 8638  | 15       | 80   | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-8           | 1629  | 8639  | 0        | 81   | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-8           | 1629  | 8640  | 2        | 81   | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-8           | 1629  | 8641  | 4        | 81   | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-8           | 1629  | 8642  | 6        | 81   | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-8           | 1629  | 8643  | 8        | 82   | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-8           | 1629  | 8644  | 10       | 82   | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-8           | 1629  | 8645  | 12       | 82   | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-8           | 1629  | 8646  | 14       | 82   | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-8           | 1630  | 8647  | 1        | 83   | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-8           | 1630  | 8648  | 3        | 83   | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-8           | 1630  | 8649  | 5        | 83   | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-8           | 1630  | 8650  | 7        | 83   | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-8           | 1630  | 8651  | 9        | 84   | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-8           | 1630  | 8652  | 11       | 84   | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-8           | 1630  | 8653  | 13       | 84   | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-8           | 1630  | 8654  | 15       | 84   | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-9           | 1631  | 8655  | 0        | 85   | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-9           | 1631  | 8656  | 2        | 85   | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-9           | 1631  | 8657  | 4        | 85   | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-9           | 1631  | 8658  | 6        | 85   | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-9           | 1631  | 8659  | 8        | 86   | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-9           | 1631  | 8660  | 10       | 86   | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-9           | 1631  | 8661  | 12       | 86   | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-9           | 1631  | 8662  | 14       | 86   | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-9           | 1632  | 8663  | 1        | 87   | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-9           | 1632  | 8664  | 3        | 87   | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-9           | 1632  | 8665  | 5        | 87   | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-9           | 1632  | 8666  | 7        | 87   | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-9           | 1632  | 8667  | 9        | 88   | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-9           | 1632  | 8668  | 11       | 88   | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-9           | 1632  | 8669  | 13       | 88   | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-9           | 1632  | 8670  | 15       | 88   | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-10          | 1633  | 8671  | 0        | 89   | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-10          | 1633  | 8672  | 2        | 89   | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-10          | 1633  | 8673  | 4        | 89   | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-10          | 1633  | 8674  | 6        | 89   | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-10          | 1633  | 8675  | 8        | 90   | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-10          | 1633  | 8676  | 10       | 90   | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-10          | 1633  | 8677  | 12       | 90   | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-10          | 1633  | 8678  | 14       | 90   | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-10          | 1634  | 8679  | 1        | 91   | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-10          | 1634  | 8680  | 3        | 91   | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-10          | 1634  | 8681  | 5        | 91   | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-10          | 1634  | 8682  | 7        | 91   | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-10          | 1634  | 8683  | 9        | 92   | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-10          | 1634  | 8684  | 11       | 92   | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-10          | 1634  | 8685  | 13       | 92   | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-10          | 1634  | 8686  | 15       | 92   | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-11          | 1635  | 8687  | 0        | 93   | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-11          | 1635  | 8688  | 2        | 93   | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-11          | 1635  | 8689  | 4        | 93   | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-11          | 1635  | 8690  | 6        | 93   | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-11          | 1635  | 8691  | 8        | 94   | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-11          | 1635  | 8692  | 10       | 94   | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-11          | 1635  | 8693  | 12       | 94   | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-11          | 1635  | 8694  | 14       | 94   | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-11          | 1636  | 8695  | 1        | 95   | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-11          | 1636  | 8696  | 3        | 95   | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-11          | 1636  | 8697  | 5        | 95   | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-11          | 1636  | 8698  | 7        | 95   | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-11          | 1636  | 8699  | 9        | 96   | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-11          | 1636  | 8700  | 11       | 96   | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-11          | 1636  | 8701  | 13       | 96   | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-11          | 1636  | 8702  | 15       | 96   | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-12          | 1637  | 8703  | 0        | 97   | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-12          | 1637  | 8704  | 2        | 97   | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-12          | 1637  | 8705  | 4        | 97   | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-12          | 1637  | 8706  | 6        | 97   | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-12          | 1637  | 8707  | 8        | 98   | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-12          | 1637  | 8708  | 10       | 98   | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-12          | 1637  | 8709  | 12       | 98   | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-12          | 1637  | 8710  | 14       | 98   | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-12          | 1638  | 8711  | 1        | 99   | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-12          | 1638  | 8712  | 3        | 99   | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-12          | 1638  | 8713  | 5        | 99   | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-12          | 1638  | 8714  | 7        | 99   | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-12          | 1638  | 8715  | 9        | 100  | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-12          | 1638  | 8716  | 11       | 100  | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-12          | 1638  | 8717  | 13       | 100  | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-12          | 1638  | 8718  | 15       | 100  | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-13          | 1639  | 8719  | 0        | 101  | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-13          | 1639  | 8720  | 2        | 101  | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-13          | 1639  | 8721  | 4        | 101  | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-13          | 1639  | 8722  | 6        | 101  | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-13          | 1639  | 8723  | 8        | 102  | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-13          | 1639  | 8724  | 10       | 102  | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-13          | 1639  | 8725  | 12       | 102  | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-13          | 1639  | 8726  | 14       | 102  | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-13          | 1640  | 8727  | 1        | 103  | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-13          | 1640  | 8728  | 3        | 103  | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-13          | 1640  | 8729  | 5        | 103  | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-13          | 1640  | 8730  | 7        | 103  | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-13          | 1640  | 8731  | 9        | 104  | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-13          | 1640  | 8732  | 11       | 104  | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-13          | 1640  | 8733  | 13       | 104  | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-13          | 1640  | 8734  | 15       | 104  | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
 +---------- + -------------------- + ----- + ----- + -------- + ---- + -------------------- + ------------------------------ + ------------------------------+
diff --git a/spec/output/graffiti-gpu-removed-OAR-updated-gpu-re-added-OAR-updated_diff_stdout.txt b/spec/output/graffiti-gpu-removed-OAR-updated-gpu-re-added-OAR-updated_diff_stdout.txt
index 5fac025605b..7ae661fae5d 100644
--- a/spec/output/graffiti-gpu-removed-OAR-updated-gpu-re-added-OAR-updated_diff_stdout.txt
+++ b/spec/output/graffiti-gpu-removed-OAR-updated-gpu-re-added-OAR-updated_diff_stdout.txt
@@ -1,6 +1,6 @@
 Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for added, ['~', 'key', 'old value', 'new value'] for changed
   clustera-1:
-    ["~", "gpu_model", "RTX 2080 Ti", "GeForce RTX 2080 Ti"]
+    ["~", "gpu_model", "RTX 2080 Ti", "NVIDIA GeForce RTX 2080 Ti"]
     ["~", "wattmeter", "MULTIPLE", "NO"]
     ["+", "core_count", 16]
     ["+", "cpu_count", 2]
diff --git a/spec/output/graffiti-gpu-removed-OAR-updated-gpu-re-added-OAR-updated_print_stdout.txt b/spec/output/graffiti-gpu-removed-OAR-updated-gpu-re-added-OAR-updated_print_stdout.txt
index 2434d82fc33..5832b0a9fa5 100644
--- a/spec/output/graffiti-gpu-removed-OAR-updated-gpu-re-added-OAR-updated_print_stdout.txt
+++ b/spec/output/graffiti-gpu-removed-OAR-updated-gpu-re-added-OAR-updated_print_stdout.txt
@@ -93,24 +93,24 @@ property_exist 'disk_reservation_count' || oarproperty -a disk_reservation_count
 ###################################
 # clustera-1.nancy.grid5000.fr
 ###################################
-oarnodesetting --sql "host='clustera-1.nancy.grid5000.fr' AND resource_id='9651' AND type='default'" -p cpu=1615 -p core=8527 -p cpuset=0 -p gpu=53 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-1.nancy.grid5000.fr' AND resource_id='9652' AND type='default'" -p cpu=1615 -p core=8528 -p cpuset=2 -p gpu=53 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-1.nancy.grid5000.fr' AND resource_id='9653' AND type='default'" -p cpu=1615 -p core=8529 -p cpuset=4 -p gpu=53 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-1.nancy.grid5000.fr' AND resource_id='9654' AND type='default'" -p cpu=1615 -p core=8530 -p cpuset=6 -p gpu=53 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-1.nancy.grid5000.fr' AND resource_id='9655' AND type='default'" -p cpu=1615 -p core=8531 -p cpuset=8 -p gpu=54 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-1.nancy.grid5000.fr' AND resource_id='9656' AND type='default'" -p cpu=1615 -p core=8532 -p cpuset=10 -p gpu=54 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-1.nancy.grid5000.fr' AND resource_id='9657' AND type='default'" -p cpu=1615 -p core=8533 -p cpuset=12 -p gpu=54 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-1.nancy.grid5000.fr' AND resource_id='9658' AND type='default'" -p cpu=1615 -p core=8534 -p cpuset=14 -p gpu=54 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-1.nancy.grid5000.fr' AND resource_id='9659' AND type='default'" -p cpu=1616 -p core=8535 -p cpuset=1 -p gpu=55 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-1.nancy.grid5000.fr' AND resource_id='9660' AND type='default'" -p cpu=1616 -p core=8536 -p cpuset=3 -p gpu=55 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-1.nancy.grid5000.fr' AND resource_id='9661' AND type='default'" -p cpu=1616 -p core=8537 -p cpuset=5 -p gpu=55 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-1.nancy.grid5000.fr' AND resource_id='9662' AND type='default'" -p cpu=1616 -p core=8538 -p cpuset=7 -p gpu=55 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-1.nancy.grid5000.fr' AND resource_id='9663' AND type='default'" -p cpu=1616 -p core=8539 -p cpuset=9 -p gpu=56 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting --sql "host='clustera-1.nancy.grid5000.fr' AND resource_id='9664' AND type='default'" -p cpu=1616 -p core=8540 -p cpuset=11 -p gpu=56 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting --sql "host='clustera-1.nancy.grid5000.fr' AND resource_id='9665' AND type='default'" -p cpu=1616 -p core=8541 -p cpuset=13 -p gpu=56 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting --sql "host='clustera-1.nancy.grid5000.fr' AND resource_id='9666' AND type='default'" -p cpu=1616 -p core=8542 -p cpuset=15 -p gpu=56 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-1.nancy.grid5000.fr' AND resource_id='9651' AND type='default'" -p cpu=1615 -p core=8527 -p cpuset=0 -p gpu=53 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-1.nancy.grid5000.fr' AND resource_id='9652' AND type='default'" -p cpu=1615 -p core=8528 -p cpuset=2 -p gpu=53 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-1.nancy.grid5000.fr' AND resource_id='9653' AND type='default'" -p cpu=1615 -p core=8529 -p cpuset=4 -p gpu=53 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-1.nancy.grid5000.fr' AND resource_id='9654' AND type='default'" -p cpu=1615 -p core=8530 -p cpuset=6 -p gpu=53 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-1.nancy.grid5000.fr' AND resource_id='9655' AND type='default'" -p cpu=1615 -p core=8531 -p cpuset=8 -p gpu=54 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-1.nancy.grid5000.fr' AND resource_id='9656' AND type='default'" -p cpu=1615 -p core=8532 -p cpuset=10 -p gpu=54 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-1.nancy.grid5000.fr' AND resource_id='9657' AND type='default'" -p cpu=1615 -p core=8533 -p cpuset=12 -p gpu=54 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-1.nancy.grid5000.fr' AND resource_id='9658' AND type='default'" -p cpu=1615 -p core=8534 -p cpuset=14 -p gpu=54 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-1.nancy.grid5000.fr' AND resource_id='9659' AND type='default'" -p cpu=1616 -p core=8535 -p cpuset=1 -p gpu=55 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-1.nancy.grid5000.fr' AND resource_id='9660' AND type='default'" -p cpu=1616 -p core=8536 -p cpuset=3 -p gpu=55 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-1.nancy.grid5000.fr' AND resource_id='9661' AND type='default'" -p cpu=1616 -p core=8537 -p cpuset=5 -p gpu=55 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-1.nancy.grid5000.fr' AND resource_id='9662' AND type='default'" -p cpu=1616 -p core=8538 -p cpuset=7 -p gpu=55 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-1.nancy.grid5000.fr' AND resource_id='9663' AND type='default'" -p cpu=1616 -p core=8539 -p cpuset=9 -p gpu=56 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-1.nancy.grid5000.fr' AND resource_id='9664' AND type='default'" -p cpu=1616 -p core=8540 -p cpuset=11 -p gpu=56 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-1.nancy.grid5000.fr' AND resource_id='9665' AND type='default'" -p cpu=1616 -p core=8541 -p cpuset=13 -p gpu=56 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-1.nancy.grid5000.fr' AND resource_id='9666' AND type='default'" -p cpu=1616 -p core=8542 -p cpuset=15 -p gpu=56 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 echo; echo 'Setting properties for clustera-1.nancy.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-1.nancy.grid5000.fr' and type='default'" -p ip='172.16.64.1' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 FL1CBX2' -p eth_count=1 -p eth_kavlan_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='GeForce RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='NO' -p cluster_priority=201906 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
+oarnodesetting --sql "host='clustera-1.nancy.grid5000.fr' and type='default'" -p ip='172.16.64.1' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 FL1CBX2' -p eth_count=1 -p eth_kavlan_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='NO' -p cluster_priority=201906 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
 
 echo '================================================================================'
 
@@ -118,24 +118,24 @@ echo '==========================================================================
 ###################################
 # clustera-2.nancy.grid5000.fr
 ###################################
-oarnodesetting --sql "host='clustera-2.nancy.grid5000.fr' AND resource_id='9667' AND type='default'" -p cpu=1617 -p core=8543 -p cpuset=0 -p gpu=57 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-2.nancy.grid5000.fr' AND resource_id='9668' AND type='default'" -p cpu=1617 -p core=8544 -p cpuset=2 -p gpu=57 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-2.nancy.grid5000.fr' AND resource_id='9669' AND type='default'" -p cpu=1617 -p core=8545 -p cpuset=4 -p gpu=57 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-2.nancy.grid5000.fr' AND resource_id='9670' AND type='default'" -p cpu=1617 -p core=8546 -p cpuset=6 -p gpu=57 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-2.nancy.grid5000.fr' AND resource_id='9671' AND type='default'" -p cpu=1617 -p core=8547 -p cpuset=8 -p gpu=58 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-2.nancy.grid5000.fr' AND resource_id='9672' AND type='default'" -p cpu=1617 -p core=8548 -p cpuset=10 -p gpu=58 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-2.nancy.grid5000.fr' AND resource_id='9673' AND type='default'" -p cpu=1617 -p core=8549 -p cpuset=12 -p gpu=58 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-2.nancy.grid5000.fr' AND resource_id='9674' AND type='default'" -p cpu=1617 -p core=8550 -p cpuset=14 -p gpu=58 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-2.nancy.grid5000.fr' AND resource_id='9675' AND type='default'" -p cpu=1618 -p core=8551 -p cpuset=1 -p gpu=59 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-2.nancy.grid5000.fr' AND resource_id='9676' AND type='default'" -p cpu=1618 -p core=8552 -p cpuset=3 -p gpu=59 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-2.nancy.grid5000.fr' AND resource_id='9677' AND type='default'" -p cpu=1618 -p core=8553 -p cpuset=5 -p gpu=59 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-2.nancy.grid5000.fr' AND resource_id='9678' AND type='default'" -p cpu=1618 -p core=8554 -p cpuset=7 -p gpu=59 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-2.nancy.grid5000.fr' AND resource_id='9679' AND type='default'" -p cpu=1618 -p core=8555 -p cpuset=9 -p gpu=60 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting --sql "host='clustera-2.nancy.grid5000.fr' AND resource_id='9680' AND type='default'" -p cpu=1618 -p core=8556 -p cpuset=11 -p gpu=60 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting --sql "host='clustera-2.nancy.grid5000.fr' AND resource_id='9681' AND type='default'" -p cpu=1618 -p core=8557 -p cpuset=13 -p gpu=60 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting --sql "host='clustera-2.nancy.grid5000.fr' AND resource_id='9682' AND type='default'" -p cpu=1618 -p core=8558 -p cpuset=15 -p gpu=60 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-2.nancy.grid5000.fr' AND resource_id='9667' AND type='default'" -p cpu=1617 -p core=8543 -p cpuset=0 -p gpu=57 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-2.nancy.grid5000.fr' AND resource_id='9668' AND type='default'" -p cpu=1617 -p core=8544 -p cpuset=2 -p gpu=57 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-2.nancy.grid5000.fr' AND resource_id='9669' AND type='default'" -p cpu=1617 -p core=8545 -p cpuset=4 -p gpu=57 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-2.nancy.grid5000.fr' AND resource_id='9670' AND type='default'" -p cpu=1617 -p core=8546 -p cpuset=6 -p gpu=57 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-2.nancy.grid5000.fr' AND resource_id='9671' AND type='default'" -p cpu=1617 -p core=8547 -p cpuset=8 -p gpu=58 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-2.nancy.grid5000.fr' AND resource_id='9672' AND type='default'" -p cpu=1617 -p core=8548 -p cpuset=10 -p gpu=58 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-2.nancy.grid5000.fr' AND resource_id='9673' AND type='default'" -p cpu=1617 -p core=8549 -p cpuset=12 -p gpu=58 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-2.nancy.grid5000.fr' AND resource_id='9674' AND type='default'" -p cpu=1617 -p core=8550 -p cpuset=14 -p gpu=58 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-2.nancy.grid5000.fr' AND resource_id='9675' AND type='default'" -p cpu=1618 -p core=8551 -p cpuset=1 -p gpu=59 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-2.nancy.grid5000.fr' AND resource_id='9676' AND type='default'" -p cpu=1618 -p core=8552 -p cpuset=3 -p gpu=59 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-2.nancy.grid5000.fr' AND resource_id='9677' AND type='default'" -p cpu=1618 -p core=8553 -p cpuset=5 -p gpu=59 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-2.nancy.grid5000.fr' AND resource_id='9678' AND type='default'" -p cpu=1618 -p core=8554 -p cpuset=7 -p gpu=59 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-2.nancy.grid5000.fr' AND resource_id='9679' AND type='default'" -p cpu=1618 -p core=8555 -p cpuset=9 -p gpu=60 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-2.nancy.grid5000.fr' AND resource_id='9680' AND type='default'" -p cpu=1618 -p core=8556 -p cpuset=11 -p gpu=60 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-2.nancy.grid5000.fr' AND resource_id='9681' AND type='default'" -p cpu=1618 -p core=8557 -p cpuset=13 -p gpu=60 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-2.nancy.grid5000.fr' AND resource_id='9682' AND type='default'" -p cpu=1618 -p core=8558 -p cpuset=15 -p gpu=60 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 echo; echo 'Setting properties for clustera-2.nancy.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-2.nancy.grid5000.fr' and type='default'" -p ip='172.16.64.2' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 9L1CBX2' -p eth_count=1 -p eth_kavlan_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='GeForce RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='NO' -p cluster_priority=201906 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
+oarnodesetting --sql "host='clustera-2.nancy.grid5000.fr' and type='default'" -p ip='172.16.64.2' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 9L1CBX2' -p eth_count=1 -p eth_kavlan_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='NO' -p cluster_priority=201906 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
 
 echo '================================================================================'
 
@@ -143,24 +143,24 @@ echo '==========================================================================
 ###################################
 # clustera-3.nancy.grid5000.fr
 ###################################
-oarnodesetting --sql "host='clustera-3.nancy.grid5000.fr' AND resource_id='9683' AND type='default'" -p cpu=1619 -p core=8559 -p cpuset=0 -p gpu=61 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-3.nancy.grid5000.fr' AND resource_id='9684' AND type='default'" -p cpu=1619 -p core=8560 -p cpuset=2 -p gpu=61 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-3.nancy.grid5000.fr' AND resource_id='9685' AND type='default'" -p cpu=1619 -p core=8561 -p cpuset=4 -p gpu=61 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-3.nancy.grid5000.fr' AND resource_id='9686' AND type='default'" -p cpu=1619 -p core=8562 -p cpuset=6 -p gpu=61 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-3.nancy.grid5000.fr' AND resource_id='9687' AND type='default'" -p cpu=1619 -p core=8563 -p cpuset=8 -p gpu=62 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-3.nancy.grid5000.fr' AND resource_id='9688' AND type='default'" -p cpu=1619 -p core=8564 -p cpuset=10 -p gpu=62 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-3.nancy.grid5000.fr' AND resource_id='9689' AND type='default'" -p cpu=1619 -p core=8565 -p cpuset=12 -p gpu=62 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-3.nancy.grid5000.fr' AND resource_id='9690' AND type='default'" -p cpu=1619 -p core=8566 -p cpuset=14 -p gpu=62 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-3.nancy.grid5000.fr' AND resource_id='9691' AND type='default'" -p cpu=1620 -p core=8567 -p cpuset=1 -p gpu=63 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-3.nancy.grid5000.fr' AND resource_id='9692' AND type='default'" -p cpu=1620 -p core=8568 -p cpuset=3 -p gpu=63 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-3.nancy.grid5000.fr' AND resource_id='9693' AND type='default'" -p cpu=1620 -p core=8569 -p cpuset=5 -p gpu=63 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-3.nancy.grid5000.fr' AND resource_id='9694' AND type='default'" -p cpu=1620 -p core=8570 -p cpuset=7 -p gpu=63 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-3.nancy.grid5000.fr' AND resource_id='9695' AND type='default'" -p cpu=1620 -p core=8571 -p cpuset=9 -p gpu=64 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting --sql "host='clustera-3.nancy.grid5000.fr' AND resource_id='9696' AND type='default'" -p cpu=1620 -p core=8572 -p cpuset=11 -p gpu=64 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting --sql "host='clustera-3.nancy.grid5000.fr' AND resource_id='9697' AND type='default'" -p cpu=1620 -p core=8573 -p cpuset=13 -p gpu=64 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting --sql "host='clustera-3.nancy.grid5000.fr' AND resource_id='9698' AND type='default'" -p cpu=1620 -p core=8574 -p cpuset=15 -p gpu=64 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-3.nancy.grid5000.fr' AND resource_id='9683' AND type='default'" -p cpu=1619 -p core=8559 -p cpuset=0 -p gpu=61 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-3.nancy.grid5000.fr' AND resource_id='9684' AND type='default'" -p cpu=1619 -p core=8560 -p cpuset=2 -p gpu=61 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-3.nancy.grid5000.fr' AND resource_id='9685' AND type='default'" -p cpu=1619 -p core=8561 -p cpuset=4 -p gpu=61 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-3.nancy.grid5000.fr' AND resource_id='9686' AND type='default'" -p cpu=1619 -p core=8562 -p cpuset=6 -p gpu=61 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-3.nancy.grid5000.fr' AND resource_id='9687' AND type='default'" -p cpu=1619 -p core=8563 -p cpuset=8 -p gpu=62 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-3.nancy.grid5000.fr' AND resource_id='9688' AND type='default'" -p cpu=1619 -p core=8564 -p cpuset=10 -p gpu=62 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-3.nancy.grid5000.fr' AND resource_id='9689' AND type='default'" -p cpu=1619 -p core=8565 -p cpuset=12 -p gpu=62 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-3.nancy.grid5000.fr' AND resource_id='9690' AND type='default'" -p cpu=1619 -p core=8566 -p cpuset=14 -p gpu=62 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-3.nancy.grid5000.fr' AND resource_id='9691' AND type='default'" -p cpu=1620 -p core=8567 -p cpuset=1 -p gpu=63 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-3.nancy.grid5000.fr' AND resource_id='9692' AND type='default'" -p cpu=1620 -p core=8568 -p cpuset=3 -p gpu=63 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-3.nancy.grid5000.fr' AND resource_id='9693' AND type='default'" -p cpu=1620 -p core=8569 -p cpuset=5 -p gpu=63 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-3.nancy.grid5000.fr' AND resource_id='9694' AND type='default'" -p cpu=1620 -p core=8570 -p cpuset=7 -p gpu=63 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-3.nancy.grid5000.fr' AND resource_id='9695' AND type='default'" -p cpu=1620 -p core=8571 -p cpuset=9 -p gpu=64 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-3.nancy.grid5000.fr' AND resource_id='9696' AND type='default'" -p cpu=1620 -p core=8572 -p cpuset=11 -p gpu=64 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-3.nancy.grid5000.fr' AND resource_id='9697' AND type='default'" -p cpu=1620 -p core=8573 -p cpuset=13 -p gpu=64 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-3.nancy.grid5000.fr' AND resource_id='9698' AND type='default'" -p cpu=1620 -p core=8574 -p cpuset=15 -p gpu=64 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 echo; echo 'Setting properties for clustera-3.nancy.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-3.nancy.grid5000.fr' and type='default'" -p ip='172.16.64.3' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 BL1CBX2' -p eth_count=1 -p eth_kavlan_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='GeForce RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='NO' -p cluster_priority=201906 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
+oarnodesetting --sql "host='clustera-3.nancy.grid5000.fr' and type='default'" -p ip='172.16.64.3' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 BL1CBX2' -p eth_count=1 -p eth_kavlan_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='NO' -p cluster_priority=201906 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
 
 echo '================================================================================'
 
@@ -168,24 +168,24 @@ echo '==========================================================================
 ###################################
 # clustera-4.nancy.grid5000.fr
 ###################################
-oarnodesetting --sql "host='clustera-4.nancy.grid5000.fr' AND resource_id='9699' AND type='default'" -p cpu=1621 -p core=8575 -p cpuset=0 -p gpu=65 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-4.nancy.grid5000.fr' AND resource_id='9700' AND type='default'" -p cpu=1621 -p core=8576 -p cpuset=2 -p gpu=65 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-4.nancy.grid5000.fr' AND resource_id='9701' AND type='default'" -p cpu=1621 -p core=8577 -p cpuset=4 -p gpu=65 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-4.nancy.grid5000.fr' AND resource_id='9702' AND type='default'" -p cpu=1621 -p core=8578 -p cpuset=6 -p gpu=65 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-4.nancy.grid5000.fr' AND resource_id='9703' AND type='default'" -p cpu=1621 -p core=8579 -p cpuset=8 -p gpu=66 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-4.nancy.grid5000.fr' AND resource_id='9704' AND type='default'" -p cpu=1621 -p core=8580 -p cpuset=10 -p gpu=66 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-4.nancy.grid5000.fr' AND resource_id='9705' AND type='default'" -p cpu=1621 -p core=8581 -p cpuset=12 -p gpu=66 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-4.nancy.grid5000.fr' AND resource_id='9706' AND type='default'" -p cpu=1621 -p core=8582 -p cpuset=14 -p gpu=66 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-4.nancy.grid5000.fr' AND resource_id='9707' AND type='default'" -p cpu=1622 -p core=8583 -p cpuset=1 -p gpu=67 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-4.nancy.grid5000.fr' AND resource_id='9708' AND type='default'" -p cpu=1622 -p core=8584 -p cpuset=3 -p gpu=67 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-4.nancy.grid5000.fr' AND resource_id='9709' AND type='default'" -p cpu=1622 -p core=8585 -p cpuset=5 -p gpu=67 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-4.nancy.grid5000.fr' AND resource_id='9710' AND type='default'" -p cpu=1622 -p core=8586 -p cpuset=7 -p gpu=67 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-4.nancy.grid5000.fr' AND resource_id='9711' AND type='default'" -p cpu=1622 -p core=8587 -p cpuset=9 -p gpu=68 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting --sql "host='clustera-4.nancy.grid5000.fr' AND resource_id='9712' AND type='default'" -p cpu=1622 -p core=8588 -p cpuset=11 -p gpu=68 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting --sql "host='clustera-4.nancy.grid5000.fr' AND resource_id='9713' AND type='default'" -p cpu=1622 -p core=8589 -p cpuset=13 -p gpu=68 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting --sql "host='clustera-4.nancy.grid5000.fr' AND resource_id='9714' AND type='default'" -p cpu=1622 -p core=8590 -p cpuset=15 -p gpu=68 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-4.nancy.grid5000.fr' AND resource_id='9699' AND type='default'" -p cpu=1621 -p core=8575 -p cpuset=0 -p gpu=65 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-4.nancy.grid5000.fr' AND resource_id='9700' AND type='default'" -p cpu=1621 -p core=8576 -p cpuset=2 -p gpu=65 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-4.nancy.grid5000.fr' AND resource_id='9701' AND type='default'" -p cpu=1621 -p core=8577 -p cpuset=4 -p gpu=65 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-4.nancy.grid5000.fr' AND resource_id='9702' AND type='default'" -p cpu=1621 -p core=8578 -p cpuset=6 -p gpu=65 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-4.nancy.grid5000.fr' AND resource_id='9703' AND type='default'" -p cpu=1621 -p core=8579 -p cpuset=8 -p gpu=66 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-4.nancy.grid5000.fr' AND resource_id='9704' AND type='default'" -p cpu=1621 -p core=8580 -p cpuset=10 -p gpu=66 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-4.nancy.grid5000.fr' AND resource_id='9705' AND type='default'" -p cpu=1621 -p core=8581 -p cpuset=12 -p gpu=66 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-4.nancy.grid5000.fr' AND resource_id='9706' AND type='default'" -p cpu=1621 -p core=8582 -p cpuset=14 -p gpu=66 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-4.nancy.grid5000.fr' AND resource_id='9707' AND type='default'" -p cpu=1622 -p core=8583 -p cpuset=1 -p gpu=67 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-4.nancy.grid5000.fr' AND resource_id='9708' AND type='default'" -p cpu=1622 -p core=8584 -p cpuset=3 -p gpu=67 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-4.nancy.grid5000.fr' AND resource_id='9709' AND type='default'" -p cpu=1622 -p core=8585 -p cpuset=5 -p gpu=67 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-4.nancy.grid5000.fr' AND resource_id='9710' AND type='default'" -p cpu=1622 -p core=8586 -p cpuset=7 -p gpu=67 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-4.nancy.grid5000.fr' AND resource_id='9711' AND type='default'" -p cpu=1622 -p core=8587 -p cpuset=9 -p gpu=68 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-4.nancy.grid5000.fr' AND resource_id='9712' AND type='default'" -p cpu=1622 -p core=8588 -p cpuset=11 -p gpu=68 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-4.nancy.grid5000.fr' AND resource_id='9713' AND type='default'" -p cpu=1622 -p core=8589 -p cpuset=13 -p gpu=68 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-4.nancy.grid5000.fr' AND resource_id='9714' AND type='default'" -p cpu=1622 -p core=8590 -p cpuset=15 -p gpu=68 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 echo; echo 'Setting properties for clustera-4.nancy.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-4.nancy.grid5000.fr' and type='default'" -p ip='172.16.64.4' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 DL1CBX2' -p eth_count=1 -p eth_kavlan_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='GeForce RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='NO' -p cluster_priority=201906 -p max_walltime=172800 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
+oarnodesetting --sql "host='clustera-4.nancy.grid5000.fr' and type='default'" -p ip='172.16.64.4' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 DL1CBX2' -p eth_count=1 -p eth_kavlan_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='NO' -p cluster_priority=201906 -p max_walltime=172800 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
 
 echo '================================================================================'
 
@@ -193,24 +193,24 @@ echo '==========================================================================
 ###################################
 # clustera-5.nancy.grid5000.fr
 ###################################
-oarnodesetting --sql "host='clustera-5.nancy.grid5000.fr' AND resource_id='9715' AND type='default'" -p cpu=1623 -p core=8591 -p cpuset=0 -p gpu=69 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-5.nancy.grid5000.fr' AND resource_id='9716' AND type='default'" -p cpu=1623 -p core=8592 -p cpuset=2 -p gpu=69 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-5.nancy.grid5000.fr' AND resource_id='9717' AND type='default'" -p cpu=1623 -p core=8593 -p cpuset=4 -p gpu=69 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-5.nancy.grid5000.fr' AND resource_id='9718' AND type='default'" -p cpu=1623 -p core=8594 -p cpuset=6 -p gpu=69 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-5.nancy.grid5000.fr' AND resource_id='9719' AND type='default'" -p cpu=1623 -p core=8595 -p cpuset=8 -p gpu=70 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-5.nancy.grid5000.fr' AND resource_id='9720' AND type='default'" -p cpu=1623 -p core=8596 -p cpuset=10 -p gpu=70 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-5.nancy.grid5000.fr' AND resource_id='9721' AND type='default'" -p cpu=1623 -p core=8597 -p cpuset=12 -p gpu=70 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-5.nancy.grid5000.fr' AND resource_id='9722' AND type='default'" -p cpu=1623 -p core=8598 -p cpuset=14 -p gpu=70 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-5.nancy.grid5000.fr' AND resource_id='9723' AND type='default'" -p cpu=1624 -p core=8599 -p cpuset=1 -p gpu=71 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-5.nancy.grid5000.fr' AND resource_id='9724' AND type='default'" -p cpu=1624 -p core=8600 -p cpuset=3 -p gpu=71 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-5.nancy.grid5000.fr' AND resource_id='9725' AND type='default'" -p cpu=1624 -p core=8601 -p cpuset=5 -p gpu=71 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-5.nancy.grid5000.fr' AND resource_id='9726' AND type='default'" -p cpu=1624 -p core=8602 -p cpuset=7 -p gpu=71 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-5.nancy.grid5000.fr' AND resource_id='9727' AND type='default'" -p cpu=1624 -p core=8603 -p cpuset=9 -p gpu=72 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting --sql "host='clustera-5.nancy.grid5000.fr' AND resource_id='9728' AND type='default'" -p cpu=1624 -p core=8604 -p cpuset=11 -p gpu=72 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting --sql "host='clustera-5.nancy.grid5000.fr' AND resource_id='9729' AND type='default'" -p cpu=1624 -p core=8605 -p cpuset=13 -p gpu=72 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting --sql "host='clustera-5.nancy.grid5000.fr' AND resource_id='9730' AND type='default'" -p cpu=1624 -p core=8606 -p cpuset=15 -p gpu=72 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-5.nancy.grid5000.fr' AND resource_id='9715' AND type='default'" -p cpu=1623 -p core=8591 -p cpuset=0 -p gpu=69 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-5.nancy.grid5000.fr' AND resource_id='9716' AND type='default'" -p cpu=1623 -p core=8592 -p cpuset=2 -p gpu=69 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-5.nancy.grid5000.fr' AND resource_id='9717' AND type='default'" -p cpu=1623 -p core=8593 -p cpuset=4 -p gpu=69 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-5.nancy.grid5000.fr' AND resource_id='9718' AND type='default'" -p cpu=1623 -p core=8594 -p cpuset=6 -p gpu=69 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-5.nancy.grid5000.fr' AND resource_id='9719' AND type='default'" -p cpu=1623 -p core=8595 -p cpuset=8 -p gpu=70 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-5.nancy.grid5000.fr' AND resource_id='9720' AND type='default'" -p cpu=1623 -p core=8596 -p cpuset=10 -p gpu=70 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-5.nancy.grid5000.fr' AND resource_id='9721' AND type='default'" -p cpu=1623 -p core=8597 -p cpuset=12 -p gpu=70 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-5.nancy.grid5000.fr' AND resource_id='9722' AND type='default'" -p cpu=1623 -p core=8598 -p cpuset=14 -p gpu=70 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-5.nancy.grid5000.fr' AND resource_id='9723' AND type='default'" -p cpu=1624 -p core=8599 -p cpuset=1 -p gpu=71 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-5.nancy.grid5000.fr' AND resource_id='9724' AND type='default'" -p cpu=1624 -p core=8600 -p cpuset=3 -p gpu=71 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-5.nancy.grid5000.fr' AND resource_id='9725' AND type='default'" -p cpu=1624 -p core=8601 -p cpuset=5 -p gpu=71 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-5.nancy.grid5000.fr' AND resource_id='9726' AND type='default'" -p cpu=1624 -p core=8602 -p cpuset=7 -p gpu=71 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-5.nancy.grid5000.fr' AND resource_id='9727' AND type='default'" -p cpu=1624 -p core=8603 -p cpuset=9 -p gpu=72 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-5.nancy.grid5000.fr' AND resource_id='9728' AND type='default'" -p cpu=1624 -p core=8604 -p cpuset=11 -p gpu=72 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-5.nancy.grid5000.fr' AND resource_id='9729' AND type='default'" -p cpu=1624 -p core=8605 -p cpuset=13 -p gpu=72 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-5.nancy.grid5000.fr' AND resource_id='9730' AND type='default'" -p cpu=1624 -p core=8606 -p cpuset=15 -p gpu=72 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 echo; echo 'Setting properties for clustera-5.nancy.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-5.nancy.grid5000.fr' and type='default'" -p ip='172.16.64.5' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 CL1CBX2' -p eth_count=1 -p eth_kavlan_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='GeForce RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='NO' -p cluster_priority=201906 -p max_walltime=172800 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
+oarnodesetting --sql "host='clustera-5.nancy.grid5000.fr' and type='default'" -p ip='172.16.64.5' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 CL1CBX2' -p eth_count=1 -p eth_kavlan_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='NO' -p cluster_priority=201906 -p max_walltime=172800 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
 
 echo '================================================================================'
 
@@ -218,24 +218,24 @@ echo '==========================================================================
 ###################################
 # clustera-6.nancy.grid5000.fr
 ###################################
-oarnodesetting --sql "host='clustera-6.nancy.grid5000.fr' AND resource_id='9731' AND type='default'" -p cpu=1625 -p core=8607 -p cpuset=0 -p gpu=73 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-6.nancy.grid5000.fr' AND resource_id='9732' AND type='default'" -p cpu=1625 -p core=8608 -p cpuset=2 -p gpu=73 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-6.nancy.grid5000.fr' AND resource_id='9733' AND type='default'" -p cpu=1625 -p core=8609 -p cpuset=4 -p gpu=73 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-6.nancy.grid5000.fr' AND resource_id='9734' AND type='default'" -p cpu=1625 -p core=8610 -p cpuset=6 -p gpu=73 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-6.nancy.grid5000.fr' AND resource_id='9735' AND type='default'" -p cpu=1625 -p core=8611 -p cpuset=8 -p gpu=74 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-6.nancy.grid5000.fr' AND resource_id='9736' AND type='default'" -p cpu=1625 -p core=8612 -p cpuset=10 -p gpu=74 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-6.nancy.grid5000.fr' AND resource_id='9737' AND type='default'" -p cpu=1625 -p core=8613 -p cpuset=12 -p gpu=74 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-6.nancy.grid5000.fr' AND resource_id='9738' AND type='default'" -p cpu=1625 -p core=8614 -p cpuset=14 -p gpu=74 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-6.nancy.grid5000.fr' AND resource_id='9739' AND type='default'" -p cpu=1626 -p core=8615 -p cpuset=1 -p gpu=75 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-6.nancy.grid5000.fr' AND resource_id='9740' AND type='default'" -p cpu=1626 -p core=8616 -p cpuset=3 -p gpu=75 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-6.nancy.grid5000.fr' AND resource_id='9741' AND type='default'" -p cpu=1626 -p core=8617 -p cpuset=5 -p gpu=75 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-6.nancy.grid5000.fr' AND resource_id='9742' AND type='default'" -p cpu=1626 -p core=8618 -p cpuset=7 -p gpu=75 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-6.nancy.grid5000.fr' AND resource_id='9743' AND type='default'" -p cpu=1626 -p core=8619 -p cpuset=9 -p gpu=76 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting --sql "host='clustera-6.nancy.grid5000.fr' AND resource_id='9744' AND type='default'" -p cpu=1626 -p core=8620 -p cpuset=11 -p gpu=76 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting --sql "host='clustera-6.nancy.grid5000.fr' AND resource_id='9745' AND type='default'" -p cpu=1626 -p core=8621 -p cpuset=13 -p gpu=76 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting --sql "host='clustera-6.nancy.grid5000.fr' AND resource_id='9746' AND type='default'" -p cpu=1626 -p core=8622 -p cpuset=15 -p gpu=76 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-6.nancy.grid5000.fr' AND resource_id='9731' AND type='default'" -p cpu=1625 -p core=8607 -p cpuset=0 -p gpu=73 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-6.nancy.grid5000.fr' AND resource_id='9732' AND type='default'" -p cpu=1625 -p core=8608 -p cpuset=2 -p gpu=73 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-6.nancy.grid5000.fr' AND resource_id='9733' AND type='default'" -p cpu=1625 -p core=8609 -p cpuset=4 -p gpu=73 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-6.nancy.grid5000.fr' AND resource_id='9734' AND type='default'" -p cpu=1625 -p core=8610 -p cpuset=6 -p gpu=73 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-6.nancy.grid5000.fr' AND resource_id='9735' AND type='default'" -p cpu=1625 -p core=8611 -p cpuset=8 -p gpu=74 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-6.nancy.grid5000.fr' AND resource_id='9736' AND type='default'" -p cpu=1625 -p core=8612 -p cpuset=10 -p gpu=74 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-6.nancy.grid5000.fr' AND resource_id='9737' AND type='default'" -p cpu=1625 -p core=8613 -p cpuset=12 -p gpu=74 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-6.nancy.grid5000.fr' AND resource_id='9738' AND type='default'" -p cpu=1625 -p core=8614 -p cpuset=14 -p gpu=74 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-6.nancy.grid5000.fr' AND resource_id='9739' AND type='default'" -p cpu=1626 -p core=8615 -p cpuset=1 -p gpu=75 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-6.nancy.grid5000.fr' AND resource_id='9740' AND type='default'" -p cpu=1626 -p core=8616 -p cpuset=3 -p gpu=75 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-6.nancy.grid5000.fr' AND resource_id='9741' AND type='default'" -p cpu=1626 -p core=8617 -p cpuset=5 -p gpu=75 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-6.nancy.grid5000.fr' AND resource_id='9742' AND type='default'" -p cpu=1626 -p core=8618 -p cpuset=7 -p gpu=75 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-6.nancy.grid5000.fr' AND resource_id='9743' AND type='default'" -p cpu=1626 -p core=8619 -p cpuset=9 -p gpu=76 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-6.nancy.grid5000.fr' AND resource_id='9744' AND type='default'" -p cpu=1626 -p core=8620 -p cpuset=11 -p gpu=76 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-6.nancy.grid5000.fr' AND resource_id='9745' AND type='default'" -p cpu=1626 -p core=8621 -p cpuset=13 -p gpu=76 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-6.nancy.grid5000.fr' AND resource_id='9746' AND type='default'" -p cpu=1626 -p core=8622 -p cpuset=15 -p gpu=76 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 echo; echo 'Setting properties for clustera-6.nancy.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-6.nancy.grid5000.fr' and type='default'" -p ip='172.16.64.6' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 8K1CBX2' -p eth_count=1 -p eth_kavlan_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='GeForce RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='NO' -p cluster_priority=201906 -p max_walltime=172800 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
+oarnodesetting --sql "host='clustera-6.nancy.grid5000.fr' and type='default'" -p ip='172.16.64.6' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 8K1CBX2' -p eth_count=1 -p eth_kavlan_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='NO' -p cluster_priority=201906 -p max_walltime=172800 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
 
 echo '================================================================================'
 
@@ -243,24 +243,24 @@ echo '==========================================================================
 ###################################
 # clustera-7.nancy.grid5000.fr
 ###################################
-oarnodesetting --sql "host='clustera-7.nancy.grid5000.fr' AND resource_id='9747' AND type='default'" -p cpu=1627 -p core=8623 -p cpuset=0 -p gpu=77 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-7.nancy.grid5000.fr' AND resource_id='9748' AND type='default'" -p cpu=1627 -p core=8624 -p cpuset=2 -p gpu=77 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-7.nancy.grid5000.fr' AND resource_id='9749' AND type='default'" -p cpu=1627 -p core=8625 -p cpuset=4 -p gpu=77 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-7.nancy.grid5000.fr' AND resource_id='9750' AND type='default'" -p cpu=1627 -p core=8626 -p cpuset=6 -p gpu=77 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-7.nancy.grid5000.fr' AND resource_id='9751' AND type='default'" -p cpu=1627 -p core=8627 -p cpuset=8 -p gpu=78 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-7.nancy.grid5000.fr' AND resource_id='9752' AND type='default'" -p cpu=1627 -p core=8628 -p cpuset=10 -p gpu=78 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-7.nancy.grid5000.fr' AND resource_id='9753' AND type='default'" -p cpu=1627 -p core=8629 -p cpuset=12 -p gpu=78 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-7.nancy.grid5000.fr' AND resource_id='9754' AND type='default'" -p cpu=1627 -p core=8630 -p cpuset=14 -p gpu=78 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-7.nancy.grid5000.fr' AND resource_id='9755' AND type='default'" -p cpu=1628 -p core=8631 -p cpuset=1 -p gpu=79 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-7.nancy.grid5000.fr' AND resource_id='9756' AND type='default'" -p cpu=1628 -p core=8632 -p cpuset=3 -p gpu=79 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-7.nancy.grid5000.fr' AND resource_id='9757' AND type='default'" -p cpu=1628 -p core=8633 -p cpuset=5 -p gpu=79 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-7.nancy.grid5000.fr' AND resource_id='9758' AND type='default'" -p cpu=1628 -p core=8634 -p cpuset=7 -p gpu=79 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-7.nancy.grid5000.fr' AND resource_id='9759' AND type='default'" -p cpu=1628 -p core=8635 -p cpuset=9 -p gpu=80 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting --sql "host='clustera-7.nancy.grid5000.fr' AND resource_id='9760' AND type='default'" -p cpu=1628 -p core=8636 -p cpuset=11 -p gpu=80 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting --sql "host='clustera-7.nancy.grid5000.fr' AND resource_id='9761' AND type='default'" -p cpu=1628 -p core=8637 -p cpuset=13 -p gpu=80 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting --sql "host='clustera-7.nancy.grid5000.fr' AND resource_id='9762' AND type='default'" -p cpu=1628 -p core=8638 -p cpuset=15 -p gpu=80 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-7.nancy.grid5000.fr' AND resource_id='9747' AND type='default'" -p cpu=1627 -p core=8623 -p cpuset=0 -p gpu=77 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-7.nancy.grid5000.fr' AND resource_id='9748' AND type='default'" -p cpu=1627 -p core=8624 -p cpuset=2 -p gpu=77 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-7.nancy.grid5000.fr' AND resource_id='9749' AND type='default'" -p cpu=1627 -p core=8625 -p cpuset=4 -p gpu=77 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-7.nancy.grid5000.fr' AND resource_id='9750' AND type='default'" -p cpu=1627 -p core=8626 -p cpuset=6 -p gpu=77 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-7.nancy.grid5000.fr' AND resource_id='9751' AND type='default'" -p cpu=1627 -p core=8627 -p cpuset=8 -p gpu=78 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-7.nancy.grid5000.fr' AND resource_id='9752' AND type='default'" -p cpu=1627 -p core=8628 -p cpuset=10 -p gpu=78 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-7.nancy.grid5000.fr' AND resource_id='9753' AND type='default'" -p cpu=1627 -p core=8629 -p cpuset=12 -p gpu=78 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-7.nancy.grid5000.fr' AND resource_id='9754' AND type='default'" -p cpu=1627 -p core=8630 -p cpuset=14 -p gpu=78 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-7.nancy.grid5000.fr' AND resource_id='9755' AND type='default'" -p cpu=1628 -p core=8631 -p cpuset=1 -p gpu=79 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-7.nancy.grid5000.fr' AND resource_id='9756' AND type='default'" -p cpu=1628 -p core=8632 -p cpuset=3 -p gpu=79 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-7.nancy.grid5000.fr' AND resource_id='9757' AND type='default'" -p cpu=1628 -p core=8633 -p cpuset=5 -p gpu=79 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-7.nancy.grid5000.fr' AND resource_id='9758' AND type='default'" -p cpu=1628 -p core=8634 -p cpuset=7 -p gpu=79 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-7.nancy.grid5000.fr' AND resource_id='9759' AND type='default'" -p cpu=1628 -p core=8635 -p cpuset=9 -p gpu=80 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-7.nancy.grid5000.fr' AND resource_id='9760' AND type='default'" -p cpu=1628 -p core=8636 -p cpuset=11 -p gpu=80 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-7.nancy.grid5000.fr' AND resource_id='9761' AND type='default'" -p cpu=1628 -p core=8637 -p cpuset=13 -p gpu=80 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-7.nancy.grid5000.fr' AND resource_id='9762' AND type='default'" -p cpu=1628 -p core=8638 -p cpuset=15 -p gpu=80 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 echo; echo 'Setting properties for clustera-7.nancy.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-7.nancy.grid5000.fr' and type='default'" -p ip='172.16.64.7' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 BK1CBX2' -p eth_count=1 -p eth_kavlan_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='GeForce RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='NO' -p cluster_priority=201906 -p max_walltime=604800 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
+oarnodesetting --sql "host='clustera-7.nancy.grid5000.fr' and type='default'" -p ip='172.16.64.7' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 BK1CBX2' -p eth_count=1 -p eth_kavlan_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='NO' -p cluster_priority=201906 -p max_walltime=604800 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
 
 echo '================================================================================'
 
@@ -268,24 +268,24 @@ echo '==========================================================================
 ###################################
 # clustera-8.nancy.grid5000.fr
 ###################################
-oarnodesetting --sql "host='clustera-8.nancy.grid5000.fr' AND resource_id='9763' AND type='default'" -p cpu=1629 -p core=8639 -p cpuset=0 -p gpu=81 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-8.nancy.grid5000.fr' AND resource_id='9764' AND type='default'" -p cpu=1629 -p core=8640 -p cpuset=2 -p gpu=81 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-8.nancy.grid5000.fr' AND resource_id='9765' AND type='default'" -p cpu=1629 -p core=8641 -p cpuset=4 -p gpu=81 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-8.nancy.grid5000.fr' AND resource_id='9766' AND type='default'" -p cpu=1629 -p core=8642 -p cpuset=6 -p gpu=81 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-8.nancy.grid5000.fr' AND resource_id='9767' AND type='default'" -p cpu=1629 -p core=8643 -p cpuset=8 -p gpu=82 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-8.nancy.grid5000.fr' AND resource_id='9768' AND type='default'" -p cpu=1629 -p core=8644 -p cpuset=10 -p gpu=82 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-8.nancy.grid5000.fr' AND resource_id='9769' AND type='default'" -p cpu=1629 -p core=8645 -p cpuset=12 -p gpu=82 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-8.nancy.grid5000.fr' AND resource_id='9770' AND type='default'" -p cpu=1629 -p core=8646 -p cpuset=14 -p gpu=82 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-8.nancy.grid5000.fr' AND resource_id='9771' AND type='default'" -p cpu=1630 -p core=8647 -p cpuset=1 -p gpu=83 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-8.nancy.grid5000.fr' AND resource_id='9772' AND type='default'" -p cpu=1630 -p core=8648 -p cpuset=3 -p gpu=83 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-8.nancy.grid5000.fr' AND resource_id='9773' AND type='default'" -p cpu=1630 -p core=8649 -p cpuset=5 -p gpu=83 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-8.nancy.grid5000.fr' AND resource_id='9774' AND type='default'" -p cpu=1630 -p core=8650 -p cpuset=7 -p gpu=83 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-8.nancy.grid5000.fr' AND resource_id='9775' AND type='default'" -p cpu=1630 -p core=8651 -p cpuset=9 -p gpu=84 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting --sql "host='clustera-8.nancy.grid5000.fr' AND resource_id='9776' AND type='default'" -p cpu=1630 -p core=8652 -p cpuset=11 -p gpu=84 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting --sql "host='clustera-8.nancy.grid5000.fr' AND resource_id='9777' AND type='default'" -p cpu=1630 -p core=8653 -p cpuset=13 -p gpu=84 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting --sql "host='clustera-8.nancy.grid5000.fr' AND resource_id='9778' AND type='default'" -p cpu=1630 -p core=8654 -p cpuset=15 -p gpu=84 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-8.nancy.grid5000.fr' AND resource_id='9763' AND type='default'" -p cpu=1629 -p core=8639 -p cpuset=0 -p gpu=81 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-8.nancy.grid5000.fr' AND resource_id='9764' AND type='default'" -p cpu=1629 -p core=8640 -p cpuset=2 -p gpu=81 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-8.nancy.grid5000.fr' AND resource_id='9765' AND type='default'" -p cpu=1629 -p core=8641 -p cpuset=4 -p gpu=81 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-8.nancy.grid5000.fr' AND resource_id='9766' AND type='default'" -p cpu=1629 -p core=8642 -p cpuset=6 -p gpu=81 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-8.nancy.grid5000.fr' AND resource_id='9767' AND type='default'" -p cpu=1629 -p core=8643 -p cpuset=8 -p gpu=82 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-8.nancy.grid5000.fr' AND resource_id='9768' AND type='default'" -p cpu=1629 -p core=8644 -p cpuset=10 -p gpu=82 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-8.nancy.grid5000.fr' AND resource_id='9769' AND type='default'" -p cpu=1629 -p core=8645 -p cpuset=12 -p gpu=82 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-8.nancy.grid5000.fr' AND resource_id='9770' AND type='default'" -p cpu=1629 -p core=8646 -p cpuset=14 -p gpu=82 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-8.nancy.grid5000.fr' AND resource_id='9771' AND type='default'" -p cpu=1630 -p core=8647 -p cpuset=1 -p gpu=83 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-8.nancy.grid5000.fr' AND resource_id='9772' AND type='default'" -p cpu=1630 -p core=8648 -p cpuset=3 -p gpu=83 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-8.nancy.grid5000.fr' AND resource_id='9773' AND type='default'" -p cpu=1630 -p core=8649 -p cpuset=5 -p gpu=83 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-8.nancy.grid5000.fr' AND resource_id='9774' AND type='default'" -p cpu=1630 -p core=8650 -p cpuset=7 -p gpu=83 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-8.nancy.grid5000.fr' AND resource_id='9775' AND type='default'" -p cpu=1630 -p core=8651 -p cpuset=9 -p gpu=84 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-8.nancy.grid5000.fr' AND resource_id='9776' AND type='default'" -p cpu=1630 -p core=8652 -p cpuset=11 -p gpu=84 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-8.nancy.grid5000.fr' AND resource_id='9777' AND type='default'" -p cpu=1630 -p core=8653 -p cpuset=13 -p gpu=84 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-8.nancy.grid5000.fr' AND resource_id='9778' AND type='default'" -p cpu=1630 -p core=8654 -p cpuset=15 -p gpu=84 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 echo; echo 'Setting properties for clustera-8.nancy.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-8.nancy.grid5000.fr' and type='default'" -p ip='172.16.64.8' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 CK1CBX2' -p eth_count=1 -p eth_kavlan_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='GeForce RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='NO' -p cluster_priority=201906 -p max_walltime=604800 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
+oarnodesetting --sql "host='clustera-8.nancy.grid5000.fr' and type='default'" -p ip='172.16.64.8' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 CK1CBX2' -p eth_count=1 -p eth_kavlan_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='NO' -p cluster_priority=201906 -p max_walltime=604800 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
 
 echo '================================================================================'
 
@@ -293,24 +293,24 @@ echo '==========================================================================
 ###################################
 # clustera-9.nancy.grid5000.fr
 ###################################
-oarnodesetting --sql "host='clustera-9.nancy.grid5000.fr' AND resource_id='9779' AND type='default'" -p cpu=1631 -p core=8655 -p cpuset=0 -p gpu=85 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-9.nancy.grid5000.fr' AND resource_id='9780' AND type='default'" -p cpu=1631 -p core=8656 -p cpuset=2 -p gpu=85 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-9.nancy.grid5000.fr' AND resource_id='9781' AND type='default'" -p cpu=1631 -p core=8657 -p cpuset=4 -p gpu=85 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-9.nancy.grid5000.fr' AND resource_id='9782' AND type='default'" -p cpu=1631 -p core=8658 -p cpuset=6 -p gpu=85 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-9.nancy.grid5000.fr' AND resource_id='9783' AND type='default'" -p cpu=1631 -p core=8659 -p cpuset=8 -p gpu=86 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-9.nancy.grid5000.fr' AND resource_id='9784' AND type='default'" -p cpu=1631 -p core=8660 -p cpuset=10 -p gpu=86 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-9.nancy.grid5000.fr' AND resource_id='9785' AND type='default'" -p cpu=1631 -p core=8661 -p cpuset=12 -p gpu=86 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-9.nancy.grid5000.fr' AND resource_id='9786' AND type='default'" -p cpu=1631 -p core=8662 -p cpuset=14 -p gpu=86 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-9.nancy.grid5000.fr' AND resource_id='9787' AND type='default'" -p cpu=1632 -p core=8663 -p cpuset=1 -p gpu=87 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-9.nancy.grid5000.fr' AND resource_id='9788' AND type='default'" -p cpu=1632 -p core=8664 -p cpuset=3 -p gpu=87 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-9.nancy.grid5000.fr' AND resource_id='9789' AND type='default'" -p cpu=1632 -p core=8665 -p cpuset=5 -p gpu=87 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-9.nancy.grid5000.fr' AND resource_id='9790' AND type='default'" -p cpu=1632 -p core=8666 -p cpuset=7 -p gpu=87 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-9.nancy.grid5000.fr' AND resource_id='9791' AND type='default'" -p cpu=1632 -p core=8667 -p cpuset=9 -p gpu=88 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting --sql "host='clustera-9.nancy.grid5000.fr' AND resource_id='9792' AND type='default'" -p cpu=1632 -p core=8668 -p cpuset=11 -p gpu=88 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting --sql "host='clustera-9.nancy.grid5000.fr' AND resource_id='9793' AND type='default'" -p cpu=1632 -p core=8669 -p cpuset=13 -p gpu=88 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting --sql "host='clustera-9.nancy.grid5000.fr' AND resource_id='9794' AND type='default'" -p cpu=1632 -p core=8670 -p cpuset=15 -p gpu=88 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-9.nancy.grid5000.fr' AND resource_id='9779' AND type='default'" -p cpu=1631 -p core=8655 -p cpuset=0 -p gpu=85 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-9.nancy.grid5000.fr' AND resource_id='9780' AND type='default'" -p cpu=1631 -p core=8656 -p cpuset=2 -p gpu=85 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-9.nancy.grid5000.fr' AND resource_id='9781' AND type='default'" -p cpu=1631 -p core=8657 -p cpuset=4 -p gpu=85 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-9.nancy.grid5000.fr' AND resource_id='9782' AND type='default'" -p cpu=1631 -p core=8658 -p cpuset=6 -p gpu=85 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-9.nancy.grid5000.fr' AND resource_id='9783' AND type='default'" -p cpu=1631 -p core=8659 -p cpuset=8 -p gpu=86 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-9.nancy.grid5000.fr' AND resource_id='9784' AND type='default'" -p cpu=1631 -p core=8660 -p cpuset=10 -p gpu=86 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-9.nancy.grid5000.fr' AND resource_id='9785' AND type='default'" -p cpu=1631 -p core=8661 -p cpuset=12 -p gpu=86 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-9.nancy.grid5000.fr' AND resource_id='9786' AND type='default'" -p cpu=1631 -p core=8662 -p cpuset=14 -p gpu=86 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-9.nancy.grid5000.fr' AND resource_id='9787' AND type='default'" -p cpu=1632 -p core=8663 -p cpuset=1 -p gpu=87 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-9.nancy.grid5000.fr' AND resource_id='9788' AND type='default'" -p cpu=1632 -p core=8664 -p cpuset=3 -p gpu=87 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-9.nancy.grid5000.fr' AND resource_id='9789' AND type='default'" -p cpu=1632 -p core=8665 -p cpuset=5 -p gpu=87 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-9.nancy.grid5000.fr' AND resource_id='9790' AND type='default'" -p cpu=1632 -p core=8666 -p cpuset=7 -p gpu=87 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-9.nancy.grid5000.fr' AND resource_id='9791' AND type='default'" -p cpu=1632 -p core=8667 -p cpuset=9 -p gpu=88 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-9.nancy.grid5000.fr' AND resource_id='9792' AND type='default'" -p cpu=1632 -p core=8668 -p cpuset=11 -p gpu=88 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-9.nancy.grid5000.fr' AND resource_id='9793' AND type='default'" -p cpu=1632 -p core=8669 -p cpuset=13 -p gpu=88 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-9.nancy.grid5000.fr' AND resource_id='9794' AND type='default'" -p cpu=1632 -p core=8670 -p cpuset=15 -p gpu=88 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 echo; echo 'Setting properties for clustera-9.nancy.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-9.nancy.grid5000.fr' and type='default'" -p ip='172.16.64.9' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 9K1CBX2' -p eth_count=1 -p eth_kavlan_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='GeForce RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='NO' -p cluster_priority=201906 -p max_walltime=604800 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
+oarnodesetting --sql "host='clustera-9.nancy.grid5000.fr' and type='default'" -p ip='172.16.64.9' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 9K1CBX2' -p eth_count=1 -p eth_kavlan_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='NO' -p cluster_priority=201906 -p max_walltime=604800 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
 
 echo '================================================================================'
 
@@ -318,24 +318,24 @@ echo '==========================================================================
 ###################################
 # clustera-10.nancy.grid5000.fr
 ###################################
-oarnodesetting --sql "host='clustera-10.nancy.grid5000.fr' AND resource_id='9795' AND type='default'" -p cpu=1633 -p core=8671 -p cpuset=0 -p gpu=89 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-10.nancy.grid5000.fr' AND resource_id='9796' AND type='default'" -p cpu=1633 -p core=8672 -p cpuset=2 -p gpu=89 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-10.nancy.grid5000.fr' AND resource_id='9797' AND type='default'" -p cpu=1633 -p core=8673 -p cpuset=4 -p gpu=89 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-10.nancy.grid5000.fr' AND resource_id='9798' AND type='default'" -p cpu=1633 -p core=8674 -p cpuset=6 -p gpu=89 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-10.nancy.grid5000.fr' AND resource_id='9799' AND type='default'" -p cpu=1633 -p core=8675 -p cpuset=8 -p gpu=90 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-10.nancy.grid5000.fr' AND resource_id='9800' AND type='default'" -p cpu=1633 -p core=8676 -p cpuset=10 -p gpu=90 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-10.nancy.grid5000.fr' AND resource_id='9801' AND type='default'" -p cpu=1633 -p core=8677 -p cpuset=12 -p gpu=90 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-10.nancy.grid5000.fr' AND resource_id='9802' AND type='default'" -p cpu=1633 -p core=8678 -p cpuset=14 -p gpu=90 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-10.nancy.grid5000.fr' AND resource_id='9803' AND type='default'" -p cpu=1634 -p core=8679 -p cpuset=1 -p gpu=91 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-10.nancy.grid5000.fr' AND resource_id='9804' AND type='default'" -p cpu=1634 -p core=8680 -p cpuset=3 -p gpu=91 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-10.nancy.grid5000.fr' AND resource_id='9805' AND type='default'" -p cpu=1634 -p core=8681 -p cpuset=5 -p gpu=91 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-10.nancy.grid5000.fr' AND resource_id='9806' AND type='default'" -p cpu=1634 -p core=8682 -p cpuset=7 -p gpu=91 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-10.nancy.grid5000.fr' AND resource_id='9807' AND type='default'" -p cpu=1634 -p core=8683 -p cpuset=9 -p gpu=92 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting --sql "host='clustera-10.nancy.grid5000.fr' AND resource_id='9808' AND type='default'" -p cpu=1634 -p core=8684 -p cpuset=11 -p gpu=92 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting --sql "host='clustera-10.nancy.grid5000.fr' AND resource_id='9809' AND type='default'" -p cpu=1634 -p core=8685 -p cpuset=13 -p gpu=92 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting --sql "host='clustera-10.nancy.grid5000.fr' AND resource_id='9810' AND type='default'" -p cpu=1634 -p core=8686 -p cpuset=15 -p gpu=92 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-10.nancy.grid5000.fr' AND resource_id='9795' AND type='default'" -p cpu=1633 -p core=8671 -p cpuset=0 -p gpu=89 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-10.nancy.grid5000.fr' AND resource_id='9796' AND type='default'" -p cpu=1633 -p core=8672 -p cpuset=2 -p gpu=89 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-10.nancy.grid5000.fr' AND resource_id='9797' AND type='default'" -p cpu=1633 -p core=8673 -p cpuset=4 -p gpu=89 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-10.nancy.grid5000.fr' AND resource_id='9798' AND type='default'" -p cpu=1633 -p core=8674 -p cpuset=6 -p gpu=89 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-10.nancy.grid5000.fr' AND resource_id='9799' AND type='default'" -p cpu=1633 -p core=8675 -p cpuset=8 -p gpu=90 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-10.nancy.grid5000.fr' AND resource_id='9800' AND type='default'" -p cpu=1633 -p core=8676 -p cpuset=10 -p gpu=90 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-10.nancy.grid5000.fr' AND resource_id='9801' AND type='default'" -p cpu=1633 -p core=8677 -p cpuset=12 -p gpu=90 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-10.nancy.grid5000.fr' AND resource_id='9802' AND type='default'" -p cpu=1633 -p core=8678 -p cpuset=14 -p gpu=90 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-10.nancy.grid5000.fr' AND resource_id='9803' AND type='default'" -p cpu=1634 -p core=8679 -p cpuset=1 -p gpu=91 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-10.nancy.grid5000.fr' AND resource_id='9804' AND type='default'" -p cpu=1634 -p core=8680 -p cpuset=3 -p gpu=91 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-10.nancy.grid5000.fr' AND resource_id='9805' AND type='default'" -p cpu=1634 -p core=8681 -p cpuset=5 -p gpu=91 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-10.nancy.grid5000.fr' AND resource_id='9806' AND type='default'" -p cpu=1634 -p core=8682 -p cpuset=7 -p gpu=91 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-10.nancy.grid5000.fr' AND resource_id='9807' AND type='default'" -p cpu=1634 -p core=8683 -p cpuset=9 -p gpu=92 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-10.nancy.grid5000.fr' AND resource_id='9808' AND type='default'" -p cpu=1634 -p core=8684 -p cpuset=11 -p gpu=92 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-10.nancy.grid5000.fr' AND resource_id='9809' AND type='default'" -p cpu=1634 -p core=8685 -p cpuset=13 -p gpu=92 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-10.nancy.grid5000.fr' AND resource_id='9810' AND type='default'" -p cpu=1634 -p core=8686 -p cpuset=15 -p gpu=92 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 echo; echo 'Setting properties for clustera-10.nancy.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-10.nancy.grid5000.fr' and type='default'" -p ip='172.16.64.10' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 GL1CBX2' -p eth_count=1 -p eth_kavlan_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='GeForce RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='NO' -p cluster_priority=201906 -p max_walltime=604800 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
+oarnodesetting --sql "host='clustera-10.nancy.grid5000.fr' and type='default'" -p ip='172.16.64.10' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 GL1CBX2' -p eth_count=1 -p eth_kavlan_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='NO' -p cluster_priority=201906 -p max_walltime=604800 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
 
 echo '================================================================================'
 
@@ -343,24 +343,24 @@ echo '==========================================================================
 ###################################
 # clustera-11.nancy.grid5000.fr
 ###################################
-oarnodesetting --sql "host='clustera-11.nancy.grid5000.fr' AND resource_id='9811' AND type='default'" -p cpu=1635 -p core=8687 -p cpuset=0 -p gpu=93 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-11.nancy.grid5000.fr' AND resource_id='9812' AND type='default'" -p cpu=1635 -p core=8688 -p cpuset=2 -p gpu=93 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-11.nancy.grid5000.fr' AND resource_id='9813' AND type='default'" -p cpu=1635 -p core=8689 -p cpuset=4 -p gpu=93 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-11.nancy.grid5000.fr' AND resource_id='9814' AND type='default'" -p cpu=1635 -p core=8690 -p cpuset=6 -p gpu=93 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-11.nancy.grid5000.fr' AND resource_id='9815' AND type='default'" -p cpu=1635 -p core=8691 -p cpuset=8 -p gpu=94 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-11.nancy.grid5000.fr' AND resource_id='9816' AND type='default'" -p cpu=1635 -p core=8692 -p cpuset=10 -p gpu=94 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-11.nancy.grid5000.fr' AND resource_id='9817' AND type='default'" -p cpu=1635 -p core=8693 -p cpuset=12 -p gpu=94 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-11.nancy.grid5000.fr' AND resource_id='9818' AND type='default'" -p cpu=1635 -p core=8694 -p cpuset=14 -p gpu=94 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-11.nancy.grid5000.fr' AND resource_id='9819' AND type='default'" -p cpu=1636 -p core=8695 -p cpuset=1 -p gpu=95 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-11.nancy.grid5000.fr' AND resource_id='9820' AND type='default'" -p cpu=1636 -p core=8696 -p cpuset=3 -p gpu=95 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-11.nancy.grid5000.fr' AND resource_id='9821' AND type='default'" -p cpu=1636 -p core=8697 -p cpuset=5 -p gpu=95 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-11.nancy.grid5000.fr' AND resource_id='9822' AND type='default'" -p cpu=1636 -p core=8698 -p cpuset=7 -p gpu=95 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-11.nancy.grid5000.fr' AND resource_id='9823' AND type='default'" -p cpu=1636 -p core=8699 -p cpuset=9 -p gpu=96 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting --sql "host='clustera-11.nancy.grid5000.fr' AND resource_id='9824' AND type='default'" -p cpu=1636 -p core=8700 -p cpuset=11 -p gpu=96 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting --sql "host='clustera-11.nancy.grid5000.fr' AND resource_id='9825' AND type='default'" -p cpu=1636 -p core=8701 -p cpuset=13 -p gpu=96 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting --sql "host='clustera-11.nancy.grid5000.fr' AND resource_id='9826' AND type='default'" -p cpu=1636 -p core=8702 -p cpuset=15 -p gpu=96 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-11.nancy.grid5000.fr' AND resource_id='9811' AND type='default'" -p cpu=1635 -p core=8687 -p cpuset=0 -p gpu=93 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-11.nancy.grid5000.fr' AND resource_id='9812' AND type='default'" -p cpu=1635 -p core=8688 -p cpuset=2 -p gpu=93 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-11.nancy.grid5000.fr' AND resource_id='9813' AND type='default'" -p cpu=1635 -p core=8689 -p cpuset=4 -p gpu=93 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-11.nancy.grid5000.fr' AND resource_id='9814' AND type='default'" -p cpu=1635 -p core=8690 -p cpuset=6 -p gpu=93 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-11.nancy.grid5000.fr' AND resource_id='9815' AND type='default'" -p cpu=1635 -p core=8691 -p cpuset=8 -p gpu=94 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-11.nancy.grid5000.fr' AND resource_id='9816' AND type='default'" -p cpu=1635 -p core=8692 -p cpuset=10 -p gpu=94 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-11.nancy.grid5000.fr' AND resource_id='9817' AND type='default'" -p cpu=1635 -p core=8693 -p cpuset=12 -p gpu=94 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-11.nancy.grid5000.fr' AND resource_id='9818' AND type='default'" -p cpu=1635 -p core=8694 -p cpuset=14 -p gpu=94 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-11.nancy.grid5000.fr' AND resource_id='9819' AND type='default'" -p cpu=1636 -p core=8695 -p cpuset=1 -p gpu=95 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-11.nancy.grid5000.fr' AND resource_id='9820' AND type='default'" -p cpu=1636 -p core=8696 -p cpuset=3 -p gpu=95 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-11.nancy.grid5000.fr' AND resource_id='9821' AND type='default'" -p cpu=1636 -p core=8697 -p cpuset=5 -p gpu=95 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-11.nancy.grid5000.fr' AND resource_id='9822' AND type='default'" -p cpu=1636 -p core=8698 -p cpuset=7 -p gpu=95 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-11.nancy.grid5000.fr' AND resource_id='9823' AND type='default'" -p cpu=1636 -p core=8699 -p cpuset=9 -p gpu=96 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-11.nancy.grid5000.fr' AND resource_id='9824' AND type='default'" -p cpu=1636 -p core=8700 -p cpuset=11 -p gpu=96 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-11.nancy.grid5000.fr' AND resource_id='9825' AND type='default'" -p cpu=1636 -p core=8701 -p cpuset=13 -p gpu=96 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-11.nancy.grid5000.fr' AND resource_id='9826' AND type='default'" -p cpu=1636 -p core=8702 -p cpuset=15 -p gpu=96 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 echo; echo 'Setting properties for clustera-11.nancy.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-11.nancy.grid5000.fr' and type='default'" -p ip='172.16.64.11' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 JL1CBX2' -p eth_count=1 -p eth_kavlan_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='GeForce RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='NO' -p cluster_priority=201906 -p max_walltime=604800 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
+oarnodesetting --sql "host='clustera-11.nancy.grid5000.fr' and type='default'" -p ip='172.16.64.11' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 JL1CBX2' -p eth_count=1 -p eth_kavlan_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='NO' -p cluster_priority=201906 -p max_walltime=604800 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
 
 echo '================================================================================'
 
@@ -368,24 +368,24 @@ echo '==========================================================================
 ###################################
 # clustera-12.nancy.grid5000.fr
 ###################################
-oarnodesetting --sql "host='clustera-12.nancy.grid5000.fr' AND resource_id='9827' AND type='default'" -p cpu=1637 -p core=8703 -p cpuset=0 -p gpu=97 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-12.nancy.grid5000.fr' AND resource_id='9828' AND type='default'" -p cpu=1637 -p core=8704 -p cpuset=2 -p gpu=97 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-12.nancy.grid5000.fr' AND resource_id='9829' AND type='default'" -p cpu=1637 -p core=8705 -p cpuset=4 -p gpu=97 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-12.nancy.grid5000.fr' AND resource_id='9830' AND type='default'" -p cpu=1637 -p core=8706 -p cpuset=6 -p gpu=97 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-12.nancy.grid5000.fr' AND resource_id='9831' AND type='default'" -p cpu=1637 -p core=8707 -p cpuset=8 -p gpu=98 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-12.nancy.grid5000.fr' AND resource_id='9832' AND type='default'" -p cpu=1637 -p core=8708 -p cpuset=10 -p gpu=98 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-12.nancy.grid5000.fr' AND resource_id='9833' AND type='default'" -p cpu=1637 -p core=8709 -p cpuset=12 -p gpu=98 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-12.nancy.grid5000.fr' AND resource_id='9834' AND type='default'" -p cpu=1637 -p core=8710 -p cpuset=14 -p gpu=98 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-12.nancy.grid5000.fr' AND resource_id='9835' AND type='default'" -p cpu=1638 -p core=8711 -p cpuset=1 -p gpu=99 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-12.nancy.grid5000.fr' AND resource_id='9836' AND type='default'" -p cpu=1638 -p core=8712 -p cpuset=3 -p gpu=99 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-12.nancy.grid5000.fr' AND resource_id='9837' AND type='default'" -p cpu=1638 -p core=8713 -p cpuset=5 -p gpu=99 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-12.nancy.grid5000.fr' AND resource_id='9838' AND type='default'" -p cpu=1638 -p core=8714 -p cpuset=7 -p gpu=99 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-12.nancy.grid5000.fr' AND resource_id='9839' AND type='default'" -p cpu=1638 -p core=8715 -p cpuset=9 -p gpu=100 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting --sql "host='clustera-12.nancy.grid5000.fr' AND resource_id='9840' AND type='default'" -p cpu=1638 -p core=8716 -p cpuset=11 -p gpu=100 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting --sql "host='clustera-12.nancy.grid5000.fr' AND resource_id='9841' AND type='default'" -p cpu=1638 -p core=8717 -p cpuset=13 -p gpu=100 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting --sql "host='clustera-12.nancy.grid5000.fr' AND resource_id='9842' AND type='default'" -p cpu=1638 -p core=8718 -p cpuset=15 -p gpu=100 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-12.nancy.grid5000.fr' AND resource_id='9827' AND type='default'" -p cpu=1637 -p core=8703 -p cpuset=0 -p gpu=97 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-12.nancy.grid5000.fr' AND resource_id='9828' AND type='default'" -p cpu=1637 -p core=8704 -p cpuset=2 -p gpu=97 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-12.nancy.grid5000.fr' AND resource_id='9829' AND type='default'" -p cpu=1637 -p core=8705 -p cpuset=4 -p gpu=97 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-12.nancy.grid5000.fr' AND resource_id='9830' AND type='default'" -p cpu=1637 -p core=8706 -p cpuset=6 -p gpu=97 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-12.nancy.grid5000.fr' AND resource_id='9831' AND type='default'" -p cpu=1637 -p core=8707 -p cpuset=8 -p gpu=98 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-12.nancy.grid5000.fr' AND resource_id='9832' AND type='default'" -p cpu=1637 -p core=8708 -p cpuset=10 -p gpu=98 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-12.nancy.grid5000.fr' AND resource_id='9833' AND type='default'" -p cpu=1637 -p core=8709 -p cpuset=12 -p gpu=98 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-12.nancy.grid5000.fr' AND resource_id='9834' AND type='default'" -p cpu=1637 -p core=8710 -p cpuset=14 -p gpu=98 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-12.nancy.grid5000.fr' AND resource_id='9835' AND type='default'" -p cpu=1638 -p core=8711 -p cpuset=1 -p gpu=99 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-12.nancy.grid5000.fr' AND resource_id='9836' AND type='default'" -p cpu=1638 -p core=8712 -p cpuset=3 -p gpu=99 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-12.nancy.grid5000.fr' AND resource_id='9837' AND type='default'" -p cpu=1638 -p core=8713 -p cpuset=5 -p gpu=99 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-12.nancy.grid5000.fr' AND resource_id='9838' AND type='default'" -p cpu=1638 -p core=8714 -p cpuset=7 -p gpu=99 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-12.nancy.grid5000.fr' AND resource_id='9839' AND type='default'" -p cpu=1638 -p core=8715 -p cpuset=9 -p gpu=100 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-12.nancy.grid5000.fr' AND resource_id='9840' AND type='default'" -p cpu=1638 -p core=8716 -p cpuset=11 -p gpu=100 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-12.nancy.grid5000.fr' AND resource_id='9841' AND type='default'" -p cpu=1638 -p core=8717 -p cpuset=13 -p gpu=100 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-12.nancy.grid5000.fr' AND resource_id='9842' AND type='default'" -p cpu=1638 -p core=8718 -p cpuset=15 -p gpu=100 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 echo; echo 'Setting properties for clustera-12.nancy.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-12.nancy.grid5000.fr' and type='default'" -p ip='172.16.64.12' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 HL1CBX2' -p eth_count=1 -p eth_kavlan_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='GeForce RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='NO' -p cluster_priority=201906 -p max_walltime=604800 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
+oarnodesetting --sql "host='clustera-12.nancy.grid5000.fr' and type='default'" -p ip='172.16.64.12' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 HL1CBX2' -p eth_count=1 -p eth_kavlan_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='NO' -p cluster_priority=201906 -p max_walltime=604800 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
 
 echo '================================================================================'
 
@@ -393,23 +393,23 @@ echo '==========================================================================
 ###################################
 # clustera-13.nancy.grid5000.fr
 ###################################
-oarnodesetting --sql "host='clustera-13.nancy.grid5000.fr' AND resource_id='9843' AND type='default'" -p cpu=1639 -p core=8719 -p cpuset=0 -p gpu=101 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-13.nancy.grid5000.fr' AND resource_id='9844' AND type='default'" -p cpu=1639 -p core=8720 -p cpuset=2 -p gpu=101 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-13.nancy.grid5000.fr' AND resource_id='9845' AND type='default'" -p cpu=1639 -p core=8721 -p cpuset=4 -p gpu=101 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-13.nancy.grid5000.fr' AND resource_id='9846' AND type='default'" -p cpu=1639 -p core=8722 -p cpuset=6 -p gpu=101 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-13.nancy.grid5000.fr' AND resource_id='9847' AND type='default'" -p cpu=1639 -p core=8723 -p cpuset=8 -p gpu=102 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-13.nancy.grid5000.fr' AND resource_id='9848' AND type='default'" -p cpu=1639 -p core=8724 -p cpuset=10 -p gpu=102 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-13.nancy.grid5000.fr' AND resource_id='9849' AND type='default'" -p cpu=1639 -p core=8725 -p cpuset=12 -p gpu=102 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-13.nancy.grid5000.fr' AND resource_id='9850' AND type='default'" -p cpu=1639 -p core=8726 -p cpuset=14 -p gpu=102 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-13.nancy.grid5000.fr' AND resource_id='9851' AND type='default'" -p cpu=1640 -p core=8727 -p cpuset=1 -p gpu=103 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-13.nancy.grid5000.fr' AND resource_id='9852' AND type='default'" -p cpu=1640 -p core=8728 -p cpuset=3 -p gpu=103 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-13.nancy.grid5000.fr' AND resource_id='9853' AND type='default'" -p cpu=1640 -p core=8729 -p cpuset=5 -p gpu=103 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-13.nancy.grid5000.fr' AND resource_id='9854' AND type='default'" -p cpu=1640 -p core=8730 -p cpuset=7 -p gpu=103 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-13.nancy.grid5000.fr' AND resource_id='9855' AND type='default'" -p cpu=1640 -p core=8731 -p cpuset=9 -p gpu=104 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting --sql "host='clustera-13.nancy.grid5000.fr' AND resource_id='9856' AND type='default'" -p cpu=1640 -p core=8732 -p cpuset=11 -p gpu=104 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting --sql "host='clustera-13.nancy.grid5000.fr' AND resource_id='9857' AND type='default'" -p cpu=1640 -p core=8733 -p cpuset=13 -p gpu=104 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting --sql "host='clustera-13.nancy.grid5000.fr' AND resource_id='9858' AND type='default'" -p cpu=1640 -p core=8734 -p cpuset=15 -p gpu=104 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-13.nancy.grid5000.fr' AND resource_id='9843' AND type='default'" -p cpu=1639 -p core=8719 -p cpuset=0 -p gpu=101 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-13.nancy.grid5000.fr' AND resource_id='9844' AND type='default'" -p cpu=1639 -p core=8720 -p cpuset=2 -p gpu=101 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-13.nancy.grid5000.fr' AND resource_id='9845' AND type='default'" -p cpu=1639 -p core=8721 -p cpuset=4 -p gpu=101 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-13.nancy.grid5000.fr' AND resource_id='9846' AND type='default'" -p cpu=1639 -p core=8722 -p cpuset=6 -p gpu=101 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-13.nancy.grid5000.fr' AND resource_id='9847' AND type='default'" -p cpu=1639 -p core=8723 -p cpuset=8 -p gpu=102 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-13.nancy.grid5000.fr' AND resource_id='9848' AND type='default'" -p cpu=1639 -p core=8724 -p cpuset=10 -p gpu=102 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-13.nancy.grid5000.fr' AND resource_id='9849' AND type='default'" -p cpu=1639 -p core=8725 -p cpuset=12 -p gpu=102 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-13.nancy.grid5000.fr' AND resource_id='9850' AND type='default'" -p cpu=1639 -p core=8726 -p cpuset=14 -p gpu=102 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-13.nancy.grid5000.fr' AND resource_id='9851' AND type='default'" -p cpu=1640 -p core=8727 -p cpuset=1 -p gpu=103 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-13.nancy.grid5000.fr' AND resource_id='9852' AND type='default'" -p cpu=1640 -p core=8728 -p cpuset=3 -p gpu=103 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-13.nancy.grid5000.fr' AND resource_id='9853' AND type='default'" -p cpu=1640 -p core=8729 -p cpuset=5 -p gpu=103 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-13.nancy.grid5000.fr' AND resource_id='9854' AND type='default'" -p cpu=1640 -p core=8730 -p cpuset=7 -p gpu=103 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-13.nancy.grid5000.fr' AND resource_id='9855' AND type='default'" -p cpu=1640 -p core=8731 -p cpuset=9 -p gpu=104 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-13.nancy.grid5000.fr' AND resource_id='9856' AND type='default'" -p cpu=1640 -p core=8732 -p cpuset=11 -p gpu=104 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-13.nancy.grid5000.fr' AND resource_id='9857' AND type='default'" -p cpu=1640 -p core=8733 -p cpuset=13 -p gpu=104 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-13.nancy.grid5000.fr' AND resource_id='9858' AND type='default'" -p cpu=1640 -p core=8734 -p cpuset=15 -p gpu=104 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 echo; echo 'Setting properties for clustera-13.nancy.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-13.nancy.grid5000.fr' and type='default'" -p ip='172.16.64.13' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 7K1CBX2' -p eth_count=1 -p eth_kavlan_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='GeForce RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='NO' -p cluster_priority=201906 -p max_walltime=604800 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
+oarnodesetting --sql "host='clustera-13.nancy.grid5000.fr' and type='default'" -p ip='172.16.64.13' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 7K1CBX2' -p eth_count=1 -p eth_kavlan_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='NO' -p cluster_priority=201906 -p max_walltime=604800 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
 
 echo '================================================================================'
diff --git a/spec/output/graffiti-gpu-removed-OAR-updated-gpu-re-added-OAR-updated_table_stdout.txt b/spec/output/graffiti-gpu-removed-OAR-updated-gpu-re-added-OAR-updated_table_stdout.txt
index 5b7e29d6409..87ec271eaaf 100644
--- a/spec/output/graffiti-gpu-removed-OAR-updated-gpu-re-added-OAR-updated_table_stdout.txt
+++ b/spec/output/graffiti-gpu-removed-OAR-updated-gpu-re-added-OAR-updated_table_stdout.txt
@@ -1,212 +1,212 @@
 +---------- + -------------------- + ----- + ----- + -------- + ---- + -------------------- + ------------------------------ + ------------------------------+
 |   cluster | host                 | cpu   | core  | cpuset   | gpu  | gpudevice            | cpumodel                       | gpumodel                      |
 +---------- + -------------------- + ----- + ----- + -------- + ---- + -------------------- + ------------------------------ + ------------------------------+
-|  clustera | clustera-1           | 1615  | 8527  | 0        | 53   | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 1615  | 8528  | 2        | 53   | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 1615  | 8529  | 4        | 53   | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 1615  | 8530  | 6        | 53   | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 1615  | 8531  | 8        | 54   | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 1615  | 8532  | 10       | 54   | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 1615  | 8533  | 12       | 54   | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 1615  | 8534  | 14       | 54   | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 1616  | 8535  | 1        | 55   | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 1616  | 8536  | 3        | 55   | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 1616  | 8537  | 5        | 55   | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 1616  | 8538  | 7        | 55   | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 1616  | 8539  | 9        | 56   | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 1616  | 8540  | 11       | 56   | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 1616  | 8541  | 13       | 56   | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 1616  | 8542  | 15       | 56   | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 1617  | 8543  | 0        | 57   | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 1617  | 8544  | 2        | 57   | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 1617  | 8545  | 4        | 57   | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 1617  | 8546  | 6        | 57   | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 1617  | 8547  | 8        | 58   | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 1617  | 8548  | 10       | 58   | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 1617  | 8549  | 12       | 58   | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 1617  | 8550  | 14       | 58   | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 1618  | 8551  | 1        | 59   | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 1618  | 8552  | 3        | 59   | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 1618  | 8553  | 5        | 59   | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 1618  | 8554  | 7        | 59   | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 1618  | 8555  | 9        | 60   | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 1618  | 8556  | 11       | 60   | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 1618  | 8557  | 13       | 60   | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 1618  | 8558  | 15       | 60   | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-3           | 1619  | 8559  | 0        | 61   | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-3           | 1619  | 8560  | 2        | 61   | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-3           | 1619  | 8561  | 4        | 61   | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-3           | 1619  | 8562  | 6        | 61   | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-3           | 1619  | 8563  | 8        | 62   | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-3           | 1619  | 8564  | 10       | 62   | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-3           | 1619  | 8565  | 12       | 62   | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-3           | 1619  | 8566  | 14       | 62   | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-3           | 1620  | 8567  | 1        | 63   | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-3           | 1620  | 8568  | 3        | 63   | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-3           | 1620  | 8569  | 5        | 63   | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-3           | 1620  | 8570  | 7        | 63   | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-3           | 1620  | 8571  | 9        | 64   | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-3           | 1620  | 8572  | 11       | 64   | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-3           | 1620  | 8573  | 13       | 64   | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-3           | 1620  | 8574  | 15       | 64   | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-4           | 1621  | 8575  | 0        | 65   | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-4           | 1621  | 8576  | 2        | 65   | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-4           | 1621  | 8577  | 4        | 65   | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-4           | 1621  | 8578  | 6        | 65   | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-4           | 1621  | 8579  | 8        | 66   | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-4           | 1621  | 8580  | 10       | 66   | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-4           | 1621  | 8581  | 12       | 66   | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-4           | 1621  | 8582  | 14       | 66   | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-4           | 1622  | 8583  | 1        | 67   | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-4           | 1622  | 8584  | 3        | 67   | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-4           | 1622  | 8585  | 5        | 67   | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-4           | 1622  | 8586  | 7        | 67   | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-4           | 1622  | 8587  | 9        | 68   | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-4           | 1622  | 8588  | 11       | 68   | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-4           | 1622  | 8589  | 13       | 68   | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-4           | 1622  | 8590  | 15       | 68   | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-5           | 1623  | 8591  | 0        | 69   | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-5           | 1623  | 8592  | 2        | 69   | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-5           | 1623  | 8593  | 4        | 69   | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-5           | 1623  | 8594  | 6        | 69   | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-5           | 1623  | 8595  | 8        | 70   | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-5           | 1623  | 8596  | 10       | 70   | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-5           | 1623  | 8597  | 12       | 70   | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-5           | 1623  | 8598  | 14       | 70   | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-5           | 1624  | 8599  | 1        | 71   | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-5           | 1624  | 8600  | 3        | 71   | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-5           | 1624  | 8601  | 5        | 71   | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-5           | 1624  | 8602  | 7        | 71   | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-5           | 1624  | 8603  | 9        | 72   | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-5           | 1624  | 8604  | 11       | 72   | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-5           | 1624  | 8605  | 13       | 72   | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-5           | 1624  | 8606  | 15       | 72   | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-6           | 1625  | 8607  | 0        | 73   | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-6           | 1625  | 8608  | 2        | 73   | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-6           | 1625  | 8609  | 4        | 73   | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-6           | 1625  | 8610  | 6        | 73   | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-6           | 1625  | 8611  | 8        | 74   | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-6           | 1625  | 8612  | 10       | 74   | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-6           | 1625  | 8613  | 12       | 74   | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-6           | 1625  | 8614  | 14       | 74   | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-6           | 1626  | 8615  | 1        | 75   | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-6           | 1626  | 8616  | 3        | 75   | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-6           | 1626  | 8617  | 5        | 75   | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-6           | 1626  | 8618  | 7        | 75   | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-6           | 1626  | 8619  | 9        | 76   | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-6           | 1626  | 8620  | 11       | 76   | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-6           | 1626  | 8621  | 13       | 76   | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-6           | 1626  | 8622  | 15       | 76   | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-7           | 1627  | 8623  | 0        | 77   | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-7           | 1627  | 8624  | 2        | 77   | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-7           | 1627  | 8625  | 4        | 77   | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-7           | 1627  | 8626  | 6        | 77   | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-7           | 1627  | 8627  | 8        | 78   | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-7           | 1627  | 8628  | 10       | 78   | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-7           | 1627  | 8629  | 12       | 78   | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-7           | 1627  | 8630  | 14       | 78   | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-7           | 1628  | 8631  | 1        | 79   | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-7           | 1628  | 8632  | 3        | 79   | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-7           | 1628  | 8633  | 5        | 79   | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-7           | 1628  | 8634  | 7        | 79   | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-7           | 1628  | 8635  | 9        | 80   | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-7           | 1628  | 8636  | 11       | 80   | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-7           | 1628  | 8637  | 13       | 80   | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-7           | 1628  | 8638  | 15       | 80   | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-8           | 1629  | 8639  | 0        | 81   | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-8           | 1629  | 8640  | 2        | 81   | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-8           | 1629  | 8641  | 4        | 81   | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-8           | 1629  | 8642  | 6        | 81   | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-8           | 1629  | 8643  | 8        | 82   | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-8           | 1629  | 8644  | 10       | 82   | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-8           | 1629  | 8645  | 12       | 82   | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-8           | 1629  | 8646  | 14       | 82   | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-8           | 1630  | 8647  | 1        | 83   | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-8           | 1630  | 8648  | 3        | 83   | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-8           | 1630  | 8649  | 5        | 83   | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-8           | 1630  | 8650  | 7        | 83   | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-8           | 1630  | 8651  | 9        | 84   | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-8           | 1630  | 8652  | 11       | 84   | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-8           | 1630  | 8653  | 13       | 84   | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-8           | 1630  | 8654  | 15       | 84   | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-9           | 1631  | 8655  | 0        | 85   | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-9           | 1631  | 8656  | 2        | 85   | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-9           | 1631  | 8657  | 4        | 85   | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-9           | 1631  | 8658  | 6        | 85   | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-9           | 1631  | 8659  | 8        | 86   | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-9           | 1631  | 8660  | 10       | 86   | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-9           | 1631  | 8661  | 12       | 86   | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-9           | 1631  | 8662  | 14       | 86   | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-9           | 1632  | 8663  | 1        | 87   | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-9           | 1632  | 8664  | 3        | 87   | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-9           | 1632  | 8665  | 5        | 87   | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-9           | 1632  | 8666  | 7        | 87   | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-9           | 1632  | 8667  | 9        | 88   | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-9           | 1632  | 8668  | 11       | 88   | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-9           | 1632  | 8669  | 13       | 88   | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-9           | 1632  | 8670  | 15       | 88   | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-10          | 1633  | 8671  | 0        | 89   | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-10          | 1633  | 8672  | 2        | 89   | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-10          | 1633  | 8673  | 4        | 89   | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-10          | 1633  | 8674  | 6        | 89   | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-10          | 1633  | 8675  | 8        | 90   | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-10          | 1633  | 8676  | 10       | 90   | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-10          | 1633  | 8677  | 12       | 90   | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-10          | 1633  | 8678  | 14       | 90   | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-10          | 1634  | 8679  | 1        | 91   | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-10          | 1634  | 8680  | 3        | 91   | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-10          | 1634  | 8681  | 5        | 91   | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-10          | 1634  | 8682  | 7        | 91   | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-10          | 1634  | 8683  | 9        | 92   | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-10          | 1634  | 8684  | 11       | 92   | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-10          | 1634  | 8685  | 13       | 92   | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-10          | 1634  | 8686  | 15       | 92   | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-11          | 1635  | 8687  | 0        | 93   | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-11          | 1635  | 8688  | 2        | 93   | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-11          | 1635  | 8689  | 4        | 93   | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-11          | 1635  | 8690  | 6        | 93   | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-11          | 1635  | 8691  | 8        | 94   | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-11          | 1635  | 8692  | 10       | 94   | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-11          | 1635  | 8693  | 12       | 94   | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-11          | 1635  | 8694  | 14       | 94   | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-11          | 1636  | 8695  | 1        | 95   | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-11          | 1636  | 8696  | 3        | 95   | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-11          | 1636  | 8697  | 5        | 95   | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-11          | 1636  | 8698  | 7        | 95   | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-11          | 1636  | 8699  | 9        | 96   | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-11          | 1636  | 8700  | 11       | 96   | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-11          | 1636  | 8701  | 13       | 96   | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-11          | 1636  | 8702  | 15       | 96   | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-12          | 1637  | 8703  | 0        | 97   | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-12          | 1637  | 8704  | 2        | 97   | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-12          | 1637  | 8705  | 4        | 97   | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-12          | 1637  | 8706  | 6        | 97   | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-12          | 1637  | 8707  | 8        | 98   | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-12          | 1637  | 8708  | 10       | 98   | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-12          | 1637  | 8709  | 12       | 98   | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-12          | 1637  | 8710  | 14       | 98   | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-12          | 1638  | 8711  | 1        | 99   | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-12          | 1638  | 8712  | 3        | 99   | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-12          | 1638  | 8713  | 5        | 99   | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-12          | 1638  | 8714  | 7        | 99   | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-12          | 1638  | 8715  | 9        | 100  | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-12          | 1638  | 8716  | 11       | 100  | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-12          | 1638  | 8717  | 13       | 100  | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-12          | 1638  | 8718  | 15       | 100  | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-13          | 1639  | 8719  | 0        | 101  | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-13          | 1639  | 8720  | 2        | 101  | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-13          | 1639  | 8721  | 4        | 101  | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-13          | 1639  | 8722  | 6        | 101  | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-13          | 1639  | 8723  | 8        | 102  | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-13          | 1639  | 8724  | 10       | 102  | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-13          | 1639  | 8725  | 12       | 102  | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-13          | 1639  | 8726  | 14       | 102  | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-13          | 1640  | 8727  | 1        | 103  | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-13          | 1640  | 8728  | 3        | 103  | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-13          | 1640  | 8729  | 5        | 103  | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-13          | 1640  | 8730  | 7        | 103  | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-13          | 1640  | 8731  | 9        | 104  | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-13          | 1640  | 8732  | 11       | 104  | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-13          | 1640  | 8733  | 13       | 104  | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-13          | 1640  | 8734  | 15       | 104  | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
+|  clustera | clustera-1           | 1615  | 8527  | 0        | 53   | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 1615  | 8528  | 2        | 53   | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 1615  | 8529  | 4        | 53   | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 1615  | 8530  | 6        | 53   | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 1615  | 8531  | 8        | 54   | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 1615  | 8532  | 10       | 54   | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 1615  | 8533  | 12       | 54   | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 1615  | 8534  | 14       | 54   | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 1616  | 8535  | 1        | 55   | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 1616  | 8536  | 3        | 55   | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 1616  | 8537  | 5        | 55   | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 1616  | 8538  | 7        | 55   | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 1616  | 8539  | 9        | 56   | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 1616  | 8540  | 11       | 56   | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 1616  | 8541  | 13       | 56   | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 1616  | 8542  | 15       | 56   | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 1617  | 8543  | 0        | 57   | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 1617  | 8544  | 2        | 57   | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 1617  | 8545  | 4        | 57   | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 1617  | 8546  | 6        | 57   | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 1617  | 8547  | 8        | 58   | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 1617  | 8548  | 10       | 58   | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 1617  | 8549  | 12       | 58   | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 1617  | 8550  | 14       | 58   | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 1618  | 8551  | 1        | 59   | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 1618  | 8552  | 3        | 59   | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 1618  | 8553  | 5        | 59   | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 1618  | 8554  | 7        | 59   | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 1618  | 8555  | 9        | 60   | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 1618  | 8556  | 11       | 60   | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 1618  | 8557  | 13       | 60   | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 1618  | 8558  | 15       | 60   | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-3           | 1619  | 8559  | 0        | 61   | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-3           | 1619  | 8560  | 2        | 61   | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-3           | 1619  | 8561  | 4        | 61   | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-3           | 1619  | 8562  | 6        | 61   | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-3           | 1619  | 8563  | 8        | 62   | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-3           | 1619  | 8564  | 10       | 62   | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-3           | 1619  | 8565  | 12       | 62   | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-3           | 1619  | 8566  | 14       | 62   | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-3           | 1620  | 8567  | 1        | 63   | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-3           | 1620  | 8568  | 3        | 63   | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-3           | 1620  | 8569  | 5        | 63   | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-3           | 1620  | 8570  | 7        | 63   | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-3           | 1620  | 8571  | 9        | 64   | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-3           | 1620  | 8572  | 11       | 64   | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-3           | 1620  | 8573  | 13       | 64   | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-3           | 1620  | 8574  | 15       | 64   | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-4           | 1621  | 8575  | 0        | 65   | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-4           | 1621  | 8576  | 2        | 65   | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-4           | 1621  | 8577  | 4        | 65   | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-4           | 1621  | 8578  | 6        | 65   | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-4           | 1621  | 8579  | 8        | 66   | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-4           | 1621  | 8580  | 10       | 66   | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-4           | 1621  | 8581  | 12       | 66   | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-4           | 1621  | 8582  | 14       | 66   | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-4           | 1622  | 8583  | 1        | 67   | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-4           | 1622  | 8584  | 3        | 67   | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-4           | 1622  | 8585  | 5        | 67   | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-4           | 1622  | 8586  | 7        | 67   | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-4           | 1622  | 8587  | 9        | 68   | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-4           | 1622  | 8588  | 11       | 68   | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-4           | 1622  | 8589  | 13       | 68   | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-4           | 1622  | 8590  | 15       | 68   | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-5           | 1623  | 8591  | 0        | 69   | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-5           | 1623  | 8592  | 2        | 69   | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-5           | 1623  | 8593  | 4        | 69   | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-5           | 1623  | 8594  | 6        | 69   | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-5           | 1623  | 8595  | 8        | 70   | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-5           | 1623  | 8596  | 10       | 70   | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-5           | 1623  | 8597  | 12       | 70   | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-5           | 1623  | 8598  | 14       | 70   | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-5           | 1624  | 8599  | 1        | 71   | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-5           | 1624  | 8600  | 3        | 71   | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-5           | 1624  | 8601  | 5        | 71   | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-5           | 1624  | 8602  | 7        | 71   | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-5           | 1624  | 8603  | 9        | 72   | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-5           | 1624  | 8604  | 11       | 72   | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-5           | 1624  | 8605  | 13       | 72   | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-5           | 1624  | 8606  | 15       | 72   | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-6           | 1625  | 8607  | 0        | 73   | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-6           | 1625  | 8608  | 2        | 73   | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-6           | 1625  | 8609  | 4        | 73   | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-6           | 1625  | 8610  | 6        | 73   | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-6           | 1625  | 8611  | 8        | 74   | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-6           | 1625  | 8612  | 10       | 74   | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-6           | 1625  | 8613  | 12       | 74   | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-6           | 1625  | 8614  | 14       | 74   | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-6           | 1626  | 8615  | 1        | 75   | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-6           | 1626  | 8616  | 3        | 75   | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-6           | 1626  | 8617  | 5        | 75   | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-6           | 1626  | 8618  | 7        | 75   | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-6           | 1626  | 8619  | 9        | 76   | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-6           | 1626  | 8620  | 11       | 76   | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-6           | 1626  | 8621  | 13       | 76   | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-6           | 1626  | 8622  | 15       | 76   | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-7           | 1627  | 8623  | 0        | 77   | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-7           | 1627  | 8624  | 2        | 77   | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-7           | 1627  | 8625  | 4        | 77   | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-7           | 1627  | 8626  | 6        | 77   | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-7           | 1627  | 8627  | 8        | 78   | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-7           | 1627  | 8628  | 10       | 78   | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-7           | 1627  | 8629  | 12       | 78   | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-7           | 1627  | 8630  | 14       | 78   | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-7           | 1628  | 8631  | 1        | 79   | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-7           | 1628  | 8632  | 3        | 79   | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-7           | 1628  | 8633  | 5        | 79   | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-7           | 1628  | 8634  | 7        | 79   | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-7           | 1628  | 8635  | 9        | 80   | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-7           | 1628  | 8636  | 11       | 80   | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-7           | 1628  | 8637  | 13       | 80   | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-7           | 1628  | 8638  | 15       | 80   | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-8           | 1629  | 8639  | 0        | 81   | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-8           | 1629  | 8640  | 2        | 81   | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-8           | 1629  | 8641  | 4        | 81   | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-8           | 1629  | 8642  | 6        | 81   | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-8           | 1629  | 8643  | 8        | 82   | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-8           | 1629  | 8644  | 10       | 82   | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-8           | 1629  | 8645  | 12       | 82   | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-8           | 1629  | 8646  | 14       | 82   | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-8           | 1630  | 8647  | 1        | 83   | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-8           | 1630  | 8648  | 3        | 83   | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-8           | 1630  | 8649  | 5        | 83   | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-8           | 1630  | 8650  | 7        | 83   | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-8           | 1630  | 8651  | 9        | 84   | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-8           | 1630  | 8652  | 11       | 84   | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-8           | 1630  | 8653  | 13       | 84   | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-8           | 1630  | 8654  | 15       | 84   | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-9           | 1631  | 8655  | 0        | 85   | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-9           | 1631  | 8656  | 2        | 85   | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-9           | 1631  | 8657  | 4        | 85   | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-9           | 1631  | 8658  | 6        | 85   | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-9           | 1631  | 8659  | 8        | 86   | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-9           | 1631  | 8660  | 10       | 86   | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-9           | 1631  | 8661  | 12       | 86   | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-9           | 1631  | 8662  | 14       | 86   | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-9           | 1632  | 8663  | 1        | 87   | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-9           | 1632  | 8664  | 3        | 87   | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-9           | 1632  | 8665  | 5        | 87   | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-9           | 1632  | 8666  | 7        | 87   | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-9           | 1632  | 8667  | 9        | 88   | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-9           | 1632  | 8668  | 11       | 88   | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-9           | 1632  | 8669  | 13       | 88   | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-9           | 1632  | 8670  | 15       | 88   | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-10          | 1633  | 8671  | 0        | 89   | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-10          | 1633  | 8672  | 2        | 89   | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-10          | 1633  | 8673  | 4        | 89   | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-10          | 1633  | 8674  | 6        | 89   | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-10          | 1633  | 8675  | 8        | 90   | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-10          | 1633  | 8676  | 10       | 90   | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-10          | 1633  | 8677  | 12       | 90   | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-10          | 1633  | 8678  | 14       | 90   | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-10          | 1634  | 8679  | 1        | 91   | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-10          | 1634  | 8680  | 3        | 91   | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-10          | 1634  | 8681  | 5        | 91   | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-10          | 1634  | 8682  | 7        | 91   | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-10          | 1634  | 8683  | 9        | 92   | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-10          | 1634  | 8684  | 11       | 92   | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-10          | 1634  | 8685  | 13       | 92   | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-10          | 1634  | 8686  | 15       | 92   | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-11          | 1635  | 8687  | 0        | 93   | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-11          | 1635  | 8688  | 2        | 93   | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-11          | 1635  | 8689  | 4        | 93   | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-11          | 1635  | 8690  | 6        | 93   | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-11          | 1635  | 8691  | 8        | 94   | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-11          | 1635  | 8692  | 10       | 94   | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-11          | 1635  | 8693  | 12       | 94   | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-11          | 1635  | 8694  | 14       | 94   | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-11          | 1636  | 8695  | 1        | 95   | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-11          | 1636  | 8696  | 3        | 95   | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-11          | 1636  | 8697  | 5        | 95   | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-11          | 1636  | 8698  | 7        | 95   | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-11          | 1636  | 8699  | 9        | 96   | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-11          | 1636  | 8700  | 11       | 96   | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-11          | 1636  | 8701  | 13       | 96   | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-11          | 1636  | 8702  | 15       | 96   | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-12          | 1637  | 8703  | 0        | 97   | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-12          | 1637  | 8704  | 2        | 97   | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-12          | 1637  | 8705  | 4        | 97   | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-12          | 1637  | 8706  | 6        | 97   | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-12          | 1637  | 8707  | 8        | 98   | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-12          | 1637  | 8708  | 10       | 98   | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-12          | 1637  | 8709  | 12       | 98   | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-12          | 1637  | 8710  | 14       | 98   | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-12          | 1638  | 8711  | 1        | 99   | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-12          | 1638  | 8712  | 3        | 99   | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-12          | 1638  | 8713  | 5        | 99   | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-12          | 1638  | 8714  | 7        | 99   | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-12          | 1638  | 8715  | 9        | 100  | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-12          | 1638  | 8716  | 11       | 100  | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-12          | 1638  | 8717  | 13       | 100  | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-12          | 1638  | 8718  | 15       | 100  | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-13          | 1639  | 8719  | 0        | 101  | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-13          | 1639  | 8720  | 2        | 101  | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-13          | 1639  | 8721  | 4        | 101  | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-13          | 1639  | 8722  | 6        | 101  | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-13          | 1639  | 8723  | 8        | 102  | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-13          | 1639  | 8724  | 10       | 102  | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-13          | 1639  | 8725  | 12       | 102  | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-13          | 1639  | 8726  | 14       | 102  | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-13          | 1640  | 8727  | 1        | 103  | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-13          | 1640  | 8728  | 3        | 103  | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-13          | 1640  | 8729  | 5        | 103  | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-13          | 1640  | 8730  | 7        | 103  | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-13          | 1640  | 8731  | 9        | 104  | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-13          | 1640  | 8732  | 11       | 104  | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-13          | 1640  | 8733  | 13       | 104  | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-13          | 1640  | 8734  | 15       | 104  | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
 +---------- + -------------------- + ----- + ----- + -------- + ---- + -------------------- + ------------------------------ + ------------------------------+
diff --git a/spec/output/graffiti-gpu-removed-OAR-updated-gpu-re-added_diff_stdout.txt b/spec/output/graffiti-gpu-removed-OAR-updated-gpu-re-added_diff_stdout.txt
index bbf7aa3d08d..d561ecbcfb9 100644
--- a/spec/output/graffiti-gpu-removed-OAR-updated-gpu-re-added_diff_stdout.txt
+++ b/spec/output/graffiti-gpu-removed-OAR-updated-gpu-re-added_diff_stdout.txt
@@ -1,6 +1,6 @@
 Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for added, ['~', 'key', 'old value', 'new value'] for changed
   clustera-1:
-    ["~", "gpu_model", "RTX 2080 Ti", "GeForce RTX 2080 Ti"]
+    ["~", "gpu_model", "RTX 2080 Ti", "NVIDIA GeForce RTX 2080 Ti"]
     ["~", "wattmeter", "MULTIPLE", "NO"]
     ["+", "core_count", 16]
     ["+", "cpu_count", 2]
@@ -8,14 +8,14 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "thread_count", 32]
   clustera-2:
     ["~", "gpu_count", 3, 4]
-    ["~", "gpu_model", "RTX 2080 Ti", "GeForce RTX 2080 Ti"]
+    ["~", "gpu_model", "RTX 2080 Ti", "NVIDIA GeForce RTX 2080 Ti"]
     ["~", "wattmeter", "MULTIPLE", "NO"]
     ["+", "core_count", 16]
     ["+", "cpu_count", 2]
     ["+", "eth_kavlan_count", 1]
     ["+", "thread_count", 32]
   clustera-3:
-    ["~", "gpu_model", "RTX 2080 Ti", "GeForce RTX 2080 Ti"]
+    ["~", "gpu_model", "RTX 2080 Ti", "NVIDIA GeForce RTX 2080 Ti"]
     ["~", "wattmeter", "MULTIPLE", "NO"]
     ["+", "core_count", 16]
     ["+", "cpu_count", 2]
diff --git a/spec/output/graffiti-gpu-removed-OAR-updated-gpu-re-added_print_stdout.txt b/spec/output/graffiti-gpu-removed-OAR-updated-gpu-re-added_print_stdout.txt
index 2434d82fc33..5832b0a9fa5 100644
--- a/spec/output/graffiti-gpu-removed-OAR-updated-gpu-re-added_print_stdout.txt
+++ b/spec/output/graffiti-gpu-removed-OAR-updated-gpu-re-added_print_stdout.txt
@@ -93,24 +93,24 @@ property_exist 'disk_reservation_count' || oarproperty -a disk_reservation_count
 ###################################
 # clustera-1.nancy.grid5000.fr
 ###################################
-oarnodesetting --sql "host='clustera-1.nancy.grid5000.fr' AND resource_id='9651' AND type='default'" -p cpu=1615 -p core=8527 -p cpuset=0 -p gpu=53 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-1.nancy.grid5000.fr' AND resource_id='9652' AND type='default'" -p cpu=1615 -p core=8528 -p cpuset=2 -p gpu=53 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-1.nancy.grid5000.fr' AND resource_id='9653' AND type='default'" -p cpu=1615 -p core=8529 -p cpuset=4 -p gpu=53 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-1.nancy.grid5000.fr' AND resource_id='9654' AND type='default'" -p cpu=1615 -p core=8530 -p cpuset=6 -p gpu=53 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-1.nancy.grid5000.fr' AND resource_id='9655' AND type='default'" -p cpu=1615 -p core=8531 -p cpuset=8 -p gpu=54 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-1.nancy.grid5000.fr' AND resource_id='9656' AND type='default'" -p cpu=1615 -p core=8532 -p cpuset=10 -p gpu=54 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-1.nancy.grid5000.fr' AND resource_id='9657' AND type='default'" -p cpu=1615 -p core=8533 -p cpuset=12 -p gpu=54 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-1.nancy.grid5000.fr' AND resource_id='9658' AND type='default'" -p cpu=1615 -p core=8534 -p cpuset=14 -p gpu=54 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-1.nancy.grid5000.fr' AND resource_id='9659' AND type='default'" -p cpu=1616 -p core=8535 -p cpuset=1 -p gpu=55 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-1.nancy.grid5000.fr' AND resource_id='9660' AND type='default'" -p cpu=1616 -p core=8536 -p cpuset=3 -p gpu=55 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-1.nancy.grid5000.fr' AND resource_id='9661' AND type='default'" -p cpu=1616 -p core=8537 -p cpuset=5 -p gpu=55 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-1.nancy.grid5000.fr' AND resource_id='9662' AND type='default'" -p cpu=1616 -p core=8538 -p cpuset=7 -p gpu=55 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-1.nancy.grid5000.fr' AND resource_id='9663' AND type='default'" -p cpu=1616 -p core=8539 -p cpuset=9 -p gpu=56 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting --sql "host='clustera-1.nancy.grid5000.fr' AND resource_id='9664' AND type='default'" -p cpu=1616 -p core=8540 -p cpuset=11 -p gpu=56 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting --sql "host='clustera-1.nancy.grid5000.fr' AND resource_id='9665' AND type='default'" -p cpu=1616 -p core=8541 -p cpuset=13 -p gpu=56 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting --sql "host='clustera-1.nancy.grid5000.fr' AND resource_id='9666' AND type='default'" -p cpu=1616 -p core=8542 -p cpuset=15 -p gpu=56 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-1.nancy.grid5000.fr' AND resource_id='9651' AND type='default'" -p cpu=1615 -p core=8527 -p cpuset=0 -p gpu=53 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-1.nancy.grid5000.fr' AND resource_id='9652' AND type='default'" -p cpu=1615 -p core=8528 -p cpuset=2 -p gpu=53 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-1.nancy.grid5000.fr' AND resource_id='9653' AND type='default'" -p cpu=1615 -p core=8529 -p cpuset=4 -p gpu=53 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-1.nancy.grid5000.fr' AND resource_id='9654' AND type='default'" -p cpu=1615 -p core=8530 -p cpuset=6 -p gpu=53 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-1.nancy.grid5000.fr' AND resource_id='9655' AND type='default'" -p cpu=1615 -p core=8531 -p cpuset=8 -p gpu=54 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-1.nancy.grid5000.fr' AND resource_id='9656' AND type='default'" -p cpu=1615 -p core=8532 -p cpuset=10 -p gpu=54 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-1.nancy.grid5000.fr' AND resource_id='9657' AND type='default'" -p cpu=1615 -p core=8533 -p cpuset=12 -p gpu=54 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-1.nancy.grid5000.fr' AND resource_id='9658' AND type='default'" -p cpu=1615 -p core=8534 -p cpuset=14 -p gpu=54 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-1.nancy.grid5000.fr' AND resource_id='9659' AND type='default'" -p cpu=1616 -p core=8535 -p cpuset=1 -p gpu=55 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-1.nancy.grid5000.fr' AND resource_id='9660' AND type='default'" -p cpu=1616 -p core=8536 -p cpuset=3 -p gpu=55 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-1.nancy.grid5000.fr' AND resource_id='9661' AND type='default'" -p cpu=1616 -p core=8537 -p cpuset=5 -p gpu=55 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-1.nancy.grid5000.fr' AND resource_id='9662' AND type='default'" -p cpu=1616 -p core=8538 -p cpuset=7 -p gpu=55 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-1.nancy.grid5000.fr' AND resource_id='9663' AND type='default'" -p cpu=1616 -p core=8539 -p cpuset=9 -p gpu=56 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-1.nancy.grid5000.fr' AND resource_id='9664' AND type='default'" -p cpu=1616 -p core=8540 -p cpuset=11 -p gpu=56 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-1.nancy.grid5000.fr' AND resource_id='9665' AND type='default'" -p cpu=1616 -p core=8541 -p cpuset=13 -p gpu=56 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-1.nancy.grid5000.fr' AND resource_id='9666' AND type='default'" -p cpu=1616 -p core=8542 -p cpuset=15 -p gpu=56 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 echo; echo 'Setting properties for clustera-1.nancy.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-1.nancy.grid5000.fr' and type='default'" -p ip='172.16.64.1' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 FL1CBX2' -p eth_count=1 -p eth_kavlan_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='GeForce RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='NO' -p cluster_priority=201906 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
+oarnodesetting --sql "host='clustera-1.nancy.grid5000.fr' and type='default'" -p ip='172.16.64.1' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 FL1CBX2' -p eth_count=1 -p eth_kavlan_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='NO' -p cluster_priority=201906 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
 
 echo '================================================================================'
 
@@ -118,24 +118,24 @@ echo '==========================================================================
 ###################################
 # clustera-2.nancy.grid5000.fr
 ###################################
-oarnodesetting --sql "host='clustera-2.nancy.grid5000.fr' AND resource_id='9667' AND type='default'" -p cpu=1617 -p core=8543 -p cpuset=0 -p gpu=57 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-2.nancy.grid5000.fr' AND resource_id='9668' AND type='default'" -p cpu=1617 -p core=8544 -p cpuset=2 -p gpu=57 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-2.nancy.grid5000.fr' AND resource_id='9669' AND type='default'" -p cpu=1617 -p core=8545 -p cpuset=4 -p gpu=57 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-2.nancy.grid5000.fr' AND resource_id='9670' AND type='default'" -p cpu=1617 -p core=8546 -p cpuset=6 -p gpu=57 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-2.nancy.grid5000.fr' AND resource_id='9671' AND type='default'" -p cpu=1617 -p core=8547 -p cpuset=8 -p gpu=58 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-2.nancy.grid5000.fr' AND resource_id='9672' AND type='default'" -p cpu=1617 -p core=8548 -p cpuset=10 -p gpu=58 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-2.nancy.grid5000.fr' AND resource_id='9673' AND type='default'" -p cpu=1617 -p core=8549 -p cpuset=12 -p gpu=58 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-2.nancy.grid5000.fr' AND resource_id='9674' AND type='default'" -p cpu=1617 -p core=8550 -p cpuset=14 -p gpu=58 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-2.nancy.grid5000.fr' AND resource_id='9675' AND type='default'" -p cpu=1618 -p core=8551 -p cpuset=1 -p gpu=59 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-2.nancy.grid5000.fr' AND resource_id='9676' AND type='default'" -p cpu=1618 -p core=8552 -p cpuset=3 -p gpu=59 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-2.nancy.grid5000.fr' AND resource_id='9677' AND type='default'" -p cpu=1618 -p core=8553 -p cpuset=5 -p gpu=59 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-2.nancy.grid5000.fr' AND resource_id='9678' AND type='default'" -p cpu=1618 -p core=8554 -p cpuset=7 -p gpu=59 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-2.nancy.grid5000.fr' AND resource_id='9679' AND type='default'" -p cpu=1618 -p core=8555 -p cpuset=9 -p gpu=60 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting --sql "host='clustera-2.nancy.grid5000.fr' AND resource_id='9680' AND type='default'" -p cpu=1618 -p core=8556 -p cpuset=11 -p gpu=60 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting --sql "host='clustera-2.nancy.grid5000.fr' AND resource_id='9681' AND type='default'" -p cpu=1618 -p core=8557 -p cpuset=13 -p gpu=60 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting --sql "host='clustera-2.nancy.grid5000.fr' AND resource_id='9682' AND type='default'" -p cpu=1618 -p core=8558 -p cpuset=15 -p gpu=60 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-2.nancy.grid5000.fr' AND resource_id='9667' AND type='default'" -p cpu=1617 -p core=8543 -p cpuset=0 -p gpu=57 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-2.nancy.grid5000.fr' AND resource_id='9668' AND type='default'" -p cpu=1617 -p core=8544 -p cpuset=2 -p gpu=57 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-2.nancy.grid5000.fr' AND resource_id='9669' AND type='default'" -p cpu=1617 -p core=8545 -p cpuset=4 -p gpu=57 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-2.nancy.grid5000.fr' AND resource_id='9670' AND type='default'" -p cpu=1617 -p core=8546 -p cpuset=6 -p gpu=57 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-2.nancy.grid5000.fr' AND resource_id='9671' AND type='default'" -p cpu=1617 -p core=8547 -p cpuset=8 -p gpu=58 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-2.nancy.grid5000.fr' AND resource_id='9672' AND type='default'" -p cpu=1617 -p core=8548 -p cpuset=10 -p gpu=58 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-2.nancy.grid5000.fr' AND resource_id='9673' AND type='default'" -p cpu=1617 -p core=8549 -p cpuset=12 -p gpu=58 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-2.nancy.grid5000.fr' AND resource_id='9674' AND type='default'" -p cpu=1617 -p core=8550 -p cpuset=14 -p gpu=58 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-2.nancy.grid5000.fr' AND resource_id='9675' AND type='default'" -p cpu=1618 -p core=8551 -p cpuset=1 -p gpu=59 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-2.nancy.grid5000.fr' AND resource_id='9676' AND type='default'" -p cpu=1618 -p core=8552 -p cpuset=3 -p gpu=59 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-2.nancy.grid5000.fr' AND resource_id='9677' AND type='default'" -p cpu=1618 -p core=8553 -p cpuset=5 -p gpu=59 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-2.nancy.grid5000.fr' AND resource_id='9678' AND type='default'" -p cpu=1618 -p core=8554 -p cpuset=7 -p gpu=59 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-2.nancy.grid5000.fr' AND resource_id='9679' AND type='default'" -p cpu=1618 -p core=8555 -p cpuset=9 -p gpu=60 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-2.nancy.grid5000.fr' AND resource_id='9680' AND type='default'" -p cpu=1618 -p core=8556 -p cpuset=11 -p gpu=60 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-2.nancy.grid5000.fr' AND resource_id='9681' AND type='default'" -p cpu=1618 -p core=8557 -p cpuset=13 -p gpu=60 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-2.nancy.grid5000.fr' AND resource_id='9682' AND type='default'" -p cpu=1618 -p core=8558 -p cpuset=15 -p gpu=60 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 echo; echo 'Setting properties for clustera-2.nancy.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-2.nancy.grid5000.fr' and type='default'" -p ip='172.16.64.2' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 9L1CBX2' -p eth_count=1 -p eth_kavlan_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='GeForce RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='NO' -p cluster_priority=201906 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
+oarnodesetting --sql "host='clustera-2.nancy.grid5000.fr' and type='default'" -p ip='172.16.64.2' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 9L1CBX2' -p eth_count=1 -p eth_kavlan_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='NO' -p cluster_priority=201906 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
 
 echo '================================================================================'
 
@@ -143,24 +143,24 @@ echo '==========================================================================
 ###################################
 # clustera-3.nancy.grid5000.fr
 ###################################
-oarnodesetting --sql "host='clustera-3.nancy.grid5000.fr' AND resource_id='9683' AND type='default'" -p cpu=1619 -p core=8559 -p cpuset=0 -p gpu=61 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-3.nancy.grid5000.fr' AND resource_id='9684' AND type='default'" -p cpu=1619 -p core=8560 -p cpuset=2 -p gpu=61 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-3.nancy.grid5000.fr' AND resource_id='9685' AND type='default'" -p cpu=1619 -p core=8561 -p cpuset=4 -p gpu=61 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-3.nancy.grid5000.fr' AND resource_id='9686' AND type='default'" -p cpu=1619 -p core=8562 -p cpuset=6 -p gpu=61 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-3.nancy.grid5000.fr' AND resource_id='9687' AND type='default'" -p cpu=1619 -p core=8563 -p cpuset=8 -p gpu=62 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-3.nancy.grid5000.fr' AND resource_id='9688' AND type='default'" -p cpu=1619 -p core=8564 -p cpuset=10 -p gpu=62 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-3.nancy.grid5000.fr' AND resource_id='9689' AND type='default'" -p cpu=1619 -p core=8565 -p cpuset=12 -p gpu=62 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-3.nancy.grid5000.fr' AND resource_id='9690' AND type='default'" -p cpu=1619 -p core=8566 -p cpuset=14 -p gpu=62 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-3.nancy.grid5000.fr' AND resource_id='9691' AND type='default'" -p cpu=1620 -p core=8567 -p cpuset=1 -p gpu=63 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-3.nancy.grid5000.fr' AND resource_id='9692' AND type='default'" -p cpu=1620 -p core=8568 -p cpuset=3 -p gpu=63 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-3.nancy.grid5000.fr' AND resource_id='9693' AND type='default'" -p cpu=1620 -p core=8569 -p cpuset=5 -p gpu=63 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-3.nancy.grid5000.fr' AND resource_id='9694' AND type='default'" -p cpu=1620 -p core=8570 -p cpuset=7 -p gpu=63 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-3.nancy.grid5000.fr' AND resource_id='9695' AND type='default'" -p cpu=1620 -p core=8571 -p cpuset=9 -p gpu=64 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting --sql "host='clustera-3.nancy.grid5000.fr' AND resource_id='9696' AND type='default'" -p cpu=1620 -p core=8572 -p cpuset=11 -p gpu=64 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting --sql "host='clustera-3.nancy.grid5000.fr' AND resource_id='9697' AND type='default'" -p cpu=1620 -p core=8573 -p cpuset=13 -p gpu=64 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting --sql "host='clustera-3.nancy.grid5000.fr' AND resource_id='9698' AND type='default'" -p cpu=1620 -p core=8574 -p cpuset=15 -p gpu=64 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-3.nancy.grid5000.fr' AND resource_id='9683' AND type='default'" -p cpu=1619 -p core=8559 -p cpuset=0 -p gpu=61 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-3.nancy.grid5000.fr' AND resource_id='9684' AND type='default'" -p cpu=1619 -p core=8560 -p cpuset=2 -p gpu=61 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-3.nancy.grid5000.fr' AND resource_id='9685' AND type='default'" -p cpu=1619 -p core=8561 -p cpuset=4 -p gpu=61 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-3.nancy.grid5000.fr' AND resource_id='9686' AND type='default'" -p cpu=1619 -p core=8562 -p cpuset=6 -p gpu=61 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-3.nancy.grid5000.fr' AND resource_id='9687' AND type='default'" -p cpu=1619 -p core=8563 -p cpuset=8 -p gpu=62 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-3.nancy.grid5000.fr' AND resource_id='9688' AND type='default'" -p cpu=1619 -p core=8564 -p cpuset=10 -p gpu=62 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-3.nancy.grid5000.fr' AND resource_id='9689' AND type='default'" -p cpu=1619 -p core=8565 -p cpuset=12 -p gpu=62 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-3.nancy.grid5000.fr' AND resource_id='9690' AND type='default'" -p cpu=1619 -p core=8566 -p cpuset=14 -p gpu=62 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-3.nancy.grid5000.fr' AND resource_id='9691' AND type='default'" -p cpu=1620 -p core=8567 -p cpuset=1 -p gpu=63 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-3.nancy.grid5000.fr' AND resource_id='9692' AND type='default'" -p cpu=1620 -p core=8568 -p cpuset=3 -p gpu=63 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-3.nancy.grid5000.fr' AND resource_id='9693' AND type='default'" -p cpu=1620 -p core=8569 -p cpuset=5 -p gpu=63 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-3.nancy.grid5000.fr' AND resource_id='9694' AND type='default'" -p cpu=1620 -p core=8570 -p cpuset=7 -p gpu=63 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-3.nancy.grid5000.fr' AND resource_id='9695' AND type='default'" -p cpu=1620 -p core=8571 -p cpuset=9 -p gpu=64 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-3.nancy.grid5000.fr' AND resource_id='9696' AND type='default'" -p cpu=1620 -p core=8572 -p cpuset=11 -p gpu=64 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-3.nancy.grid5000.fr' AND resource_id='9697' AND type='default'" -p cpu=1620 -p core=8573 -p cpuset=13 -p gpu=64 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-3.nancy.grid5000.fr' AND resource_id='9698' AND type='default'" -p cpu=1620 -p core=8574 -p cpuset=15 -p gpu=64 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 echo; echo 'Setting properties for clustera-3.nancy.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-3.nancy.grid5000.fr' and type='default'" -p ip='172.16.64.3' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 BL1CBX2' -p eth_count=1 -p eth_kavlan_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='GeForce RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='NO' -p cluster_priority=201906 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
+oarnodesetting --sql "host='clustera-3.nancy.grid5000.fr' and type='default'" -p ip='172.16.64.3' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 BL1CBX2' -p eth_count=1 -p eth_kavlan_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='NO' -p cluster_priority=201906 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
 
 echo '================================================================================'
 
@@ -168,24 +168,24 @@ echo '==========================================================================
 ###################################
 # clustera-4.nancy.grid5000.fr
 ###################################
-oarnodesetting --sql "host='clustera-4.nancy.grid5000.fr' AND resource_id='9699' AND type='default'" -p cpu=1621 -p core=8575 -p cpuset=0 -p gpu=65 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-4.nancy.grid5000.fr' AND resource_id='9700' AND type='default'" -p cpu=1621 -p core=8576 -p cpuset=2 -p gpu=65 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-4.nancy.grid5000.fr' AND resource_id='9701' AND type='default'" -p cpu=1621 -p core=8577 -p cpuset=4 -p gpu=65 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-4.nancy.grid5000.fr' AND resource_id='9702' AND type='default'" -p cpu=1621 -p core=8578 -p cpuset=6 -p gpu=65 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-4.nancy.grid5000.fr' AND resource_id='9703' AND type='default'" -p cpu=1621 -p core=8579 -p cpuset=8 -p gpu=66 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-4.nancy.grid5000.fr' AND resource_id='9704' AND type='default'" -p cpu=1621 -p core=8580 -p cpuset=10 -p gpu=66 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-4.nancy.grid5000.fr' AND resource_id='9705' AND type='default'" -p cpu=1621 -p core=8581 -p cpuset=12 -p gpu=66 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-4.nancy.grid5000.fr' AND resource_id='9706' AND type='default'" -p cpu=1621 -p core=8582 -p cpuset=14 -p gpu=66 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-4.nancy.grid5000.fr' AND resource_id='9707' AND type='default'" -p cpu=1622 -p core=8583 -p cpuset=1 -p gpu=67 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-4.nancy.grid5000.fr' AND resource_id='9708' AND type='default'" -p cpu=1622 -p core=8584 -p cpuset=3 -p gpu=67 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-4.nancy.grid5000.fr' AND resource_id='9709' AND type='default'" -p cpu=1622 -p core=8585 -p cpuset=5 -p gpu=67 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-4.nancy.grid5000.fr' AND resource_id='9710' AND type='default'" -p cpu=1622 -p core=8586 -p cpuset=7 -p gpu=67 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-4.nancy.grid5000.fr' AND resource_id='9711' AND type='default'" -p cpu=1622 -p core=8587 -p cpuset=9 -p gpu=68 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting --sql "host='clustera-4.nancy.grid5000.fr' AND resource_id='9712' AND type='default'" -p cpu=1622 -p core=8588 -p cpuset=11 -p gpu=68 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting --sql "host='clustera-4.nancy.grid5000.fr' AND resource_id='9713' AND type='default'" -p cpu=1622 -p core=8589 -p cpuset=13 -p gpu=68 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting --sql "host='clustera-4.nancy.grid5000.fr' AND resource_id='9714' AND type='default'" -p cpu=1622 -p core=8590 -p cpuset=15 -p gpu=68 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-4.nancy.grid5000.fr' AND resource_id='9699' AND type='default'" -p cpu=1621 -p core=8575 -p cpuset=0 -p gpu=65 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-4.nancy.grid5000.fr' AND resource_id='9700' AND type='default'" -p cpu=1621 -p core=8576 -p cpuset=2 -p gpu=65 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-4.nancy.grid5000.fr' AND resource_id='9701' AND type='default'" -p cpu=1621 -p core=8577 -p cpuset=4 -p gpu=65 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-4.nancy.grid5000.fr' AND resource_id='9702' AND type='default'" -p cpu=1621 -p core=8578 -p cpuset=6 -p gpu=65 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-4.nancy.grid5000.fr' AND resource_id='9703' AND type='default'" -p cpu=1621 -p core=8579 -p cpuset=8 -p gpu=66 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-4.nancy.grid5000.fr' AND resource_id='9704' AND type='default'" -p cpu=1621 -p core=8580 -p cpuset=10 -p gpu=66 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-4.nancy.grid5000.fr' AND resource_id='9705' AND type='default'" -p cpu=1621 -p core=8581 -p cpuset=12 -p gpu=66 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-4.nancy.grid5000.fr' AND resource_id='9706' AND type='default'" -p cpu=1621 -p core=8582 -p cpuset=14 -p gpu=66 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-4.nancy.grid5000.fr' AND resource_id='9707' AND type='default'" -p cpu=1622 -p core=8583 -p cpuset=1 -p gpu=67 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-4.nancy.grid5000.fr' AND resource_id='9708' AND type='default'" -p cpu=1622 -p core=8584 -p cpuset=3 -p gpu=67 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-4.nancy.grid5000.fr' AND resource_id='9709' AND type='default'" -p cpu=1622 -p core=8585 -p cpuset=5 -p gpu=67 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-4.nancy.grid5000.fr' AND resource_id='9710' AND type='default'" -p cpu=1622 -p core=8586 -p cpuset=7 -p gpu=67 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-4.nancy.grid5000.fr' AND resource_id='9711' AND type='default'" -p cpu=1622 -p core=8587 -p cpuset=9 -p gpu=68 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-4.nancy.grid5000.fr' AND resource_id='9712' AND type='default'" -p cpu=1622 -p core=8588 -p cpuset=11 -p gpu=68 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-4.nancy.grid5000.fr' AND resource_id='9713' AND type='default'" -p cpu=1622 -p core=8589 -p cpuset=13 -p gpu=68 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-4.nancy.grid5000.fr' AND resource_id='9714' AND type='default'" -p cpu=1622 -p core=8590 -p cpuset=15 -p gpu=68 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 echo; echo 'Setting properties for clustera-4.nancy.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-4.nancy.grid5000.fr' and type='default'" -p ip='172.16.64.4' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 DL1CBX2' -p eth_count=1 -p eth_kavlan_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='GeForce RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='NO' -p cluster_priority=201906 -p max_walltime=172800 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
+oarnodesetting --sql "host='clustera-4.nancy.grid5000.fr' and type='default'" -p ip='172.16.64.4' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 DL1CBX2' -p eth_count=1 -p eth_kavlan_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='NO' -p cluster_priority=201906 -p max_walltime=172800 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
 
 echo '================================================================================'
 
@@ -193,24 +193,24 @@ echo '==========================================================================
 ###################################
 # clustera-5.nancy.grid5000.fr
 ###################################
-oarnodesetting --sql "host='clustera-5.nancy.grid5000.fr' AND resource_id='9715' AND type='default'" -p cpu=1623 -p core=8591 -p cpuset=0 -p gpu=69 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-5.nancy.grid5000.fr' AND resource_id='9716' AND type='default'" -p cpu=1623 -p core=8592 -p cpuset=2 -p gpu=69 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-5.nancy.grid5000.fr' AND resource_id='9717' AND type='default'" -p cpu=1623 -p core=8593 -p cpuset=4 -p gpu=69 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-5.nancy.grid5000.fr' AND resource_id='9718' AND type='default'" -p cpu=1623 -p core=8594 -p cpuset=6 -p gpu=69 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-5.nancy.grid5000.fr' AND resource_id='9719' AND type='default'" -p cpu=1623 -p core=8595 -p cpuset=8 -p gpu=70 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-5.nancy.grid5000.fr' AND resource_id='9720' AND type='default'" -p cpu=1623 -p core=8596 -p cpuset=10 -p gpu=70 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-5.nancy.grid5000.fr' AND resource_id='9721' AND type='default'" -p cpu=1623 -p core=8597 -p cpuset=12 -p gpu=70 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-5.nancy.grid5000.fr' AND resource_id='9722' AND type='default'" -p cpu=1623 -p core=8598 -p cpuset=14 -p gpu=70 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-5.nancy.grid5000.fr' AND resource_id='9723' AND type='default'" -p cpu=1624 -p core=8599 -p cpuset=1 -p gpu=71 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-5.nancy.grid5000.fr' AND resource_id='9724' AND type='default'" -p cpu=1624 -p core=8600 -p cpuset=3 -p gpu=71 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-5.nancy.grid5000.fr' AND resource_id='9725' AND type='default'" -p cpu=1624 -p core=8601 -p cpuset=5 -p gpu=71 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-5.nancy.grid5000.fr' AND resource_id='9726' AND type='default'" -p cpu=1624 -p core=8602 -p cpuset=7 -p gpu=71 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-5.nancy.grid5000.fr' AND resource_id='9727' AND type='default'" -p cpu=1624 -p core=8603 -p cpuset=9 -p gpu=72 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting --sql "host='clustera-5.nancy.grid5000.fr' AND resource_id='9728' AND type='default'" -p cpu=1624 -p core=8604 -p cpuset=11 -p gpu=72 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting --sql "host='clustera-5.nancy.grid5000.fr' AND resource_id='9729' AND type='default'" -p cpu=1624 -p core=8605 -p cpuset=13 -p gpu=72 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting --sql "host='clustera-5.nancy.grid5000.fr' AND resource_id='9730' AND type='default'" -p cpu=1624 -p core=8606 -p cpuset=15 -p gpu=72 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-5.nancy.grid5000.fr' AND resource_id='9715' AND type='default'" -p cpu=1623 -p core=8591 -p cpuset=0 -p gpu=69 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-5.nancy.grid5000.fr' AND resource_id='9716' AND type='default'" -p cpu=1623 -p core=8592 -p cpuset=2 -p gpu=69 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-5.nancy.grid5000.fr' AND resource_id='9717' AND type='default'" -p cpu=1623 -p core=8593 -p cpuset=4 -p gpu=69 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-5.nancy.grid5000.fr' AND resource_id='9718' AND type='default'" -p cpu=1623 -p core=8594 -p cpuset=6 -p gpu=69 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-5.nancy.grid5000.fr' AND resource_id='9719' AND type='default'" -p cpu=1623 -p core=8595 -p cpuset=8 -p gpu=70 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-5.nancy.grid5000.fr' AND resource_id='9720' AND type='default'" -p cpu=1623 -p core=8596 -p cpuset=10 -p gpu=70 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-5.nancy.grid5000.fr' AND resource_id='9721' AND type='default'" -p cpu=1623 -p core=8597 -p cpuset=12 -p gpu=70 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-5.nancy.grid5000.fr' AND resource_id='9722' AND type='default'" -p cpu=1623 -p core=8598 -p cpuset=14 -p gpu=70 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-5.nancy.grid5000.fr' AND resource_id='9723' AND type='default'" -p cpu=1624 -p core=8599 -p cpuset=1 -p gpu=71 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-5.nancy.grid5000.fr' AND resource_id='9724' AND type='default'" -p cpu=1624 -p core=8600 -p cpuset=3 -p gpu=71 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-5.nancy.grid5000.fr' AND resource_id='9725' AND type='default'" -p cpu=1624 -p core=8601 -p cpuset=5 -p gpu=71 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-5.nancy.grid5000.fr' AND resource_id='9726' AND type='default'" -p cpu=1624 -p core=8602 -p cpuset=7 -p gpu=71 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-5.nancy.grid5000.fr' AND resource_id='9727' AND type='default'" -p cpu=1624 -p core=8603 -p cpuset=9 -p gpu=72 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-5.nancy.grid5000.fr' AND resource_id='9728' AND type='default'" -p cpu=1624 -p core=8604 -p cpuset=11 -p gpu=72 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-5.nancy.grid5000.fr' AND resource_id='9729' AND type='default'" -p cpu=1624 -p core=8605 -p cpuset=13 -p gpu=72 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-5.nancy.grid5000.fr' AND resource_id='9730' AND type='default'" -p cpu=1624 -p core=8606 -p cpuset=15 -p gpu=72 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 echo; echo 'Setting properties for clustera-5.nancy.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-5.nancy.grid5000.fr' and type='default'" -p ip='172.16.64.5' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 CL1CBX2' -p eth_count=1 -p eth_kavlan_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='GeForce RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='NO' -p cluster_priority=201906 -p max_walltime=172800 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
+oarnodesetting --sql "host='clustera-5.nancy.grid5000.fr' and type='default'" -p ip='172.16.64.5' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 CL1CBX2' -p eth_count=1 -p eth_kavlan_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='NO' -p cluster_priority=201906 -p max_walltime=172800 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
 
 echo '================================================================================'
 
@@ -218,24 +218,24 @@ echo '==========================================================================
 ###################################
 # clustera-6.nancy.grid5000.fr
 ###################################
-oarnodesetting --sql "host='clustera-6.nancy.grid5000.fr' AND resource_id='9731' AND type='default'" -p cpu=1625 -p core=8607 -p cpuset=0 -p gpu=73 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-6.nancy.grid5000.fr' AND resource_id='9732' AND type='default'" -p cpu=1625 -p core=8608 -p cpuset=2 -p gpu=73 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-6.nancy.grid5000.fr' AND resource_id='9733' AND type='default'" -p cpu=1625 -p core=8609 -p cpuset=4 -p gpu=73 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-6.nancy.grid5000.fr' AND resource_id='9734' AND type='default'" -p cpu=1625 -p core=8610 -p cpuset=6 -p gpu=73 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-6.nancy.grid5000.fr' AND resource_id='9735' AND type='default'" -p cpu=1625 -p core=8611 -p cpuset=8 -p gpu=74 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-6.nancy.grid5000.fr' AND resource_id='9736' AND type='default'" -p cpu=1625 -p core=8612 -p cpuset=10 -p gpu=74 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-6.nancy.grid5000.fr' AND resource_id='9737' AND type='default'" -p cpu=1625 -p core=8613 -p cpuset=12 -p gpu=74 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-6.nancy.grid5000.fr' AND resource_id='9738' AND type='default'" -p cpu=1625 -p core=8614 -p cpuset=14 -p gpu=74 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-6.nancy.grid5000.fr' AND resource_id='9739' AND type='default'" -p cpu=1626 -p core=8615 -p cpuset=1 -p gpu=75 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-6.nancy.grid5000.fr' AND resource_id='9740' AND type='default'" -p cpu=1626 -p core=8616 -p cpuset=3 -p gpu=75 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-6.nancy.grid5000.fr' AND resource_id='9741' AND type='default'" -p cpu=1626 -p core=8617 -p cpuset=5 -p gpu=75 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-6.nancy.grid5000.fr' AND resource_id='9742' AND type='default'" -p cpu=1626 -p core=8618 -p cpuset=7 -p gpu=75 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-6.nancy.grid5000.fr' AND resource_id='9743' AND type='default'" -p cpu=1626 -p core=8619 -p cpuset=9 -p gpu=76 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting --sql "host='clustera-6.nancy.grid5000.fr' AND resource_id='9744' AND type='default'" -p cpu=1626 -p core=8620 -p cpuset=11 -p gpu=76 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting --sql "host='clustera-6.nancy.grid5000.fr' AND resource_id='9745' AND type='default'" -p cpu=1626 -p core=8621 -p cpuset=13 -p gpu=76 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting --sql "host='clustera-6.nancy.grid5000.fr' AND resource_id='9746' AND type='default'" -p cpu=1626 -p core=8622 -p cpuset=15 -p gpu=76 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-6.nancy.grid5000.fr' AND resource_id='9731' AND type='default'" -p cpu=1625 -p core=8607 -p cpuset=0 -p gpu=73 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-6.nancy.grid5000.fr' AND resource_id='9732' AND type='default'" -p cpu=1625 -p core=8608 -p cpuset=2 -p gpu=73 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-6.nancy.grid5000.fr' AND resource_id='9733' AND type='default'" -p cpu=1625 -p core=8609 -p cpuset=4 -p gpu=73 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-6.nancy.grid5000.fr' AND resource_id='9734' AND type='default'" -p cpu=1625 -p core=8610 -p cpuset=6 -p gpu=73 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-6.nancy.grid5000.fr' AND resource_id='9735' AND type='default'" -p cpu=1625 -p core=8611 -p cpuset=8 -p gpu=74 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-6.nancy.grid5000.fr' AND resource_id='9736' AND type='default'" -p cpu=1625 -p core=8612 -p cpuset=10 -p gpu=74 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-6.nancy.grid5000.fr' AND resource_id='9737' AND type='default'" -p cpu=1625 -p core=8613 -p cpuset=12 -p gpu=74 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-6.nancy.grid5000.fr' AND resource_id='9738' AND type='default'" -p cpu=1625 -p core=8614 -p cpuset=14 -p gpu=74 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-6.nancy.grid5000.fr' AND resource_id='9739' AND type='default'" -p cpu=1626 -p core=8615 -p cpuset=1 -p gpu=75 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-6.nancy.grid5000.fr' AND resource_id='9740' AND type='default'" -p cpu=1626 -p core=8616 -p cpuset=3 -p gpu=75 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-6.nancy.grid5000.fr' AND resource_id='9741' AND type='default'" -p cpu=1626 -p core=8617 -p cpuset=5 -p gpu=75 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-6.nancy.grid5000.fr' AND resource_id='9742' AND type='default'" -p cpu=1626 -p core=8618 -p cpuset=7 -p gpu=75 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-6.nancy.grid5000.fr' AND resource_id='9743' AND type='default'" -p cpu=1626 -p core=8619 -p cpuset=9 -p gpu=76 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-6.nancy.grid5000.fr' AND resource_id='9744' AND type='default'" -p cpu=1626 -p core=8620 -p cpuset=11 -p gpu=76 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-6.nancy.grid5000.fr' AND resource_id='9745' AND type='default'" -p cpu=1626 -p core=8621 -p cpuset=13 -p gpu=76 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-6.nancy.grid5000.fr' AND resource_id='9746' AND type='default'" -p cpu=1626 -p core=8622 -p cpuset=15 -p gpu=76 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 echo; echo 'Setting properties for clustera-6.nancy.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-6.nancy.grid5000.fr' and type='default'" -p ip='172.16.64.6' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 8K1CBX2' -p eth_count=1 -p eth_kavlan_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='GeForce RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='NO' -p cluster_priority=201906 -p max_walltime=172800 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
+oarnodesetting --sql "host='clustera-6.nancy.grid5000.fr' and type='default'" -p ip='172.16.64.6' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 8K1CBX2' -p eth_count=1 -p eth_kavlan_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='NO' -p cluster_priority=201906 -p max_walltime=172800 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
 
 echo '================================================================================'
 
@@ -243,24 +243,24 @@ echo '==========================================================================
 ###################################
 # clustera-7.nancy.grid5000.fr
 ###################################
-oarnodesetting --sql "host='clustera-7.nancy.grid5000.fr' AND resource_id='9747' AND type='default'" -p cpu=1627 -p core=8623 -p cpuset=0 -p gpu=77 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-7.nancy.grid5000.fr' AND resource_id='9748' AND type='default'" -p cpu=1627 -p core=8624 -p cpuset=2 -p gpu=77 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-7.nancy.grid5000.fr' AND resource_id='9749' AND type='default'" -p cpu=1627 -p core=8625 -p cpuset=4 -p gpu=77 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-7.nancy.grid5000.fr' AND resource_id='9750' AND type='default'" -p cpu=1627 -p core=8626 -p cpuset=6 -p gpu=77 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-7.nancy.grid5000.fr' AND resource_id='9751' AND type='default'" -p cpu=1627 -p core=8627 -p cpuset=8 -p gpu=78 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-7.nancy.grid5000.fr' AND resource_id='9752' AND type='default'" -p cpu=1627 -p core=8628 -p cpuset=10 -p gpu=78 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-7.nancy.grid5000.fr' AND resource_id='9753' AND type='default'" -p cpu=1627 -p core=8629 -p cpuset=12 -p gpu=78 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-7.nancy.grid5000.fr' AND resource_id='9754' AND type='default'" -p cpu=1627 -p core=8630 -p cpuset=14 -p gpu=78 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-7.nancy.grid5000.fr' AND resource_id='9755' AND type='default'" -p cpu=1628 -p core=8631 -p cpuset=1 -p gpu=79 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-7.nancy.grid5000.fr' AND resource_id='9756' AND type='default'" -p cpu=1628 -p core=8632 -p cpuset=3 -p gpu=79 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-7.nancy.grid5000.fr' AND resource_id='9757' AND type='default'" -p cpu=1628 -p core=8633 -p cpuset=5 -p gpu=79 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-7.nancy.grid5000.fr' AND resource_id='9758' AND type='default'" -p cpu=1628 -p core=8634 -p cpuset=7 -p gpu=79 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-7.nancy.grid5000.fr' AND resource_id='9759' AND type='default'" -p cpu=1628 -p core=8635 -p cpuset=9 -p gpu=80 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting --sql "host='clustera-7.nancy.grid5000.fr' AND resource_id='9760' AND type='default'" -p cpu=1628 -p core=8636 -p cpuset=11 -p gpu=80 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting --sql "host='clustera-7.nancy.grid5000.fr' AND resource_id='9761' AND type='default'" -p cpu=1628 -p core=8637 -p cpuset=13 -p gpu=80 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting --sql "host='clustera-7.nancy.grid5000.fr' AND resource_id='9762' AND type='default'" -p cpu=1628 -p core=8638 -p cpuset=15 -p gpu=80 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-7.nancy.grid5000.fr' AND resource_id='9747' AND type='default'" -p cpu=1627 -p core=8623 -p cpuset=0 -p gpu=77 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-7.nancy.grid5000.fr' AND resource_id='9748' AND type='default'" -p cpu=1627 -p core=8624 -p cpuset=2 -p gpu=77 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-7.nancy.grid5000.fr' AND resource_id='9749' AND type='default'" -p cpu=1627 -p core=8625 -p cpuset=4 -p gpu=77 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-7.nancy.grid5000.fr' AND resource_id='9750' AND type='default'" -p cpu=1627 -p core=8626 -p cpuset=6 -p gpu=77 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-7.nancy.grid5000.fr' AND resource_id='9751' AND type='default'" -p cpu=1627 -p core=8627 -p cpuset=8 -p gpu=78 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-7.nancy.grid5000.fr' AND resource_id='9752' AND type='default'" -p cpu=1627 -p core=8628 -p cpuset=10 -p gpu=78 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-7.nancy.grid5000.fr' AND resource_id='9753' AND type='default'" -p cpu=1627 -p core=8629 -p cpuset=12 -p gpu=78 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-7.nancy.grid5000.fr' AND resource_id='9754' AND type='default'" -p cpu=1627 -p core=8630 -p cpuset=14 -p gpu=78 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-7.nancy.grid5000.fr' AND resource_id='9755' AND type='default'" -p cpu=1628 -p core=8631 -p cpuset=1 -p gpu=79 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-7.nancy.grid5000.fr' AND resource_id='9756' AND type='default'" -p cpu=1628 -p core=8632 -p cpuset=3 -p gpu=79 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-7.nancy.grid5000.fr' AND resource_id='9757' AND type='default'" -p cpu=1628 -p core=8633 -p cpuset=5 -p gpu=79 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-7.nancy.grid5000.fr' AND resource_id='9758' AND type='default'" -p cpu=1628 -p core=8634 -p cpuset=7 -p gpu=79 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-7.nancy.grid5000.fr' AND resource_id='9759' AND type='default'" -p cpu=1628 -p core=8635 -p cpuset=9 -p gpu=80 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-7.nancy.grid5000.fr' AND resource_id='9760' AND type='default'" -p cpu=1628 -p core=8636 -p cpuset=11 -p gpu=80 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-7.nancy.grid5000.fr' AND resource_id='9761' AND type='default'" -p cpu=1628 -p core=8637 -p cpuset=13 -p gpu=80 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-7.nancy.grid5000.fr' AND resource_id='9762' AND type='default'" -p cpu=1628 -p core=8638 -p cpuset=15 -p gpu=80 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 echo; echo 'Setting properties for clustera-7.nancy.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-7.nancy.grid5000.fr' and type='default'" -p ip='172.16.64.7' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 BK1CBX2' -p eth_count=1 -p eth_kavlan_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='GeForce RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='NO' -p cluster_priority=201906 -p max_walltime=604800 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
+oarnodesetting --sql "host='clustera-7.nancy.grid5000.fr' and type='default'" -p ip='172.16.64.7' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 BK1CBX2' -p eth_count=1 -p eth_kavlan_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='NO' -p cluster_priority=201906 -p max_walltime=604800 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
 
 echo '================================================================================'
 
@@ -268,24 +268,24 @@ echo '==========================================================================
 ###################################
 # clustera-8.nancy.grid5000.fr
 ###################################
-oarnodesetting --sql "host='clustera-8.nancy.grid5000.fr' AND resource_id='9763' AND type='default'" -p cpu=1629 -p core=8639 -p cpuset=0 -p gpu=81 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-8.nancy.grid5000.fr' AND resource_id='9764' AND type='default'" -p cpu=1629 -p core=8640 -p cpuset=2 -p gpu=81 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-8.nancy.grid5000.fr' AND resource_id='9765' AND type='default'" -p cpu=1629 -p core=8641 -p cpuset=4 -p gpu=81 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-8.nancy.grid5000.fr' AND resource_id='9766' AND type='default'" -p cpu=1629 -p core=8642 -p cpuset=6 -p gpu=81 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-8.nancy.grid5000.fr' AND resource_id='9767' AND type='default'" -p cpu=1629 -p core=8643 -p cpuset=8 -p gpu=82 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-8.nancy.grid5000.fr' AND resource_id='9768' AND type='default'" -p cpu=1629 -p core=8644 -p cpuset=10 -p gpu=82 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-8.nancy.grid5000.fr' AND resource_id='9769' AND type='default'" -p cpu=1629 -p core=8645 -p cpuset=12 -p gpu=82 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-8.nancy.grid5000.fr' AND resource_id='9770' AND type='default'" -p cpu=1629 -p core=8646 -p cpuset=14 -p gpu=82 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-8.nancy.grid5000.fr' AND resource_id='9771' AND type='default'" -p cpu=1630 -p core=8647 -p cpuset=1 -p gpu=83 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-8.nancy.grid5000.fr' AND resource_id='9772' AND type='default'" -p cpu=1630 -p core=8648 -p cpuset=3 -p gpu=83 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-8.nancy.grid5000.fr' AND resource_id='9773' AND type='default'" -p cpu=1630 -p core=8649 -p cpuset=5 -p gpu=83 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-8.nancy.grid5000.fr' AND resource_id='9774' AND type='default'" -p cpu=1630 -p core=8650 -p cpuset=7 -p gpu=83 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-8.nancy.grid5000.fr' AND resource_id='9775' AND type='default'" -p cpu=1630 -p core=8651 -p cpuset=9 -p gpu=84 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting --sql "host='clustera-8.nancy.grid5000.fr' AND resource_id='9776' AND type='default'" -p cpu=1630 -p core=8652 -p cpuset=11 -p gpu=84 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting --sql "host='clustera-8.nancy.grid5000.fr' AND resource_id='9777' AND type='default'" -p cpu=1630 -p core=8653 -p cpuset=13 -p gpu=84 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting --sql "host='clustera-8.nancy.grid5000.fr' AND resource_id='9778' AND type='default'" -p cpu=1630 -p core=8654 -p cpuset=15 -p gpu=84 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-8.nancy.grid5000.fr' AND resource_id='9763' AND type='default'" -p cpu=1629 -p core=8639 -p cpuset=0 -p gpu=81 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-8.nancy.grid5000.fr' AND resource_id='9764' AND type='default'" -p cpu=1629 -p core=8640 -p cpuset=2 -p gpu=81 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-8.nancy.grid5000.fr' AND resource_id='9765' AND type='default'" -p cpu=1629 -p core=8641 -p cpuset=4 -p gpu=81 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-8.nancy.grid5000.fr' AND resource_id='9766' AND type='default'" -p cpu=1629 -p core=8642 -p cpuset=6 -p gpu=81 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-8.nancy.grid5000.fr' AND resource_id='9767' AND type='default'" -p cpu=1629 -p core=8643 -p cpuset=8 -p gpu=82 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-8.nancy.grid5000.fr' AND resource_id='9768' AND type='default'" -p cpu=1629 -p core=8644 -p cpuset=10 -p gpu=82 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-8.nancy.grid5000.fr' AND resource_id='9769' AND type='default'" -p cpu=1629 -p core=8645 -p cpuset=12 -p gpu=82 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-8.nancy.grid5000.fr' AND resource_id='9770' AND type='default'" -p cpu=1629 -p core=8646 -p cpuset=14 -p gpu=82 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-8.nancy.grid5000.fr' AND resource_id='9771' AND type='default'" -p cpu=1630 -p core=8647 -p cpuset=1 -p gpu=83 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-8.nancy.grid5000.fr' AND resource_id='9772' AND type='default'" -p cpu=1630 -p core=8648 -p cpuset=3 -p gpu=83 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-8.nancy.grid5000.fr' AND resource_id='9773' AND type='default'" -p cpu=1630 -p core=8649 -p cpuset=5 -p gpu=83 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-8.nancy.grid5000.fr' AND resource_id='9774' AND type='default'" -p cpu=1630 -p core=8650 -p cpuset=7 -p gpu=83 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-8.nancy.grid5000.fr' AND resource_id='9775' AND type='default'" -p cpu=1630 -p core=8651 -p cpuset=9 -p gpu=84 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-8.nancy.grid5000.fr' AND resource_id='9776' AND type='default'" -p cpu=1630 -p core=8652 -p cpuset=11 -p gpu=84 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-8.nancy.grid5000.fr' AND resource_id='9777' AND type='default'" -p cpu=1630 -p core=8653 -p cpuset=13 -p gpu=84 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-8.nancy.grid5000.fr' AND resource_id='9778' AND type='default'" -p cpu=1630 -p core=8654 -p cpuset=15 -p gpu=84 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 echo; echo 'Setting properties for clustera-8.nancy.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-8.nancy.grid5000.fr' and type='default'" -p ip='172.16.64.8' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 CK1CBX2' -p eth_count=1 -p eth_kavlan_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='GeForce RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='NO' -p cluster_priority=201906 -p max_walltime=604800 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
+oarnodesetting --sql "host='clustera-8.nancy.grid5000.fr' and type='default'" -p ip='172.16.64.8' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 CK1CBX2' -p eth_count=1 -p eth_kavlan_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='NO' -p cluster_priority=201906 -p max_walltime=604800 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
 
 echo '================================================================================'
 
@@ -293,24 +293,24 @@ echo '==========================================================================
 ###################################
 # clustera-9.nancy.grid5000.fr
 ###################################
-oarnodesetting --sql "host='clustera-9.nancy.grid5000.fr' AND resource_id='9779' AND type='default'" -p cpu=1631 -p core=8655 -p cpuset=0 -p gpu=85 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-9.nancy.grid5000.fr' AND resource_id='9780' AND type='default'" -p cpu=1631 -p core=8656 -p cpuset=2 -p gpu=85 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-9.nancy.grid5000.fr' AND resource_id='9781' AND type='default'" -p cpu=1631 -p core=8657 -p cpuset=4 -p gpu=85 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-9.nancy.grid5000.fr' AND resource_id='9782' AND type='default'" -p cpu=1631 -p core=8658 -p cpuset=6 -p gpu=85 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-9.nancy.grid5000.fr' AND resource_id='9783' AND type='default'" -p cpu=1631 -p core=8659 -p cpuset=8 -p gpu=86 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-9.nancy.grid5000.fr' AND resource_id='9784' AND type='default'" -p cpu=1631 -p core=8660 -p cpuset=10 -p gpu=86 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-9.nancy.grid5000.fr' AND resource_id='9785' AND type='default'" -p cpu=1631 -p core=8661 -p cpuset=12 -p gpu=86 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-9.nancy.grid5000.fr' AND resource_id='9786' AND type='default'" -p cpu=1631 -p core=8662 -p cpuset=14 -p gpu=86 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-9.nancy.grid5000.fr' AND resource_id='9787' AND type='default'" -p cpu=1632 -p core=8663 -p cpuset=1 -p gpu=87 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-9.nancy.grid5000.fr' AND resource_id='9788' AND type='default'" -p cpu=1632 -p core=8664 -p cpuset=3 -p gpu=87 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-9.nancy.grid5000.fr' AND resource_id='9789' AND type='default'" -p cpu=1632 -p core=8665 -p cpuset=5 -p gpu=87 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-9.nancy.grid5000.fr' AND resource_id='9790' AND type='default'" -p cpu=1632 -p core=8666 -p cpuset=7 -p gpu=87 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-9.nancy.grid5000.fr' AND resource_id='9791' AND type='default'" -p cpu=1632 -p core=8667 -p cpuset=9 -p gpu=88 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting --sql "host='clustera-9.nancy.grid5000.fr' AND resource_id='9792' AND type='default'" -p cpu=1632 -p core=8668 -p cpuset=11 -p gpu=88 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting --sql "host='clustera-9.nancy.grid5000.fr' AND resource_id='9793' AND type='default'" -p cpu=1632 -p core=8669 -p cpuset=13 -p gpu=88 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting --sql "host='clustera-9.nancy.grid5000.fr' AND resource_id='9794' AND type='default'" -p cpu=1632 -p core=8670 -p cpuset=15 -p gpu=88 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-9.nancy.grid5000.fr' AND resource_id='9779' AND type='default'" -p cpu=1631 -p core=8655 -p cpuset=0 -p gpu=85 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-9.nancy.grid5000.fr' AND resource_id='9780' AND type='default'" -p cpu=1631 -p core=8656 -p cpuset=2 -p gpu=85 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-9.nancy.grid5000.fr' AND resource_id='9781' AND type='default'" -p cpu=1631 -p core=8657 -p cpuset=4 -p gpu=85 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-9.nancy.grid5000.fr' AND resource_id='9782' AND type='default'" -p cpu=1631 -p core=8658 -p cpuset=6 -p gpu=85 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-9.nancy.grid5000.fr' AND resource_id='9783' AND type='default'" -p cpu=1631 -p core=8659 -p cpuset=8 -p gpu=86 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-9.nancy.grid5000.fr' AND resource_id='9784' AND type='default'" -p cpu=1631 -p core=8660 -p cpuset=10 -p gpu=86 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-9.nancy.grid5000.fr' AND resource_id='9785' AND type='default'" -p cpu=1631 -p core=8661 -p cpuset=12 -p gpu=86 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-9.nancy.grid5000.fr' AND resource_id='9786' AND type='default'" -p cpu=1631 -p core=8662 -p cpuset=14 -p gpu=86 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-9.nancy.grid5000.fr' AND resource_id='9787' AND type='default'" -p cpu=1632 -p core=8663 -p cpuset=1 -p gpu=87 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-9.nancy.grid5000.fr' AND resource_id='9788' AND type='default'" -p cpu=1632 -p core=8664 -p cpuset=3 -p gpu=87 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-9.nancy.grid5000.fr' AND resource_id='9789' AND type='default'" -p cpu=1632 -p core=8665 -p cpuset=5 -p gpu=87 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-9.nancy.grid5000.fr' AND resource_id='9790' AND type='default'" -p cpu=1632 -p core=8666 -p cpuset=7 -p gpu=87 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-9.nancy.grid5000.fr' AND resource_id='9791' AND type='default'" -p cpu=1632 -p core=8667 -p cpuset=9 -p gpu=88 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-9.nancy.grid5000.fr' AND resource_id='9792' AND type='default'" -p cpu=1632 -p core=8668 -p cpuset=11 -p gpu=88 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-9.nancy.grid5000.fr' AND resource_id='9793' AND type='default'" -p cpu=1632 -p core=8669 -p cpuset=13 -p gpu=88 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-9.nancy.grid5000.fr' AND resource_id='9794' AND type='default'" -p cpu=1632 -p core=8670 -p cpuset=15 -p gpu=88 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 echo; echo 'Setting properties for clustera-9.nancy.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-9.nancy.grid5000.fr' and type='default'" -p ip='172.16.64.9' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 9K1CBX2' -p eth_count=1 -p eth_kavlan_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='GeForce RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='NO' -p cluster_priority=201906 -p max_walltime=604800 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
+oarnodesetting --sql "host='clustera-9.nancy.grid5000.fr' and type='default'" -p ip='172.16.64.9' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 9K1CBX2' -p eth_count=1 -p eth_kavlan_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='NO' -p cluster_priority=201906 -p max_walltime=604800 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
 
 echo '================================================================================'
 
@@ -318,24 +318,24 @@ echo '==========================================================================
 ###################################
 # clustera-10.nancy.grid5000.fr
 ###################################
-oarnodesetting --sql "host='clustera-10.nancy.grid5000.fr' AND resource_id='9795' AND type='default'" -p cpu=1633 -p core=8671 -p cpuset=0 -p gpu=89 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-10.nancy.grid5000.fr' AND resource_id='9796' AND type='default'" -p cpu=1633 -p core=8672 -p cpuset=2 -p gpu=89 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-10.nancy.grid5000.fr' AND resource_id='9797' AND type='default'" -p cpu=1633 -p core=8673 -p cpuset=4 -p gpu=89 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-10.nancy.grid5000.fr' AND resource_id='9798' AND type='default'" -p cpu=1633 -p core=8674 -p cpuset=6 -p gpu=89 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-10.nancy.grid5000.fr' AND resource_id='9799' AND type='default'" -p cpu=1633 -p core=8675 -p cpuset=8 -p gpu=90 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-10.nancy.grid5000.fr' AND resource_id='9800' AND type='default'" -p cpu=1633 -p core=8676 -p cpuset=10 -p gpu=90 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-10.nancy.grid5000.fr' AND resource_id='9801' AND type='default'" -p cpu=1633 -p core=8677 -p cpuset=12 -p gpu=90 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-10.nancy.grid5000.fr' AND resource_id='9802' AND type='default'" -p cpu=1633 -p core=8678 -p cpuset=14 -p gpu=90 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-10.nancy.grid5000.fr' AND resource_id='9803' AND type='default'" -p cpu=1634 -p core=8679 -p cpuset=1 -p gpu=91 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-10.nancy.grid5000.fr' AND resource_id='9804' AND type='default'" -p cpu=1634 -p core=8680 -p cpuset=3 -p gpu=91 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-10.nancy.grid5000.fr' AND resource_id='9805' AND type='default'" -p cpu=1634 -p core=8681 -p cpuset=5 -p gpu=91 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-10.nancy.grid5000.fr' AND resource_id='9806' AND type='default'" -p cpu=1634 -p core=8682 -p cpuset=7 -p gpu=91 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-10.nancy.grid5000.fr' AND resource_id='9807' AND type='default'" -p cpu=1634 -p core=8683 -p cpuset=9 -p gpu=92 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting --sql "host='clustera-10.nancy.grid5000.fr' AND resource_id='9808' AND type='default'" -p cpu=1634 -p core=8684 -p cpuset=11 -p gpu=92 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting --sql "host='clustera-10.nancy.grid5000.fr' AND resource_id='9809' AND type='default'" -p cpu=1634 -p core=8685 -p cpuset=13 -p gpu=92 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting --sql "host='clustera-10.nancy.grid5000.fr' AND resource_id='9810' AND type='default'" -p cpu=1634 -p core=8686 -p cpuset=15 -p gpu=92 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-10.nancy.grid5000.fr' AND resource_id='9795' AND type='default'" -p cpu=1633 -p core=8671 -p cpuset=0 -p gpu=89 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-10.nancy.grid5000.fr' AND resource_id='9796' AND type='default'" -p cpu=1633 -p core=8672 -p cpuset=2 -p gpu=89 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-10.nancy.grid5000.fr' AND resource_id='9797' AND type='default'" -p cpu=1633 -p core=8673 -p cpuset=4 -p gpu=89 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-10.nancy.grid5000.fr' AND resource_id='9798' AND type='default'" -p cpu=1633 -p core=8674 -p cpuset=6 -p gpu=89 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-10.nancy.grid5000.fr' AND resource_id='9799' AND type='default'" -p cpu=1633 -p core=8675 -p cpuset=8 -p gpu=90 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-10.nancy.grid5000.fr' AND resource_id='9800' AND type='default'" -p cpu=1633 -p core=8676 -p cpuset=10 -p gpu=90 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-10.nancy.grid5000.fr' AND resource_id='9801' AND type='default'" -p cpu=1633 -p core=8677 -p cpuset=12 -p gpu=90 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-10.nancy.grid5000.fr' AND resource_id='9802' AND type='default'" -p cpu=1633 -p core=8678 -p cpuset=14 -p gpu=90 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-10.nancy.grid5000.fr' AND resource_id='9803' AND type='default'" -p cpu=1634 -p core=8679 -p cpuset=1 -p gpu=91 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-10.nancy.grid5000.fr' AND resource_id='9804' AND type='default'" -p cpu=1634 -p core=8680 -p cpuset=3 -p gpu=91 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-10.nancy.grid5000.fr' AND resource_id='9805' AND type='default'" -p cpu=1634 -p core=8681 -p cpuset=5 -p gpu=91 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-10.nancy.grid5000.fr' AND resource_id='9806' AND type='default'" -p cpu=1634 -p core=8682 -p cpuset=7 -p gpu=91 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-10.nancy.grid5000.fr' AND resource_id='9807' AND type='default'" -p cpu=1634 -p core=8683 -p cpuset=9 -p gpu=92 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-10.nancy.grid5000.fr' AND resource_id='9808' AND type='default'" -p cpu=1634 -p core=8684 -p cpuset=11 -p gpu=92 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-10.nancy.grid5000.fr' AND resource_id='9809' AND type='default'" -p cpu=1634 -p core=8685 -p cpuset=13 -p gpu=92 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-10.nancy.grid5000.fr' AND resource_id='9810' AND type='default'" -p cpu=1634 -p core=8686 -p cpuset=15 -p gpu=92 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 echo; echo 'Setting properties for clustera-10.nancy.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-10.nancy.grid5000.fr' and type='default'" -p ip='172.16.64.10' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 GL1CBX2' -p eth_count=1 -p eth_kavlan_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='GeForce RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='NO' -p cluster_priority=201906 -p max_walltime=604800 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
+oarnodesetting --sql "host='clustera-10.nancy.grid5000.fr' and type='default'" -p ip='172.16.64.10' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 GL1CBX2' -p eth_count=1 -p eth_kavlan_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='NO' -p cluster_priority=201906 -p max_walltime=604800 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
 
 echo '================================================================================'
 
@@ -343,24 +343,24 @@ echo '==========================================================================
 ###################################
 # clustera-11.nancy.grid5000.fr
 ###################################
-oarnodesetting --sql "host='clustera-11.nancy.grid5000.fr' AND resource_id='9811' AND type='default'" -p cpu=1635 -p core=8687 -p cpuset=0 -p gpu=93 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-11.nancy.grid5000.fr' AND resource_id='9812' AND type='default'" -p cpu=1635 -p core=8688 -p cpuset=2 -p gpu=93 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-11.nancy.grid5000.fr' AND resource_id='9813' AND type='default'" -p cpu=1635 -p core=8689 -p cpuset=4 -p gpu=93 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-11.nancy.grid5000.fr' AND resource_id='9814' AND type='default'" -p cpu=1635 -p core=8690 -p cpuset=6 -p gpu=93 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-11.nancy.grid5000.fr' AND resource_id='9815' AND type='default'" -p cpu=1635 -p core=8691 -p cpuset=8 -p gpu=94 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-11.nancy.grid5000.fr' AND resource_id='9816' AND type='default'" -p cpu=1635 -p core=8692 -p cpuset=10 -p gpu=94 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-11.nancy.grid5000.fr' AND resource_id='9817' AND type='default'" -p cpu=1635 -p core=8693 -p cpuset=12 -p gpu=94 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-11.nancy.grid5000.fr' AND resource_id='9818' AND type='default'" -p cpu=1635 -p core=8694 -p cpuset=14 -p gpu=94 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-11.nancy.grid5000.fr' AND resource_id='9819' AND type='default'" -p cpu=1636 -p core=8695 -p cpuset=1 -p gpu=95 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-11.nancy.grid5000.fr' AND resource_id='9820' AND type='default'" -p cpu=1636 -p core=8696 -p cpuset=3 -p gpu=95 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-11.nancy.grid5000.fr' AND resource_id='9821' AND type='default'" -p cpu=1636 -p core=8697 -p cpuset=5 -p gpu=95 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-11.nancy.grid5000.fr' AND resource_id='9822' AND type='default'" -p cpu=1636 -p core=8698 -p cpuset=7 -p gpu=95 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-11.nancy.grid5000.fr' AND resource_id='9823' AND type='default'" -p cpu=1636 -p core=8699 -p cpuset=9 -p gpu=96 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting --sql "host='clustera-11.nancy.grid5000.fr' AND resource_id='9824' AND type='default'" -p cpu=1636 -p core=8700 -p cpuset=11 -p gpu=96 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting --sql "host='clustera-11.nancy.grid5000.fr' AND resource_id='9825' AND type='default'" -p cpu=1636 -p core=8701 -p cpuset=13 -p gpu=96 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting --sql "host='clustera-11.nancy.grid5000.fr' AND resource_id='9826' AND type='default'" -p cpu=1636 -p core=8702 -p cpuset=15 -p gpu=96 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-11.nancy.grid5000.fr' AND resource_id='9811' AND type='default'" -p cpu=1635 -p core=8687 -p cpuset=0 -p gpu=93 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-11.nancy.grid5000.fr' AND resource_id='9812' AND type='default'" -p cpu=1635 -p core=8688 -p cpuset=2 -p gpu=93 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-11.nancy.grid5000.fr' AND resource_id='9813' AND type='default'" -p cpu=1635 -p core=8689 -p cpuset=4 -p gpu=93 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-11.nancy.grid5000.fr' AND resource_id='9814' AND type='default'" -p cpu=1635 -p core=8690 -p cpuset=6 -p gpu=93 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-11.nancy.grid5000.fr' AND resource_id='9815' AND type='default'" -p cpu=1635 -p core=8691 -p cpuset=8 -p gpu=94 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-11.nancy.grid5000.fr' AND resource_id='9816' AND type='default'" -p cpu=1635 -p core=8692 -p cpuset=10 -p gpu=94 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-11.nancy.grid5000.fr' AND resource_id='9817' AND type='default'" -p cpu=1635 -p core=8693 -p cpuset=12 -p gpu=94 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-11.nancy.grid5000.fr' AND resource_id='9818' AND type='default'" -p cpu=1635 -p core=8694 -p cpuset=14 -p gpu=94 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-11.nancy.grid5000.fr' AND resource_id='9819' AND type='default'" -p cpu=1636 -p core=8695 -p cpuset=1 -p gpu=95 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-11.nancy.grid5000.fr' AND resource_id='9820' AND type='default'" -p cpu=1636 -p core=8696 -p cpuset=3 -p gpu=95 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-11.nancy.grid5000.fr' AND resource_id='9821' AND type='default'" -p cpu=1636 -p core=8697 -p cpuset=5 -p gpu=95 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-11.nancy.grid5000.fr' AND resource_id='9822' AND type='default'" -p cpu=1636 -p core=8698 -p cpuset=7 -p gpu=95 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-11.nancy.grid5000.fr' AND resource_id='9823' AND type='default'" -p cpu=1636 -p core=8699 -p cpuset=9 -p gpu=96 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-11.nancy.grid5000.fr' AND resource_id='9824' AND type='default'" -p cpu=1636 -p core=8700 -p cpuset=11 -p gpu=96 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-11.nancy.grid5000.fr' AND resource_id='9825' AND type='default'" -p cpu=1636 -p core=8701 -p cpuset=13 -p gpu=96 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-11.nancy.grid5000.fr' AND resource_id='9826' AND type='default'" -p cpu=1636 -p core=8702 -p cpuset=15 -p gpu=96 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 echo; echo 'Setting properties for clustera-11.nancy.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-11.nancy.grid5000.fr' and type='default'" -p ip='172.16.64.11' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 JL1CBX2' -p eth_count=1 -p eth_kavlan_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='GeForce RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='NO' -p cluster_priority=201906 -p max_walltime=604800 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
+oarnodesetting --sql "host='clustera-11.nancy.grid5000.fr' and type='default'" -p ip='172.16.64.11' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 JL1CBX2' -p eth_count=1 -p eth_kavlan_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='NO' -p cluster_priority=201906 -p max_walltime=604800 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
 
 echo '================================================================================'
 
@@ -368,24 +368,24 @@ echo '==========================================================================
 ###################################
 # clustera-12.nancy.grid5000.fr
 ###################################
-oarnodesetting --sql "host='clustera-12.nancy.grid5000.fr' AND resource_id='9827' AND type='default'" -p cpu=1637 -p core=8703 -p cpuset=0 -p gpu=97 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-12.nancy.grid5000.fr' AND resource_id='9828' AND type='default'" -p cpu=1637 -p core=8704 -p cpuset=2 -p gpu=97 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-12.nancy.grid5000.fr' AND resource_id='9829' AND type='default'" -p cpu=1637 -p core=8705 -p cpuset=4 -p gpu=97 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-12.nancy.grid5000.fr' AND resource_id='9830' AND type='default'" -p cpu=1637 -p core=8706 -p cpuset=6 -p gpu=97 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-12.nancy.grid5000.fr' AND resource_id='9831' AND type='default'" -p cpu=1637 -p core=8707 -p cpuset=8 -p gpu=98 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-12.nancy.grid5000.fr' AND resource_id='9832' AND type='default'" -p cpu=1637 -p core=8708 -p cpuset=10 -p gpu=98 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-12.nancy.grid5000.fr' AND resource_id='9833' AND type='default'" -p cpu=1637 -p core=8709 -p cpuset=12 -p gpu=98 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-12.nancy.grid5000.fr' AND resource_id='9834' AND type='default'" -p cpu=1637 -p core=8710 -p cpuset=14 -p gpu=98 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-12.nancy.grid5000.fr' AND resource_id='9835' AND type='default'" -p cpu=1638 -p core=8711 -p cpuset=1 -p gpu=99 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-12.nancy.grid5000.fr' AND resource_id='9836' AND type='default'" -p cpu=1638 -p core=8712 -p cpuset=3 -p gpu=99 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-12.nancy.grid5000.fr' AND resource_id='9837' AND type='default'" -p cpu=1638 -p core=8713 -p cpuset=5 -p gpu=99 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-12.nancy.grid5000.fr' AND resource_id='9838' AND type='default'" -p cpu=1638 -p core=8714 -p cpuset=7 -p gpu=99 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-12.nancy.grid5000.fr' AND resource_id='9839' AND type='default'" -p cpu=1638 -p core=8715 -p cpuset=9 -p gpu=100 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting --sql "host='clustera-12.nancy.grid5000.fr' AND resource_id='9840' AND type='default'" -p cpu=1638 -p core=8716 -p cpuset=11 -p gpu=100 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting --sql "host='clustera-12.nancy.grid5000.fr' AND resource_id='9841' AND type='default'" -p cpu=1638 -p core=8717 -p cpuset=13 -p gpu=100 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting --sql "host='clustera-12.nancy.grid5000.fr' AND resource_id='9842' AND type='default'" -p cpu=1638 -p core=8718 -p cpuset=15 -p gpu=100 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-12.nancy.grid5000.fr' AND resource_id='9827' AND type='default'" -p cpu=1637 -p core=8703 -p cpuset=0 -p gpu=97 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-12.nancy.grid5000.fr' AND resource_id='9828' AND type='default'" -p cpu=1637 -p core=8704 -p cpuset=2 -p gpu=97 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-12.nancy.grid5000.fr' AND resource_id='9829' AND type='default'" -p cpu=1637 -p core=8705 -p cpuset=4 -p gpu=97 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-12.nancy.grid5000.fr' AND resource_id='9830' AND type='default'" -p cpu=1637 -p core=8706 -p cpuset=6 -p gpu=97 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-12.nancy.grid5000.fr' AND resource_id='9831' AND type='default'" -p cpu=1637 -p core=8707 -p cpuset=8 -p gpu=98 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-12.nancy.grid5000.fr' AND resource_id='9832' AND type='default'" -p cpu=1637 -p core=8708 -p cpuset=10 -p gpu=98 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-12.nancy.grid5000.fr' AND resource_id='9833' AND type='default'" -p cpu=1637 -p core=8709 -p cpuset=12 -p gpu=98 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-12.nancy.grid5000.fr' AND resource_id='9834' AND type='default'" -p cpu=1637 -p core=8710 -p cpuset=14 -p gpu=98 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-12.nancy.grid5000.fr' AND resource_id='9835' AND type='default'" -p cpu=1638 -p core=8711 -p cpuset=1 -p gpu=99 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-12.nancy.grid5000.fr' AND resource_id='9836' AND type='default'" -p cpu=1638 -p core=8712 -p cpuset=3 -p gpu=99 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-12.nancy.grid5000.fr' AND resource_id='9837' AND type='default'" -p cpu=1638 -p core=8713 -p cpuset=5 -p gpu=99 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-12.nancy.grid5000.fr' AND resource_id='9838' AND type='default'" -p cpu=1638 -p core=8714 -p cpuset=7 -p gpu=99 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-12.nancy.grid5000.fr' AND resource_id='9839' AND type='default'" -p cpu=1638 -p core=8715 -p cpuset=9 -p gpu=100 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-12.nancy.grid5000.fr' AND resource_id='9840' AND type='default'" -p cpu=1638 -p core=8716 -p cpuset=11 -p gpu=100 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-12.nancy.grid5000.fr' AND resource_id='9841' AND type='default'" -p cpu=1638 -p core=8717 -p cpuset=13 -p gpu=100 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-12.nancy.grid5000.fr' AND resource_id='9842' AND type='default'" -p cpu=1638 -p core=8718 -p cpuset=15 -p gpu=100 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 echo; echo 'Setting properties for clustera-12.nancy.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-12.nancy.grid5000.fr' and type='default'" -p ip='172.16.64.12' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 HL1CBX2' -p eth_count=1 -p eth_kavlan_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='GeForce RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='NO' -p cluster_priority=201906 -p max_walltime=604800 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
+oarnodesetting --sql "host='clustera-12.nancy.grid5000.fr' and type='default'" -p ip='172.16.64.12' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 HL1CBX2' -p eth_count=1 -p eth_kavlan_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='NO' -p cluster_priority=201906 -p max_walltime=604800 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
 
 echo '================================================================================'
 
@@ -393,23 +393,23 @@ echo '==========================================================================
 ###################################
 # clustera-13.nancy.grid5000.fr
 ###################################
-oarnodesetting --sql "host='clustera-13.nancy.grid5000.fr' AND resource_id='9843' AND type='default'" -p cpu=1639 -p core=8719 -p cpuset=0 -p gpu=101 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-13.nancy.grid5000.fr' AND resource_id='9844' AND type='default'" -p cpu=1639 -p core=8720 -p cpuset=2 -p gpu=101 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-13.nancy.grid5000.fr' AND resource_id='9845' AND type='default'" -p cpu=1639 -p core=8721 -p cpuset=4 -p gpu=101 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-13.nancy.grid5000.fr' AND resource_id='9846' AND type='default'" -p cpu=1639 -p core=8722 -p cpuset=6 -p gpu=101 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-13.nancy.grid5000.fr' AND resource_id='9847' AND type='default'" -p cpu=1639 -p core=8723 -p cpuset=8 -p gpu=102 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-13.nancy.grid5000.fr' AND resource_id='9848' AND type='default'" -p cpu=1639 -p core=8724 -p cpuset=10 -p gpu=102 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-13.nancy.grid5000.fr' AND resource_id='9849' AND type='default'" -p cpu=1639 -p core=8725 -p cpuset=12 -p gpu=102 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-13.nancy.grid5000.fr' AND resource_id='9850' AND type='default'" -p cpu=1639 -p core=8726 -p cpuset=14 -p gpu=102 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-13.nancy.grid5000.fr' AND resource_id='9851' AND type='default'" -p cpu=1640 -p core=8727 -p cpuset=1 -p gpu=103 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-13.nancy.grid5000.fr' AND resource_id='9852' AND type='default'" -p cpu=1640 -p core=8728 -p cpuset=3 -p gpu=103 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-13.nancy.grid5000.fr' AND resource_id='9853' AND type='default'" -p cpu=1640 -p core=8729 -p cpuset=5 -p gpu=103 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-13.nancy.grid5000.fr' AND resource_id='9854' AND type='default'" -p cpu=1640 -p core=8730 -p cpuset=7 -p gpu=103 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-13.nancy.grid5000.fr' AND resource_id='9855' AND type='default'" -p cpu=1640 -p core=8731 -p cpuset=9 -p gpu=104 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting --sql "host='clustera-13.nancy.grid5000.fr' AND resource_id='9856' AND type='default'" -p cpu=1640 -p core=8732 -p cpuset=11 -p gpu=104 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting --sql "host='clustera-13.nancy.grid5000.fr' AND resource_id='9857' AND type='default'" -p cpu=1640 -p core=8733 -p cpuset=13 -p gpu=104 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting --sql "host='clustera-13.nancy.grid5000.fr' AND resource_id='9858' AND type='default'" -p cpu=1640 -p core=8734 -p cpuset=15 -p gpu=104 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-13.nancy.grid5000.fr' AND resource_id='9843' AND type='default'" -p cpu=1639 -p core=8719 -p cpuset=0 -p gpu=101 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-13.nancy.grid5000.fr' AND resource_id='9844' AND type='default'" -p cpu=1639 -p core=8720 -p cpuset=2 -p gpu=101 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-13.nancy.grid5000.fr' AND resource_id='9845' AND type='default'" -p cpu=1639 -p core=8721 -p cpuset=4 -p gpu=101 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-13.nancy.grid5000.fr' AND resource_id='9846' AND type='default'" -p cpu=1639 -p core=8722 -p cpuset=6 -p gpu=101 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-13.nancy.grid5000.fr' AND resource_id='9847' AND type='default'" -p cpu=1639 -p core=8723 -p cpuset=8 -p gpu=102 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-13.nancy.grid5000.fr' AND resource_id='9848' AND type='default'" -p cpu=1639 -p core=8724 -p cpuset=10 -p gpu=102 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-13.nancy.grid5000.fr' AND resource_id='9849' AND type='default'" -p cpu=1639 -p core=8725 -p cpuset=12 -p gpu=102 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-13.nancy.grid5000.fr' AND resource_id='9850' AND type='default'" -p cpu=1639 -p core=8726 -p cpuset=14 -p gpu=102 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-13.nancy.grid5000.fr' AND resource_id='9851' AND type='default'" -p cpu=1640 -p core=8727 -p cpuset=1 -p gpu=103 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-13.nancy.grid5000.fr' AND resource_id='9852' AND type='default'" -p cpu=1640 -p core=8728 -p cpuset=3 -p gpu=103 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-13.nancy.grid5000.fr' AND resource_id='9853' AND type='default'" -p cpu=1640 -p core=8729 -p cpuset=5 -p gpu=103 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-13.nancy.grid5000.fr' AND resource_id='9854' AND type='default'" -p cpu=1640 -p core=8730 -p cpuset=7 -p gpu=103 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-13.nancy.grid5000.fr' AND resource_id='9855' AND type='default'" -p cpu=1640 -p core=8731 -p cpuset=9 -p gpu=104 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-13.nancy.grid5000.fr' AND resource_id='9856' AND type='default'" -p cpu=1640 -p core=8732 -p cpuset=11 -p gpu=104 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-13.nancy.grid5000.fr' AND resource_id='9857' AND type='default'" -p cpu=1640 -p core=8733 -p cpuset=13 -p gpu=104 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-13.nancy.grid5000.fr' AND resource_id='9858' AND type='default'" -p cpu=1640 -p core=8734 -p cpuset=15 -p gpu=104 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 echo; echo 'Setting properties for clustera-13.nancy.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-13.nancy.grid5000.fr' and type='default'" -p ip='172.16.64.13' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 7K1CBX2' -p eth_count=1 -p eth_kavlan_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='GeForce RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='NO' -p cluster_priority=201906 -p max_walltime=604800 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
+oarnodesetting --sql "host='clustera-13.nancy.grid5000.fr' and type='default'" -p ip='172.16.64.13' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 7K1CBX2' -p eth_count=1 -p eth_kavlan_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='NO' -p cluster_priority=201906 -p max_walltime=604800 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
 
 echo '================================================================================'
diff --git a/spec/output/graffiti-gpu-removed-OAR-updated-gpu-re-added_table_stdout.txt b/spec/output/graffiti-gpu-removed-OAR-updated-gpu-re-added_table_stdout.txt
index 5b7e29d6409..87ec271eaaf 100644
--- a/spec/output/graffiti-gpu-removed-OAR-updated-gpu-re-added_table_stdout.txt
+++ b/spec/output/graffiti-gpu-removed-OAR-updated-gpu-re-added_table_stdout.txt
@@ -1,212 +1,212 @@
 +---------- + -------------------- + ----- + ----- + -------- + ---- + -------------------- + ------------------------------ + ------------------------------+
 |   cluster | host                 | cpu   | core  | cpuset   | gpu  | gpudevice            | cpumodel                       | gpumodel                      |
 +---------- + -------------------- + ----- + ----- + -------- + ---- + -------------------- + ------------------------------ + ------------------------------+
-|  clustera | clustera-1           | 1615  | 8527  | 0        | 53   | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 1615  | 8528  | 2        | 53   | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 1615  | 8529  | 4        | 53   | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 1615  | 8530  | 6        | 53   | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 1615  | 8531  | 8        | 54   | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 1615  | 8532  | 10       | 54   | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 1615  | 8533  | 12       | 54   | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 1615  | 8534  | 14       | 54   | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 1616  | 8535  | 1        | 55   | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 1616  | 8536  | 3        | 55   | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 1616  | 8537  | 5        | 55   | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 1616  | 8538  | 7        | 55   | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 1616  | 8539  | 9        | 56   | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 1616  | 8540  | 11       | 56   | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 1616  | 8541  | 13       | 56   | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 1616  | 8542  | 15       | 56   | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 1617  | 8543  | 0        | 57   | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 1617  | 8544  | 2        | 57   | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 1617  | 8545  | 4        | 57   | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 1617  | 8546  | 6        | 57   | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 1617  | 8547  | 8        | 58   | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 1617  | 8548  | 10       | 58   | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 1617  | 8549  | 12       | 58   | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 1617  | 8550  | 14       | 58   | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 1618  | 8551  | 1        | 59   | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 1618  | 8552  | 3        | 59   | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 1618  | 8553  | 5        | 59   | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 1618  | 8554  | 7        | 59   | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 1618  | 8555  | 9        | 60   | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 1618  | 8556  | 11       | 60   | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 1618  | 8557  | 13       | 60   | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 1618  | 8558  | 15       | 60   | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-3           | 1619  | 8559  | 0        | 61   | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-3           | 1619  | 8560  | 2        | 61   | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-3           | 1619  | 8561  | 4        | 61   | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-3           | 1619  | 8562  | 6        | 61   | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-3           | 1619  | 8563  | 8        | 62   | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-3           | 1619  | 8564  | 10       | 62   | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-3           | 1619  | 8565  | 12       | 62   | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-3           | 1619  | 8566  | 14       | 62   | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-3           | 1620  | 8567  | 1        | 63   | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-3           | 1620  | 8568  | 3        | 63   | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-3           | 1620  | 8569  | 5        | 63   | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-3           | 1620  | 8570  | 7        | 63   | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-3           | 1620  | 8571  | 9        | 64   | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-3           | 1620  | 8572  | 11       | 64   | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-3           | 1620  | 8573  | 13       | 64   | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-3           | 1620  | 8574  | 15       | 64   | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-4           | 1621  | 8575  | 0        | 65   | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-4           | 1621  | 8576  | 2        | 65   | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-4           | 1621  | 8577  | 4        | 65   | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-4           | 1621  | 8578  | 6        | 65   | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-4           | 1621  | 8579  | 8        | 66   | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-4           | 1621  | 8580  | 10       | 66   | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-4           | 1621  | 8581  | 12       | 66   | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-4           | 1621  | 8582  | 14       | 66   | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-4           | 1622  | 8583  | 1        | 67   | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-4           | 1622  | 8584  | 3        | 67   | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-4           | 1622  | 8585  | 5        | 67   | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-4           | 1622  | 8586  | 7        | 67   | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-4           | 1622  | 8587  | 9        | 68   | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-4           | 1622  | 8588  | 11       | 68   | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-4           | 1622  | 8589  | 13       | 68   | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-4           | 1622  | 8590  | 15       | 68   | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-5           | 1623  | 8591  | 0        | 69   | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-5           | 1623  | 8592  | 2        | 69   | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-5           | 1623  | 8593  | 4        | 69   | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-5           | 1623  | 8594  | 6        | 69   | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-5           | 1623  | 8595  | 8        | 70   | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-5           | 1623  | 8596  | 10       | 70   | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-5           | 1623  | 8597  | 12       | 70   | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-5           | 1623  | 8598  | 14       | 70   | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-5           | 1624  | 8599  | 1        | 71   | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-5           | 1624  | 8600  | 3        | 71   | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-5           | 1624  | 8601  | 5        | 71   | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-5           | 1624  | 8602  | 7        | 71   | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-5           | 1624  | 8603  | 9        | 72   | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-5           | 1624  | 8604  | 11       | 72   | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-5           | 1624  | 8605  | 13       | 72   | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-5           | 1624  | 8606  | 15       | 72   | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-6           | 1625  | 8607  | 0        | 73   | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-6           | 1625  | 8608  | 2        | 73   | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-6           | 1625  | 8609  | 4        | 73   | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-6           | 1625  | 8610  | 6        | 73   | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-6           | 1625  | 8611  | 8        | 74   | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-6           | 1625  | 8612  | 10       | 74   | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-6           | 1625  | 8613  | 12       | 74   | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-6           | 1625  | 8614  | 14       | 74   | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-6           | 1626  | 8615  | 1        | 75   | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-6           | 1626  | 8616  | 3        | 75   | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-6           | 1626  | 8617  | 5        | 75   | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-6           | 1626  | 8618  | 7        | 75   | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-6           | 1626  | 8619  | 9        | 76   | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-6           | 1626  | 8620  | 11       | 76   | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-6           | 1626  | 8621  | 13       | 76   | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-6           | 1626  | 8622  | 15       | 76   | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-7           | 1627  | 8623  | 0        | 77   | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-7           | 1627  | 8624  | 2        | 77   | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-7           | 1627  | 8625  | 4        | 77   | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-7           | 1627  | 8626  | 6        | 77   | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-7           | 1627  | 8627  | 8        | 78   | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-7           | 1627  | 8628  | 10       | 78   | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-7           | 1627  | 8629  | 12       | 78   | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-7           | 1627  | 8630  | 14       | 78   | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-7           | 1628  | 8631  | 1        | 79   | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-7           | 1628  | 8632  | 3        | 79   | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-7           | 1628  | 8633  | 5        | 79   | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-7           | 1628  | 8634  | 7        | 79   | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-7           | 1628  | 8635  | 9        | 80   | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-7           | 1628  | 8636  | 11       | 80   | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-7           | 1628  | 8637  | 13       | 80   | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-7           | 1628  | 8638  | 15       | 80   | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-8           | 1629  | 8639  | 0        | 81   | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-8           | 1629  | 8640  | 2        | 81   | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-8           | 1629  | 8641  | 4        | 81   | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-8           | 1629  | 8642  | 6        | 81   | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-8           | 1629  | 8643  | 8        | 82   | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-8           | 1629  | 8644  | 10       | 82   | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-8           | 1629  | 8645  | 12       | 82   | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-8           | 1629  | 8646  | 14       | 82   | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-8           | 1630  | 8647  | 1        | 83   | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-8           | 1630  | 8648  | 3        | 83   | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-8           | 1630  | 8649  | 5        | 83   | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-8           | 1630  | 8650  | 7        | 83   | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-8           | 1630  | 8651  | 9        | 84   | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-8           | 1630  | 8652  | 11       | 84   | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-8           | 1630  | 8653  | 13       | 84   | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-8           | 1630  | 8654  | 15       | 84   | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-9           | 1631  | 8655  | 0        | 85   | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-9           | 1631  | 8656  | 2        | 85   | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-9           | 1631  | 8657  | 4        | 85   | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-9           | 1631  | 8658  | 6        | 85   | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-9           | 1631  | 8659  | 8        | 86   | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-9           | 1631  | 8660  | 10       | 86   | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-9           | 1631  | 8661  | 12       | 86   | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-9           | 1631  | 8662  | 14       | 86   | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-9           | 1632  | 8663  | 1        | 87   | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-9           | 1632  | 8664  | 3        | 87   | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-9           | 1632  | 8665  | 5        | 87   | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-9           | 1632  | 8666  | 7        | 87   | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-9           | 1632  | 8667  | 9        | 88   | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-9           | 1632  | 8668  | 11       | 88   | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-9           | 1632  | 8669  | 13       | 88   | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-9           | 1632  | 8670  | 15       | 88   | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-10          | 1633  | 8671  | 0        | 89   | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-10          | 1633  | 8672  | 2        | 89   | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-10          | 1633  | 8673  | 4        | 89   | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-10          | 1633  | 8674  | 6        | 89   | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-10          | 1633  | 8675  | 8        | 90   | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-10          | 1633  | 8676  | 10       | 90   | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-10          | 1633  | 8677  | 12       | 90   | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-10          | 1633  | 8678  | 14       | 90   | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-10          | 1634  | 8679  | 1        | 91   | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-10          | 1634  | 8680  | 3        | 91   | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-10          | 1634  | 8681  | 5        | 91   | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-10          | 1634  | 8682  | 7        | 91   | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-10          | 1634  | 8683  | 9        | 92   | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-10          | 1634  | 8684  | 11       | 92   | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-10          | 1634  | 8685  | 13       | 92   | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-10          | 1634  | 8686  | 15       | 92   | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-11          | 1635  | 8687  | 0        | 93   | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-11          | 1635  | 8688  | 2        | 93   | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-11          | 1635  | 8689  | 4        | 93   | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-11          | 1635  | 8690  | 6        | 93   | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-11          | 1635  | 8691  | 8        | 94   | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-11          | 1635  | 8692  | 10       | 94   | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-11          | 1635  | 8693  | 12       | 94   | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-11          | 1635  | 8694  | 14       | 94   | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-11          | 1636  | 8695  | 1        | 95   | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-11          | 1636  | 8696  | 3        | 95   | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-11          | 1636  | 8697  | 5        | 95   | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-11          | 1636  | 8698  | 7        | 95   | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-11          | 1636  | 8699  | 9        | 96   | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-11          | 1636  | 8700  | 11       | 96   | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-11          | 1636  | 8701  | 13       | 96   | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-11          | 1636  | 8702  | 15       | 96   | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-12          | 1637  | 8703  | 0        | 97   | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-12          | 1637  | 8704  | 2        | 97   | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-12          | 1637  | 8705  | 4        | 97   | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-12          | 1637  | 8706  | 6        | 97   | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-12          | 1637  | 8707  | 8        | 98   | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-12          | 1637  | 8708  | 10       | 98   | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-12          | 1637  | 8709  | 12       | 98   | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-12          | 1637  | 8710  | 14       | 98   | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-12          | 1638  | 8711  | 1        | 99   | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-12          | 1638  | 8712  | 3        | 99   | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-12          | 1638  | 8713  | 5        | 99   | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-12          | 1638  | 8714  | 7        | 99   | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-12          | 1638  | 8715  | 9        | 100  | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-12          | 1638  | 8716  | 11       | 100  | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-12          | 1638  | 8717  | 13       | 100  | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-12          | 1638  | 8718  | 15       | 100  | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-13          | 1639  | 8719  | 0        | 101  | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-13          | 1639  | 8720  | 2        | 101  | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-13          | 1639  | 8721  | 4        | 101  | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-13          | 1639  | 8722  | 6        | 101  | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-13          | 1639  | 8723  | 8        | 102  | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-13          | 1639  | 8724  | 10       | 102  | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-13          | 1639  | 8725  | 12       | 102  | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-13          | 1639  | 8726  | 14       | 102  | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-13          | 1640  | 8727  | 1        | 103  | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-13          | 1640  | 8728  | 3        | 103  | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-13          | 1640  | 8729  | 5        | 103  | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-13          | 1640  | 8730  | 7        | 103  | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-13          | 1640  | 8731  | 9        | 104  | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-13          | 1640  | 8732  | 11       | 104  | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-13          | 1640  | 8733  | 13       | 104  | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-13          | 1640  | 8734  | 15       | 104  | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
+|  clustera | clustera-1           | 1615  | 8527  | 0        | 53   | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 1615  | 8528  | 2        | 53   | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 1615  | 8529  | 4        | 53   | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 1615  | 8530  | 6        | 53   | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 1615  | 8531  | 8        | 54   | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 1615  | 8532  | 10       | 54   | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 1615  | 8533  | 12       | 54   | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 1615  | 8534  | 14       | 54   | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 1616  | 8535  | 1        | 55   | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 1616  | 8536  | 3        | 55   | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 1616  | 8537  | 5        | 55   | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 1616  | 8538  | 7        | 55   | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 1616  | 8539  | 9        | 56   | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 1616  | 8540  | 11       | 56   | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 1616  | 8541  | 13       | 56   | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 1616  | 8542  | 15       | 56   | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 1617  | 8543  | 0        | 57   | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 1617  | 8544  | 2        | 57   | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 1617  | 8545  | 4        | 57   | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 1617  | 8546  | 6        | 57   | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 1617  | 8547  | 8        | 58   | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 1617  | 8548  | 10       | 58   | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 1617  | 8549  | 12       | 58   | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 1617  | 8550  | 14       | 58   | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 1618  | 8551  | 1        | 59   | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 1618  | 8552  | 3        | 59   | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 1618  | 8553  | 5        | 59   | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 1618  | 8554  | 7        | 59   | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 1618  | 8555  | 9        | 60   | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 1618  | 8556  | 11       | 60   | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 1618  | 8557  | 13       | 60   | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 1618  | 8558  | 15       | 60   | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-3           | 1619  | 8559  | 0        | 61   | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-3           | 1619  | 8560  | 2        | 61   | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-3           | 1619  | 8561  | 4        | 61   | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-3           | 1619  | 8562  | 6        | 61   | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-3           | 1619  | 8563  | 8        | 62   | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-3           | 1619  | 8564  | 10       | 62   | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-3           | 1619  | 8565  | 12       | 62   | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-3           | 1619  | 8566  | 14       | 62   | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-3           | 1620  | 8567  | 1        | 63   | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-3           | 1620  | 8568  | 3        | 63   | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-3           | 1620  | 8569  | 5        | 63   | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-3           | 1620  | 8570  | 7        | 63   | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-3           | 1620  | 8571  | 9        | 64   | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-3           | 1620  | 8572  | 11       | 64   | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-3           | 1620  | 8573  | 13       | 64   | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-3           | 1620  | 8574  | 15       | 64   | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-4           | 1621  | 8575  | 0        | 65   | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-4           | 1621  | 8576  | 2        | 65   | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-4           | 1621  | 8577  | 4        | 65   | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-4           | 1621  | 8578  | 6        | 65   | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-4           | 1621  | 8579  | 8        | 66   | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-4           | 1621  | 8580  | 10       | 66   | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-4           | 1621  | 8581  | 12       | 66   | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-4           | 1621  | 8582  | 14       | 66   | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-4           | 1622  | 8583  | 1        | 67   | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-4           | 1622  | 8584  | 3        | 67   | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-4           | 1622  | 8585  | 5        | 67   | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-4           | 1622  | 8586  | 7        | 67   | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-4           | 1622  | 8587  | 9        | 68   | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-4           | 1622  | 8588  | 11       | 68   | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-4           | 1622  | 8589  | 13       | 68   | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-4           | 1622  | 8590  | 15       | 68   | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-5           | 1623  | 8591  | 0        | 69   | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-5           | 1623  | 8592  | 2        | 69   | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-5           | 1623  | 8593  | 4        | 69   | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-5           | 1623  | 8594  | 6        | 69   | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-5           | 1623  | 8595  | 8        | 70   | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-5           | 1623  | 8596  | 10       | 70   | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-5           | 1623  | 8597  | 12       | 70   | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-5           | 1623  | 8598  | 14       | 70   | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-5           | 1624  | 8599  | 1        | 71   | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-5           | 1624  | 8600  | 3        | 71   | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-5           | 1624  | 8601  | 5        | 71   | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-5           | 1624  | 8602  | 7        | 71   | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-5           | 1624  | 8603  | 9        | 72   | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-5           | 1624  | 8604  | 11       | 72   | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-5           | 1624  | 8605  | 13       | 72   | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-5           | 1624  | 8606  | 15       | 72   | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-6           | 1625  | 8607  | 0        | 73   | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-6           | 1625  | 8608  | 2        | 73   | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-6           | 1625  | 8609  | 4        | 73   | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-6           | 1625  | 8610  | 6        | 73   | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-6           | 1625  | 8611  | 8        | 74   | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-6           | 1625  | 8612  | 10       | 74   | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-6           | 1625  | 8613  | 12       | 74   | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-6           | 1625  | 8614  | 14       | 74   | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-6           | 1626  | 8615  | 1        | 75   | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-6           | 1626  | 8616  | 3        | 75   | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-6           | 1626  | 8617  | 5        | 75   | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-6           | 1626  | 8618  | 7        | 75   | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-6           | 1626  | 8619  | 9        | 76   | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-6           | 1626  | 8620  | 11       | 76   | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-6           | 1626  | 8621  | 13       | 76   | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-6           | 1626  | 8622  | 15       | 76   | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-7           | 1627  | 8623  | 0        | 77   | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-7           | 1627  | 8624  | 2        | 77   | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-7           | 1627  | 8625  | 4        | 77   | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-7           | 1627  | 8626  | 6        | 77   | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-7           | 1627  | 8627  | 8        | 78   | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-7           | 1627  | 8628  | 10       | 78   | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-7           | 1627  | 8629  | 12       | 78   | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-7           | 1627  | 8630  | 14       | 78   | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-7           | 1628  | 8631  | 1        | 79   | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-7           | 1628  | 8632  | 3        | 79   | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-7           | 1628  | 8633  | 5        | 79   | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-7           | 1628  | 8634  | 7        | 79   | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-7           | 1628  | 8635  | 9        | 80   | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-7           | 1628  | 8636  | 11       | 80   | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-7           | 1628  | 8637  | 13       | 80   | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-7           | 1628  | 8638  | 15       | 80   | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-8           | 1629  | 8639  | 0        | 81   | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-8           | 1629  | 8640  | 2        | 81   | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-8           | 1629  | 8641  | 4        | 81   | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-8           | 1629  | 8642  | 6        | 81   | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-8           | 1629  | 8643  | 8        | 82   | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-8           | 1629  | 8644  | 10       | 82   | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-8           | 1629  | 8645  | 12       | 82   | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-8           | 1629  | 8646  | 14       | 82   | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-8           | 1630  | 8647  | 1        | 83   | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-8           | 1630  | 8648  | 3        | 83   | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-8           | 1630  | 8649  | 5        | 83   | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-8           | 1630  | 8650  | 7        | 83   | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-8           | 1630  | 8651  | 9        | 84   | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-8           | 1630  | 8652  | 11       | 84   | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-8           | 1630  | 8653  | 13       | 84   | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-8           | 1630  | 8654  | 15       | 84   | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-9           | 1631  | 8655  | 0        | 85   | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-9           | 1631  | 8656  | 2        | 85   | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-9           | 1631  | 8657  | 4        | 85   | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-9           | 1631  | 8658  | 6        | 85   | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-9           | 1631  | 8659  | 8        | 86   | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-9           | 1631  | 8660  | 10       | 86   | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-9           | 1631  | 8661  | 12       | 86   | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-9           | 1631  | 8662  | 14       | 86   | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-9           | 1632  | 8663  | 1        | 87   | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-9           | 1632  | 8664  | 3        | 87   | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-9           | 1632  | 8665  | 5        | 87   | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-9           | 1632  | 8666  | 7        | 87   | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-9           | 1632  | 8667  | 9        | 88   | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-9           | 1632  | 8668  | 11       | 88   | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-9           | 1632  | 8669  | 13       | 88   | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-9           | 1632  | 8670  | 15       | 88   | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-10          | 1633  | 8671  | 0        | 89   | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-10          | 1633  | 8672  | 2        | 89   | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-10          | 1633  | 8673  | 4        | 89   | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-10          | 1633  | 8674  | 6        | 89   | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-10          | 1633  | 8675  | 8        | 90   | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-10          | 1633  | 8676  | 10       | 90   | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-10          | 1633  | 8677  | 12       | 90   | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-10          | 1633  | 8678  | 14       | 90   | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-10          | 1634  | 8679  | 1        | 91   | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-10          | 1634  | 8680  | 3        | 91   | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-10          | 1634  | 8681  | 5        | 91   | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-10          | 1634  | 8682  | 7        | 91   | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-10          | 1634  | 8683  | 9        | 92   | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-10          | 1634  | 8684  | 11       | 92   | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-10          | 1634  | 8685  | 13       | 92   | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-10          | 1634  | 8686  | 15       | 92   | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-11          | 1635  | 8687  | 0        | 93   | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-11          | 1635  | 8688  | 2        | 93   | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-11          | 1635  | 8689  | 4        | 93   | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-11          | 1635  | 8690  | 6        | 93   | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-11          | 1635  | 8691  | 8        | 94   | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-11          | 1635  | 8692  | 10       | 94   | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-11          | 1635  | 8693  | 12       | 94   | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-11          | 1635  | 8694  | 14       | 94   | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-11          | 1636  | 8695  | 1        | 95   | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-11          | 1636  | 8696  | 3        | 95   | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-11          | 1636  | 8697  | 5        | 95   | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-11          | 1636  | 8698  | 7        | 95   | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-11          | 1636  | 8699  | 9        | 96   | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-11          | 1636  | 8700  | 11       | 96   | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-11          | 1636  | 8701  | 13       | 96   | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-11          | 1636  | 8702  | 15       | 96   | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-12          | 1637  | 8703  | 0        | 97   | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-12          | 1637  | 8704  | 2        | 97   | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-12          | 1637  | 8705  | 4        | 97   | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-12          | 1637  | 8706  | 6        | 97   | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-12          | 1637  | 8707  | 8        | 98   | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-12          | 1637  | 8708  | 10       | 98   | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-12          | 1637  | 8709  | 12       | 98   | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-12          | 1637  | 8710  | 14       | 98   | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-12          | 1638  | 8711  | 1        | 99   | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-12          | 1638  | 8712  | 3        | 99   | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-12          | 1638  | 8713  | 5        | 99   | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-12          | 1638  | 8714  | 7        | 99   | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-12          | 1638  | 8715  | 9        | 100  | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-12          | 1638  | 8716  | 11       | 100  | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-12          | 1638  | 8717  | 13       | 100  | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-12          | 1638  | 8718  | 15       | 100  | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-13          | 1639  | 8719  | 0        | 101  | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-13          | 1639  | 8720  | 2        | 101  | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-13          | 1639  | 8721  | 4        | 101  | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-13          | 1639  | 8722  | 6        | 101  | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-13          | 1639  | 8723  | 8        | 102  | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-13          | 1639  | 8724  | 10       | 102  | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-13          | 1639  | 8725  | 12       | 102  | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-13          | 1639  | 8726  | 14       | 102  | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-13          | 1640  | 8727  | 1        | 103  | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-13          | 1640  | 8728  | 3        | 103  | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-13          | 1640  | 8729  | 5        | 103  | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-13          | 1640  | 8730  | 7        | 103  | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-13          | 1640  | 8731  | 9        | 104  | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-13          | 1640  | 8732  | 11       | 104  | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-13          | 1640  | 8733  | 13       | 104  | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-13          | 1640  | 8734  | 15       | 104  | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
 +---------- + -------------------- + ----- + ----- + -------- + ---- + -------------------- + ------------------------------ + ------------------------------+
diff --git a/spec/output/graffiti-gpu-removed-OAR-updated_diff_stdout.txt b/spec/output/graffiti-gpu-removed-OAR-updated_diff_stdout.txt
index 5fac025605b..7ae661fae5d 100644
--- a/spec/output/graffiti-gpu-removed-OAR-updated_diff_stdout.txt
+++ b/spec/output/graffiti-gpu-removed-OAR-updated_diff_stdout.txt
@@ -1,6 +1,6 @@
 Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for added, ['~', 'key', 'old value', 'new value'] for changed
   clustera-1:
-    ["~", "gpu_model", "RTX 2080 Ti", "GeForce RTX 2080 Ti"]
+    ["~", "gpu_model", "RTX 2080 Ti", "NVIDIA GeForce RTX 2080 Ti"]
     ["~", "wattmeter", "MULTIPLE", "NO"]
     ["+", "core_count", 16]
     ["+", "cpu_count", 2]
diff --git a/spec/output/graffiti-gpu-removed-OAR-updated_print_stdout.txt b/spec/output/graffiti-gpu-removed-OAR-updated_print_stdout.txt
index 075c1049c2d..95614b5be59 100644
--- a/spec/output/graffiti-gpu-removed-OAR-updated_print_stdout.txt
+++ b/spec/output/graffiti-gpu-removed-OAR-updated_print_stdout.txt
@@ -93,24 +93,24 @@ property_exist 'disk_reservation_count' || oarproperty -a disk_reservation_count
 ###################################
 # clustera-1.nancy.grid5000.fr
 ###################################
-oarnodesetting --sql "host='clustera-1.nancy.grid5000.fr' AND resource_id='9651' AND type='default'" -p cpu=1615 -p core=8527 -p cpuset=0 -p gpu=53 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-1.nancy.grid5000.fr' AND resource_id='9652' AND type='default'" -p cpu=1615 -p core=8528 -p cpuset=2 -p gpu=53 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-1.nancy.grid5000.fr' AND resource_id='9653' AND type='default'" -p cpu=1615 -p core=8529 -p cpuset=4 -p gpu=53 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-1.nancy.grid5000.fr' AND resource_id='9654' AND type='default'" -p cpu=1615 -p core=8530 -p cpuset=6 -p gpu=53 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-1.nancy.grid5000.fr' AND resource_id='9655' AND type='default'" -p cpu=1615 -p core=8531 -p cpuset=8 -p gpu=54 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-1.nancy.grid5000.fr' AND resource_id='9656' AND type='default'" -p cpu=1615 -p core=8532 -p cpuset=10 -p gpu=54 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-1.nancy.grid5000.fr' AND resource_id='9657' AND type='default'" -p cpu=1615 -p core=8533 -p cpuset=12 -p gpu=54 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-1.nancy.grid5000.fr' AND resource_id='9658' AND type='default'" -p cpu=1615 -p core=8534 -p cpuset=14 -p gpu=54 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-1.nancy.grid5000.fr' AND resource_id='9659' AND type='default'" -p cpu=1616 -p core=8535 -p cpuset=1 -p gpu=55 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-1.nancy.grid5000.fr' AND resource_id='9660' AND type='default'" -p cpu=1616 -p core=8536 -p cpuset=3 -p gpu=55 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-1.nancy.grid5000.fr' AND resource_id='9661' AND type='default'" -p cpu=1616 -p core=8537 -p cpuset=5 -p gpu=55 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-1.nancy.grid5000.fr' AND resource_id='9662' AND type='default'" -p cpu=1616 -p core=8538 -p cpuset=7 -p gpu=55 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-1.nancy.grid5000.fr' AND resource_id='9663' AND type='default'" -p cpu=1616 -p core=8539 -p cpuset=9 -p gpu=56 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting --sql "host='clustera-1.nancy.grid5000.fr' AND resource_id='9664' AND type='default'" -p cpu=1616 -p core=8540 -p cpuset=11 -p gpu=56 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting --sql "host='clustera-1.nancy.grid5000.fr' AND resource_id='9665' AND type='default'" -p cpu=1616 -p core=8541 -p cpuset=13 -p gpu=56 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting --sql "host='clustera-1.nancy.grid5000.fr' AND resource_id='9666' AND type='default'" -p cpu=1616 -p core=8542 -p cpuset=15 -p gpu=56 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-1.nancy.grid5000.fr' AND resource_id='9651' AND type='default'" -p cpu=1615 -p core=8527 -p cpuset=0 -p gpu=53 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-1.nancy.grid5000.fr' AND resource_id='9652' AND type='default'" -p cpu=1615 -p core=8528 -p cpuset=2 -p gpu=53 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-1.nancy.grid5000.fr' AND resource_id='9653' AND type='default'" -p cpu=1615 -p core=8529 -p cpuset=4 -p gpu=53 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-1.nancy.grid5000.fr' AND resource_id='9654' AND type='default'" -p cpu=1615 -p core=8530 -p cpuset=6 -p gpu=53 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-1.nancy.grid5000.fr' AND resource_id='9655' AND type='default'" -p cpu=1615 -p core=8531 -p cpuset=8 -p gpu=54 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-1.nancy.grid5000.fr' AND resource_id='9656' AND type='default'" -p cpu=1615 -p core=8532 -p cpuset=10 -p gpu=54 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-1.nancy.grid5000.fr' AND resource_id='9657' AND type='default'" -p cpu=1615 -p core=8533 -p cpuset=12 -p gpu=54 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-1.nancy.grid5000.fr' AND resource_id='9658' AND type='default'" -p cpu=1615 -p core=8534 -p cpuset=14 -p gpu=54 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-1.nancy.grid5000.fr' AND resource_id='9659' AND type='default'" -p cpu=1616 -p core=8535 -p cpuset=1 -p gpu=55 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-1.nancy.grid5000.fr' AND resource_id='9660' AND type='default'" -p cpu=1616 -p core=8536 -p cpuset=3 -p gpu=55 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-1.nancy.grid5000.fr' AND resource_id='9661' AND type='default'" -p cpu=1616 -p core=8537 -p cpuset=5 -p gpu=55 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-1.nancy.grid5000.fr' AND resource_id='9662' AND type='default'" -p cpu=1616 -p core=8538 -p cpuset=7 -p gpu=55 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-1.nancy.grid5000.fr' AND resource_id='9663' AND type='default'" -p cpu=1616 -p core=8539 -p cpuset=9 -p gpu=56 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-1.nancy.grid5000.fr' AND resource_id='9664' AND type='default'" -p cpu=1616 -p core=8540 -p cpuset=11 -p gpu=56 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-1.nancy.grid5000.fr' AND resource_id='9665' AND type='default'" -p cpu=1616 -p core=8541 -p cpuset=13 -p gpu=56 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-1.nancy.grid5000.fr' AND resource_id='9666' AND type='default'" -p cpu=1616 -p core=8542 -p cpuset=15 -p gpu=56 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 echo; echo 'Setting properties for clustera-1.nancy.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-1.nancy.grid5000.fr' and type='default'" -p ip='172.16.64.1' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 FL1CBX2' -p eth_count=1 -p eth_kavlan_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='GeForce RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='NO' -p cluster_priority=201906 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
+oarnodesetting --sql "host='clustera-1.nancy.grid5000.fr' and type='default'" -p ip='172.16.64.1' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 FL1CBX2' -p eth_count=1 -p eth_kavlan_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='NO' -p cluster_priority=201906 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
 
 echo '================================================================================'
 
@@ -118,24 +118,24 @@ echo '==========================================================================
 ###################################
 # clustera-2.nancy.grid5000.fr
 ###################################
-oarnodesetting --sql "host='clustera-2.nancy.grid5000.fr' AND resource_id='9667' AND type='default'" -p cpu=1617 -p core=8543 -p cpuset=0 -p gpu=57 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-2.nancy.grid5000.fr' AND resource_id='9668' AND type='default'" -p cpu=1617 -p core=8544 -p cpuset=2 -p gpu=57 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-2.nancy.grid5000.fr' AND resource_id='9669' AND type='default'" -p cpu=1617 -p core=8545 -p cpuset=4 -p gpu=57 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-2.nancy.grid5000.fr' AND resource_id='9670' AND type='default'" -p cpu=1617 -p core=8546 -p cpuset=6 -p gpu=57 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-2.nancy.grid5000.fr' AND resource_id='9671' AND type='default'" -p cpu=1617 -p core=8547 -p cpuset=8 -p gpu=58 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-2.nancy.grid5000.fr' AND resource_id='9672' AND type='default'" -p cpu=1617 -p core=8548 -p cpuset=10 -p gpu=58 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-2.nancy.grid5000.fr' AND resource_id='9673' AND type='default'" -p cpu=1617 -p core=8549 -p cpuset=12 -p gpu=58 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-2.nancy.grid5000.fr' AND resource_id='9674' AND type='default'" -p cpu=1617 -p core=8550 -p cpuset=14 -p gpu=58 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-2.nancy.grid5000.fr' AND resource_id='9675' AND type='default'" -p cpu=1618 -p core=8551 -p cpuset=1 -p gpu=59 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-2.nancy.grid5000.fr' AND resource_id='9676' AND type='default'" -p cpu=1618 -p core=8552 -p cpuset=3 -p gpu=59 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-2.nancy.grid5000.fr' AND resource_id='9677' AND type='default'" -p cpu=1618 -p core=8553 -p cpuset=5 -p gpu=59 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-2.nancy.grid5000.fr' AND resource_id='9678' AND type='default'" -p cpu=1618 -p core=8554 -p cpuset=7 -p gpu=59 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-2.nancy.grid5000.fr' AND resource_id='9679' AND type='default'" -p cpu=1618 -p core=8555 -p cpuset=9 -p gpu=59 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-2.nancy.grid5000.fr' AND resource_id='9680' AND type='default'" -p cpu=1618 -p core=8556 -p cpuset=11 -p gpu=59 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-2.nancy.grid5000.fr' AND resource_id='9681' AND type='default'" -p cpu=1618 -p core=8557 -p cpuset=13 -p gpu=59 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-2.nancy.grid5000.fr' AND resource_id='9682' AND type='default'" -p cpu=1618 -p core=8558 -p cpuset=15 -p gpu=59 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-2.nancy.grid5000.fr' AND resource_id='9667' AND type='default'" -p cpu=1617 -p core=8543 -p cpuset=0 -p gpu=57 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-2.nancy.grid5000.fr' AND resource_id='9668' AND type='default'" -p cpu=1617 -p core=8544 -p cpuset=2 -p gpu=57 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-2.nancy.grid5000.fr' AND resource_id='9669' AND type='default'" -p cpu=1617 -p core=8545 -p cpuset=4 -p gpu=57 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-2.nancy.grid5000.fr' AND resource_id='9670' AND type='default'" -p cpu=1617 -p core=8546 -p cpuset=6 -p gpu=57 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-2.nancy.grid5000.fr' AND resource_id='9671' AND type='default'" -p cpu=1617 -p core=8547 -p cpuset=8 -p gpu=58 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-2.nancy.grid5000.fr' AND resource_id='9672' AND type='default'" -p cpu=1617 -p core=8548 -p cpuset=10 -p gpu=58 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-2.nancy.grid5000.fr' AND resource_id='9673' AND type='default'" -p cpu=1617 -p core=8549 -p cpuset=12 -p gpu=58 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-2.nancy.grid5000.fr' AND resource_id='9674' AND type='default'" -p cpu=1617 -p core=8550 -p cpuset=14 -p gpu=58 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-2.nancy.grid5000.fr' AND resource_id='9675' AND type='default'" -p cpu=1618 -p core=8551 -p cpuset=1 -p gpu=59 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-2.nancy.grid5000.fr' AND resource_id='9676' AND type='default'" -p cpu=1618 -p core=8552 -p cpuset=3 -p gpu=59 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-2.nancy.grid5000.fr' AND resource_id='9677' AND type='default'" -p cpu=1618 -p core=8553 -p cpuset=5 -p gpu=59 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-2.nancy.grid5000.fr' AND resource_id='9678' AND type='default'" -p cpu=1618 -p core=8554 -p cpuset=7 -p gpu=59 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-2.nancy.grid5000.fr' AND resource_id='9679' AND type='default'" -p cpu=1618 -p core=8555 -p cpuset=9 -p gpu=59 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-2.nancy.grid5000.fr' AND resource_id='9680' AND type='default'" -p cpu=1618 -p core=8556 -p cpuset=11 -p gpu=59 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-2.nancy.grid5000.fr' AND resource_id='9681' AND type='default'" -p cpu=1618 -p core=8557 -p cpuset=13 -p gpu=59 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-2.nancy.grid5000.fr' AND resource_id='9682' AND type='default'" -p cpu=1618 -p core=8558 -p cpuset=15 -p gpu=59 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
 echo; echo 'Setting properties for clustera-2.nancy.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-2.nancy.grid5000.fr' and type='default'" -p ip='172.16.64.2' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 9L1CBX2' -p eth_count=1 -p eth_kavlan_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='GeForce RTX 2080 Ti' -p gpu_count=3 -p exotic='NO' -p mic='NO' -p wattmeter='NO' -p cluster_priority=201906 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
+oarnodesetting --sql "host='clustera-2.nancy.grid5000.fr' and type='default'" -p ip='172.16.64.2' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 9L1CBX2' -p eth_count=1 -p eth_kavlan_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpu_count=3 -p exotic='NO' -p mic='NO' -p wattmeter='NO' -p cluster_priority=201906 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
 
 echo '================================================================================'
 
@@ -143,24 +143,24 @@ echo '==========================================================================
 ###################################
 # clustera-3.nancy.grid5000.fr
 ###################################
-oarnodesetting --sql "host='clustera-3.nancy.grid5000.fr' AND resource_id='9683' AND type='default'" -p cpu=1619 -p core=8559 -p cpuset=0 -p gpu=61 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-3.nancy.grid5000.fr' AND resource_id='9684' AND type='default'" -p cpu=1619 -p core=8560 -p cpuset=2 -p gpu=61 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-3.nancy.grid5000.fr' AND resource_id='9685' AND type='default'" -p cpu=1619 -p core=8561 -p cpuset=4 -p gpu=61 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-3.nancy.grid5000.fr' AND resource_id='9686' AND type='default'" -p cpu=1619 -p core=8562 -p cpuset=6 -p gpu=61 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-3.nancy.grid5000.fr' AND resource_id='9687' AND type='default'" -p cpu=1619 -p core=8563 -p cpuset=8 -p gpu=62 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-3.nancy.grid5000.fr' AND resource_id='9688' AND type='default'" -p cpu=1619 -p core=8564 -p cpuset=10 -p gpu=62 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-3.nancy.grid5000.fr' AND resource_id='9689' AND type='default'" -p cpu=1619 -p core=8565 -p cpuset=12 -p gpu=62 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-3.nancy.grid5000.fr' AND resource_id='9690' AND type='default'" -p cpu=1619 -p core=8566 -p cpuset=14 -p gpu=62 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-3.nancy.grid5000.fr' AND resource_id='9691' AND type='default'" -p cpu=1620 -p core=8567 -p cpuset=1 -p gpu=63 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-3.nancy.grid5000.fr' AND resource_id='9692' AND type='default'" -p cpu=1620 -p core=8568 -p cpuset=3 -p gpu=63 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-3.nancy.grid5000.fr' AND resource_id='9693' AND type='default'" -p cpu=1620 -p core=8569 -p cpuset=5 -p gpu=63 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-3.nancy.grid5000.fr' AND resource_id='9694' AND type='default'" -p cpu=1620 -p core=8570 -p cpuset=7 -p gpu=63 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-3.nancy.grid5000.fr' AND resource_id='9695' AND type='default'" -p cpu=1620 -p core=8571 -p cpuset=9 -p gpu=64 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting --sql "host='clustera-3.nancy.grid5000.fr' AND resource_id='9696' AND type='default'" -p cpu=1620 -p core=8572 -p cpuset=11 -p gpu=64 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting --sql "host='clustera-3.nancy.grid5000.fr' AND resource_id='9697' AND type='default'" -p cpu=1620 -p core=8573 -p cpuset=13 -p gpu=64 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting --sql "host='clustera-3.nancy.grid5000.fr' AND resource_id='9698' AND type='default'" -p cpu=1620 -p core=8574 -p cpuset=15 -p gpu=64 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-3.nancy.grid5000.fr' AND resource_id='9683' AND type='default'" -p cpu=1619 -p core=8559 -p cpuset=0 -p gpu=61 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-3.nancy.grid5000.fr' AND resource_id='9684' AND type='default'" -p cpu=1619 -p core=8560 -p cpuset=2 -p gpu=61 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-3.nancy.grid5000.fr' AND resource_id='9685' AND type='default'" -p cpu=1619 -p core=8561 -p cpuset=4 -p gpu=61 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-3.nancy.grid5000.fr' AND resource_id='9686' AND type='default'" -p cpu=1619 -p core=8562 -p cpuset=6 -p gpu=61 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-3.nancy.grid5000.fr' AND resource_id='9687' AND type='default'" -p cpu=1619 -p core=8563 -p cpuset=8 -p gpu=62 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-3.nancy.grid5000.fr' AND resource_id='9688' AND type='default'" -p cpu=1619 -p core=8564 -p cpuset=10 -p gpu=62 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-3.nancy.grid5000.fr' AND resource_id='9689' AND type='default'" -p cpu=1619 -p core=8565 -p cpuset=12 -p gpu=62 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-3.nancy.grid5000.fr' AND resource_id='9690' AND type='default'" -p cpu=1619 -p core=8566 -p cpuset=14 -p gpu=62 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-3.nancy.grid5000.fr' AND resource_id='9691' AND type='default'" -p cpu=1620 -p core=8567 -p cpuset=1 -p gpu=63 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-3.nancy.grid5000.fr' AND resource_id='9692' AND type='default'" -p cpu=1620 -p core=8568 -p cpuset=3 -p gpu=63 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-3.nancy.grid5000.fr' AND resource_id='9693' AND type='default'" -p cpu=1620 -p core=8569 -p cpuset=5 -p gpu=63 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-3.nancy.grid5000.fr' AND resource_id='9694' AND type='default'" -p cpu=1620 -p core=8570 -p cpuset=7 -p gpu=63 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-3.nancy.grid5000.fr' AND resource_id='9695' AND type='default'" -p cpu=1620 -p core=8571 -p cpuset=9 -p gpu=64 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-3.nancy.grid5000.fr' AND resource_id='9696' AND type='default'" -p cpu=1620 -p core=8572 -p cpuset=11 -p gpu=64 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-3.nancy.grid5000.fr' AND resource_id='9697' AND type='default'" -p cpu=1620 -p core=8573 -p cpuset=13 -p gpu=64 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-3.nancy.grid5000.fr' AND resource_id='9698' AND type='default'" -p cpu=1620 -p core=8574 -p cpuset=15 -p gpu=64 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 echo; echo 'Setting properties for clustera-3.nancy.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-3.nancy.grid5000.fr' and type='default'" -p ip='172.16.64.3' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 BL1CBX2' -p eth_count=1 -p eth_kavlan_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='GeForce RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='NO' -p cluster_priority=201906 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
+oarnodesetting --sql "host='clustera-3.nancy.grid5000.fr' and type='default'" -p ip='172.16.64.3' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 BL1CBX2' -p eth_count=1 -p eth_kavlan_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='NO' -p cluster_priority=201906 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
 
 echo '================================================================================'
 
@@ -168,24 +168,24 @@ echo '==========================================================================
 ###################################
 # clustera-4.nancy.grid5000.fr
 ###################################
-oarnodesetting --sql "host='clustera-4.nancy.grid5000.fr' AND resource_id='9699' AND type='default'" -p cpu=1621 -p core=8575 -p cpuset=0 -p gpu=65 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-4.nancy.grid5000.fr' AND resource_id='9700' AND type='default'" -p cpu=1621 -p core=8576 -p cpuset=2 -p gpu=65 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-4.nancy.grid5000.fr' AND resource_id='9701' AND type='default'" -p cpu=1621 -p core=8577 -p cpuset=4 -p gpu=65 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-4.nancy.grid5000.fr' AND resource_id='9702' AND type='default'" -p cpu=1621 -p core=8578 -p cpuset=6 -p gpu=65 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-4.nancy.grid5000.fr' AND resource_id='9703' AND type='default'" -p cpu=1621 -p core=8579 -p cpuset=8 -p gpu=66 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-4.nancy.grid5000.fr' AND resource_id='9704' AND type='default'" -p cpu=1621 -p core=8580 -p cpuset=10 -p gpu=66 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-4.nancy.grid5000.fr' AND resource_id='9705' AND type='default'" -p cpu=1621 -p core=8581 -p cpuset=12 -p gpu=66 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-4.nancy.grid5000.fr' AND resource_id='9706' AND type='default'" -p cpu=1621 -p core=8582 -p cpuset=14 -p gpu=66 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-4.nancy.grid5000.fr' AND resource_id='9707' AND type='default'" -p cpu=1622 -p core=8583 -p cpuset=1 -p gpu=67 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-4.nancy.grid5000.fr' AND resource_id='9708' AND type='default'" -p cpu=1622 -p core=8584 -p cpuset=3 -p gpu=67 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-4.nancy.grid5000.fr' AND resource_id='9709' AND type='default'" -p cpu=1622 -p core=8585 -p cpuset=5 -p gpu=67 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-4.nancy.grid5000.fr' AND resource_id='9710' AND type='default'" -p cpu=1622 -p core=8586 -p cpuset=7 -p gpu=67 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-4.nancy.grid5000.fr' AND resource_id='9711' AND type='default'" -p cpu=1622 -p core=8587 -p cpuset=9 -p gpu=68 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting --sql "host='clustera-4.nancy.grid5000.fr' AND resource_id='9712' AND type='default'" -p cpu=1622 -p core=8588 -p cpuset=11 -p gpu=68 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting --sql "host='clustera-4.nancy.grid5000.fr' AND resource_id='9713' AND type='default'" -p cpu=1622 -p core=8589 -p cpuset=13 -p gpu=68 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting --sql "host='clustera-4.nancy.grid5000.fr' AND resource_id='9714' AND type='default'" -p cpu=1622 -p core=8590 -p cpuset=15 -p gpu=68 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-4.nancy.grid5000.fr' AND resource_id='9699' AND type='default'" -p cpu=1621 -p core=8575 -p cpuset=0 -p gpu=65 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-4.nancy.grid5000.fr' AND resource_id='9700' AND type='default'" -p cpu=1621 -p core=8576 -p cpuset=2 -p gpu=65 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-4.nancy.grid5000.fr' AND resource_id='9701' AND type='default'" -p cpu=1621 -p core=8577 -p cpuset=4 -p gpu=65 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-4.nancy.grid5000.fr' AND resource_id='9702' AND type='default'" -p cpu=1621 -p core=8578 -p cpuset=6 -p gpu=65 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-4.nancy.grid5000.fr' AND resource_id='9703' AND type='default'" -p cpu=1621 -p core=8579 -p cpuset=8 -p gpu=66 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-4.nancy.grid5000.fr' AND resource_id='9704' AND type='default'" -p cpu=1621 -p core=8580 -p cpuset=10 -p gpu=66 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-4.nancy.grid5000.fr' AND resource_id='9705' AND type='default'" -p cpu=1621 -p core=8581 -p cpuset=12 -p gpu=66 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-4.nancy.grid5000.fr' AND resource_id='9706' AND type='default'" -p cpu=1621 -p core=8582 -p cpuset=14 -p gpu=66 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-4.nancy.grid5000.fr' AND resource_id='9707' AND type='default'" -p cpu=1622 -p core=8583 -p cpuset=1 -p gpu=67 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-4.nancy.grid5000.fr' AND resource_id='9708' AND type='default'" -p cpu=1622 -p core=8584 -p cpuset=3 -p gpu=67 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-4.nancy.grid5000.fr' AND resource_id='9709' AND type='default'" -p cpu=1622 -p core=8585 -p cpuset=5 -p gpu=67 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-4.nancy.grid5000.fr' AND resource_id='9710' AND type='default'" -p cpu=1622 -p core=8586 -p cpuset=7 -p gpu=67 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-4.nancy.grid5000.fr' AND resource_id='9711' AND type='default'" -p cpu=1622 -p core=8587 -p cpuset=9 -p gpu=68 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-4.nancy.grid5000.fr' AND resource_id='9712' AND type='default'" -p cpu=1622 -p core=8588 -p cpuset=11 -p gpu=68 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-4.nancy.grid5000.fr' AND resource_id='9713' AND type='default'" -p cpu=1622 -p core=8589 -p cpuset=13 -p gpu=68 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-4.nancy.grid5000.fr' AND resource_id='9714' AND type='default'" -p cpu=1622 -p core=8590 -p cpuset=15 -p gpu=68 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 echo; echo 'Setting properties for clustera-4.nancy.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-4.nancy.grid5000.fr' and type='default'" -p ip='172.16.64.4' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 DL1CBX2' -p eth_count=1 -p eth_kavlan_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='GeForce RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='NO' -p cluster_priority=201906 -p max_walltime=172800 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
+oarnodesetting --sql "host='clustera-4.nancy.grid5000.fr' and type='default'" -p ip='172.16.64.4' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 DL1CBX2' -p eth_count=1 -p eth_kavlan_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='NO' -p cluster_priority=201906 -p max_walltime=172800 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
 
 echo '================================================================================'
 
@@ -193,24 +193,24 @@ echo '==========================================================================
 ###################################
 # clustera-5.nancy.grid5000.fr
 ###################################
-oarnodesetting --sql "host='clustera-5.nancy.grid5000.fr' AND resource_id='9715' AND type='default'" -p cpu=1623 -p core=8591 -p cpuset=0 -p gpu=69 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-5.nancy.grid5000.fr' AND resource_id='9716' AND type='default'" -p cpu=1623 -p core=8592 -p cpuset=2 -p gpu=69 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-5.nancy.grid5000.fr' AND resource_id='9717' AND type='default'" -p cpu=1623 -p core=8593 -p cpuset=4 -p gpu=69 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-5.nancy.grid5000.fr' AND resource_id='9718' AND type='default'" -p cpu=1623 -p core=8594 -p cpuset=6 -p gpu=69 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-5.nancy.grid5000.fr' AND resource_id='9719' AND type='default'" -p cpu=1623 -p core=8595 -p cpuset=8 -p gpu=70 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-5.nancy.grid5000.fr' AND resource_id='9720' AND type='default'" -p cpu=1623 -p core=8596 -p cpuset=10 -p gpu=70 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-5.nancy.grid5000.fr' AND resource_id='9721' AND type='default'" -p cpu=1623 -p core=8597 -p cpuset=12 -p gpu=70 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-5.nancy.grid5000.fr' AND resource_id='9722' AND type='default'" -p cpu=1623 -p core=8598 -p cpuset=14 -p gpu=70 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-5.nancy.grid5000.fr' AND resource_id='9723' AND type='default'" -p cpu=1624 -p core=8599 -p cpuset=1 -p gpu=71 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-5.nancy.grid5000.fr' AND resource_id='9724' AND type='default'" -p cpu=1624 -p core=8600 -p cpuset=3 -p gpu=71 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-5.nancy.grid5000.fr' AND resource_id='9725' AND type='default'" -p cpu=1624 -p core=8601 -p cpuset=5 -p gpu=71 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-5.nancy.grid5000.fr' AND resource_id='9726' AND type='default'" -p cpu=1624 -p core=8602 -p cpuset=7 -p gpu=71 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-5.nancy.grid5000.fr' AND resource_id='9727' AND type='default'" -p cpu=1624 -p core=8603 -p cpuset=9 -p gpu=72 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting --sql "host='clustera-5.nancy.grid5000.fr' AND resource_id='9728' AND type='default'" -p cpu=1624 -p core=8604 -p cpuset=11 -p gpu=72 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting --sql "host='clustera-5.nancy.grid5000.fr' AND resource_id='9729' AND type='default'" -p cpu=1624 -p core=8605 -p cpuset=13 -p gpu=72 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting --sql "host='clustera-5.nancy.grid5000.fr' AND resource_id='9730' AND type='default'" -p cpu=1624 -p core=8606 -p cpuset=15 -p gpu=72 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-5.nancy.grid5000.fr' AND resource_id='9715' AND type='default'" -p cpu=1623 -p core=8591 -p cpuset=0 -p gpu=69 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-5.nancy.grid5000.fr' AND resource_id='9716' AND type='default'" -p cpu=1623 -p core=8592 -p cpuset=2 -p gpu=69 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-5.nancy.grid5000.fr' AND resource_id='9717' AND type='default'" -p cpu=1623 -p core=8593 -p cpuset=4 -p gpu=69 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-5.nancy.grid5000.fr' AND resource_id='9718' AND type='default'" -p cpu=1623 -p core=8594 -p cpuset=6 -p gpu=69 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-5.nancy.grid5000.fr' AND resource_id='9719' AND type='default'" -p cpu=1623 -p core=8595 -p cpuset=8 -p gpu=70 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-5.nancy.grid5000.fr' AND resource_id='9720' AND type='default'" -p cpu=1623 -p core=8596 -p cpuset=10 -p gpu=70 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-5.nancy.grid5000.fr' AND resource_id='9721' AND type='default'" -p cpu=1623 -p core=8597 -p cpuset=12 -p gpu=70 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-5.nancy.grid5000.fr' AND resource_id='9722' AND type='default'" -p cpu=1623 -p core=8598 -p cpuset=14 -p gpu=70 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-5.nancy.grid5000.fr' AND resource_id='9723' AND type='default'" -p cpu=1624 -p core=8599 -p cpuset=1 -p gpu=71 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-5.nancy.grid5000.fr' AND resource_id='9724' AND type='default'" -p cpu=1624 -p core=8600 -p cpuset=3 -p gpu=71 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-5.nancy.grid5000.fr' AND resource_id='9725' AND type='default'" -p cpu=1624 -p core=8601 -p cpuset=5 -p gpu=71 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-5.nancy.grid5000.fr' AND resource_id='9726' AND type='default'" -p cpu=1624 -p core=8602 -p cpuset=7 -p gpu=71 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-5.nancy.grid5000.fr' AND resource_id='9727' AND type='default'" -p cpu=1624 -p core=8603 -p cpuset=9 -p gpu=72 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-5.nancy.grid5000.fr' AND resource_id='9728' AND type='default'" -p cpu=1624 -p core=8604 -p cpuset=11 -p gpu=72 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-5.nancy.grid5000.fr' AND resource_id='9729' AND type='default'" -p cpu=1624 -p core=8605 -p cpuset=13 -p gpu=72 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-5.nancy.grid5000.fr' AND resource_id='9730' AND type='default'" -p cpu=1624 -p core=8606 -p cpuset=15 -p gpu=72 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 echo; echo 'Setting properties for clustera-5.nancy.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-5.nancy.grid5000.fr' and type='default'" -p ip='172.16.64.5' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 CL1CBX2' -p eth_count=1 -p eth_kavlan_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='GeForce RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='NO' -p cluster_priority=201906 -p max_walltime=172800 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
+oarnodesetting --sql "host='clustera-5.nancy.grid5000.fr' and type='default'" -p ip='172.16.64.5' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 CL1CBX2' -p eth_count=1 -p eth_kavlan_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='NO' -p cluster_priority=201906 -p max_walltime=172800 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
 
 echo '================================================================================'
 
@@ -218,24 +218,24 @@ echo '==========================================================================
 ###################################
 # clustera-6.nancy.grid5000.fr
 ###################################
-oarnodesetting --sql "host='clustera-6.nancy.grid5000.fr' AND resource_id='9731' AND type='default'" -p cpu=1625 -p core=8607 -p cpuset=0 -p gpu=73 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-6.nancy.grid5000.fr' AND resource_id='9732' AND type='default'" -p cpu=1625 -p core=8608 -p cpuset=2 -p gpu=73 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-6.nancy.grid5000.fr' AND resource_id='9733' AND type='default'" -p cpu=1625 -p core=8609 -p cpuset=4 -p gpu=73 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-6.nancy.grid5000.fr' AND resource_id='9734' AND type='default'" -p cpu=1625 -p core=8610 -p cpuset=6 -p gpu=73 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-6.nancy.grid5000.fr' AND resource_id='9735' AND type='default'" -p cpu=1625 -p core=8611 -p cpuset=8 -p gpu=74 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-6.nancy.grid5000.fr' AND resource_id='9736' AND type='default'" -p cpu=1625 -p core=8612 -p cpuset=10 -p gpu=74 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-6.nancy.grid5000.fr' AND resource_id='9737' AND type='default'" -p cpu=1625 -p core=8613 -p cpuset=12 -p gpu=74 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-6.nancy.grid5000.fr' AND resource_id='9738' AND type='default'" -p cpu=1625 -p core=8614 -p cpuset=14 -p gpu=74 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-6.nancy.grid5000.fr' AND resource_id='9739' AND type='default'" -p cpu=1626 -p core=8615 -p cpuset=1 -p gpu=75 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-6.nancy.grid5000.fr' AND resource_id='9740' AND type='default'" -p cpu=1626 -p core=8616 -p cpuset=3 -p gpu=75 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-6.nancy.grid5000.fr' AND resource_id='9741' AND type='default'" -p cpu=1626 -p core=8617 -p cpuset=5 -p gpu=75 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-6.nancy.grid5000.fr' AND resource_id='9742' AND type='default'" -p cpu=1626 -p core=8618 -p cpuset=7 -p gpu=75 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-6.nancy.grid5000.fr' AND resource_id='9743' AND type='default'" -p cpu=1626 -p core=8619 -p cpuset=9 -p gpu=76 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting --sql "host='clustera-6.nancy.grid5000.fr' AND resource_id='9744' AND type='default'" -p cpu=1626 -p core=8620 -p cpuset=11 -p gpu=76 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting --sql "host='clustera-6.nancy.grid5000.fr' AND resource_id='9745' AND type='default'" -p cpu=1626 -p core=8621 -p cpuset=13 -p gpu=76 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting --sql "host='clustera-6.nancy.grid5000.fr' AND resource_id='9746' AND type='default'" -p cpu=1626 -p core=8622 -p cpuset=15 -p gpu=76 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-6.nancy.grid5000.fr' AND resource_id='9731' AND type='default'" -p cpu=1625 -p core=8607 -p cpuset=0 -p gpu=73 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-6.nancy.grid5000.fr' AND resource_id='9732' AND type='default'" -p cpu=1625 -p core=8608 -p cpuset=2 -p gpu=73 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-6.nancy.grid5000.fr' AND resource_id='9733' AND type='default'" -p cpu=1625 -p core=8609 -p cpuset=4 -p gpu=73 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-6.nancy.grid5000.fr' AND resource_id='9734' AND type='default'" -p cpu=1625 -p core=8610 -p cpuset=6 -p gpu=73 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-6.nancy.grid5000.fr' AND resource_id='9735' AND type='default'" -p cpu=1625 -p core=8611 -p cpuset=8 -p gpu=74 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-6.nancy.grid5000.fr' AND resource_id='9736' AND type='default'" -p cpu=1625 -p core=8612 -p cpuset=10 -p gpu=74 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-6.nancy.grid5000.fr' AND resource_id='9737' AND type='default'" -p cpu=1625 -p core=8613 -p cpuset=12 -p gpu=74 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-6.nancy.grid5000.fr' AND resource_id='9738' AND type='default'" -p cpu=1625 -p core=8614 -p cpuset=14 -p gpu=74 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-6.nancy.grid5000.fr' AND resource_id='9739' AND type='default'" -p cpu=1626 -p core=8615 -p cpuset=1 -p gpu=75 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-6.nancy.grid5000.fr' AND resource_id='9740' AND type='default'" -p cpu=1626 -p core=8616 -p cpuset=3 -p gpu=75 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-6.nancy.grid5000.fr' AND resource_id='9741' AND type='default'" -p cpu=1626 -p core=8617 -p cpuset=5 -p gpu=75 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-6.nancy.grid5000.fr' AND resource_id='9742' AND type='default'" -p cpu=1626 -p core=8618 -p cpuset=7 -p gpu=75 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-6.nancy.grid5000.fr' AND resource_id='9743' AND type='default'" -p cpu=1626 -p core=8619 -p cpuset=9 -p gpu=76 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-6.nancy.grid5000.fr' AND resource_id='9744' AND type='default'" -p cpu=1626 -p core=8620 -p cpuset=11 -p gpu=76 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-6.nancy.grid5000.fr' AND resource_id='9745' AND type='default'" -p cpu=1626 -p core=8621 -p cpuset=13 -p gpu=76 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-6.nancy.grid5000.fr' AND resource_id='9746' AND type='default'" -p cpu=1626 -p core=8622 -p cpuset=15 -p gpu=76 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 echo; echo 'Setting properties for clustera-6.nancy.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-6.nancy.grid5000.fr' and type='default'" -p ip='172.16.64.6' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 8K1CBX2' -p eth_count=1 -p eth_kavlan_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='GeForce RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='NO' -p cluster_priority=201906 -p max_walltime=172800 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
+oarnodesetting --sql "host='clustera-6.nancy.grid5000.fr' and type='default'" -p ip='172.16.64.6' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 8K1CBX2' -p eth_count=1 -p eth_kavlan_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='NO' -p cluster_priority=201906 -p max_walltime=172800 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
 
 echo '================================================================================'
 
@@ -243,24 +243,24 @@ echo '==========================================================================
 ###################################
 # clustera-7.nancy.grid5000.fr
 ###################################
-oarnodesetting --sql "host='clustera-7.nancy.grid5000.fr' AND resource_id='9747' AND type='default'" -p cpu=1627 -p core=8623 -p cpuset=0 -p gpu=77 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-7.nancy.grid5000.fr' AND resource_id='9748' AND type='default'" -p cpu=1627 -p core=8624 -p cpuset=2 -p gpu=77 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-7.nancy.grid5000.fr' AND resource_id='9749' AND type='default'" -p cpu=1627 -p core=8625 -p cpuset=4 -p gpu=77 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-7.nancy.grid5000.fr' AND resource_id='9750' AND type='default'" -p cpu=1627 -p core=8626 -p cpuset=6 -p gpu=77 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-7.nancy.grid5000.fr' AND resource_id='9751' AND type='default'" -p cpu=1627 -p core=8627 -p cpuset=8 -p gpu=78 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-7.nancy.grid5000.fr' AND resource_id='9752' AND type='default'" -p cpu=1627 -p core=8628 -p cpuset=10 -p gpu=78 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-7.nancy.grid5000.fr' AND resource_id='9753' AND type='default'" -p cpu=1627 -p core=8629 -p cpuset=12 -p gpu=78 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-7.nancy.grid5000.fr' AND resource_id='9754' AND type='default'" -p cpu=1627 -p core=8630 -p cpuset=14 -p gpu=78 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-7.nancy.grid5000.fr' AND resource_id='9755' AND type='default'" -p cpu=1628 -p core=8631 -p cpuset=1 -p gpu=79 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-7.nancy.grid5000.fr' AND resource_id='9756' AND type='default'" -p cpu=1628 -p core=8632 -p cpuset=3 -p gpu=79 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-7.nancy.grid5000.fr' AND resource_id='9757' AND type='default'" -p cpu=1628 -p core=8633 -p cpuset=5 -p gpu=79 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-7.nancy.grid5000.fr' AND resource_id='9758' AND type='default'" -p cpu=1628 -p core=8634 -p cpuset=7 -p gpu=79 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-7.nancy.grid5000.fr' AND resource_id='9759' AND type='default'" -p cpu=1628 -p core=8635 -p cpuset=9 -p gpu=80 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting --sql "host='clustera-7.nancy.grid5000.fr' AND resource_id='9760' AND type='default'" -p cpu=1628 -p core=8636 -p cpuset=11 -p gpu=80 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting --sql "host='clustera-7.nancy.grid5000.fr' AND resource_id='9761' AND type='default'" -p cpu=1628 -p core=8637 -p cpuset=13 -p gpu=80 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting --sql "host='clustera-7.nancy.grid5000.fr' AND resource_id='9762' AND type='default'" -p cpu=1628 -p core=8638 -p cpuset=15 -p gpu=80 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-7.nancy.grid5000.fr' AND resource_id='9747' AND type='default'" -p cpu=1627 -p core=8623 -p cpuset=0 -p gpu=77 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-7.nancy.grid5000.fr' AND resource_id='9748' AND type='default'" -p cpu=1627 -p core=8624 -p cpuset=2 -p gpu=77 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-7.nancy.grid5000.fr' AND resource_id='9749' AND type='default'" -p cpu=1627 -p core=8625 -p cpuset=4 -p gpu=77 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-7.nancy.grid5000.fr' AND resource_id='9750' AND type='default'" -p cpu=1627 -p core=8626 -p cpuset=6 -p gpu=77 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-7.nancy.grid5000.fr' AND resource_id='9751' AND type='default'" -p cpu=1627 -p core=8627 -p cpuset=8 -p gpu=78 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-7.nancy.grid5000.fr' AND resource_id='9752' AND type='default'" -p cpu=1627 -p core=8628 -p cpuset=10 -p gpu=78 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-7.nancy.grid5000.fr' AND resource_id='9753' AND type='default'" -p cpu=1627 -p core=8629 -p cpuset=12 -p gpu=78 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-7.nancy.grid5000.fr' AND resource_id='9754' AND type='default'" -p cpu=1627 -p core=8630 -p cpuset=14 -p gpu=78 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-7.nancy.grid5000.fr' AND resource_id='9755' AND type='default'" -p cpu=1628 -p core=8631 -p cpuset=1 -p gpu=79 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-7.nancy.grid5000.fr' AND resource_id='9756' AND type='default'" -p cpu=1628 -p core=8632 -p cpuset=3 -p gpu=79 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-7.nancy.grid5000.fr' AND resource_id='9757' AND type='default'" -p cpu=1628 -p core=8633 -p cpuset=5 -p gpu=79 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-7.nancy.grid5000.fr' AND resource_id='9758' AND type='default'" -p cpu=1628 -p core=8634 -p cpuset=7 -p gpu=79 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-7.nancy.grid5000.fr' AND resource_id='9759' AND type='default'" -p cpu=1628 -p core=8635 -p cpuset=9 -p gpu=80 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-7.nancy.grid5000.fr' AND resource_id='9760' AND type='default'" -p cpu=1628 -p core=8636 -p cpuset=11 -p gpu=80 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-7.nancy.grid5000.fr' AND resource_id='9761' AND type='default'" -p cpu=1628 -p core=8637 -p cpuset=13 -p gpu=80 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-7.nancy.grid5000.fr' AND resource_id='9762' AND type='default'" -p cpu=1628 -p core=8638 -p cpuset=15 -p gpu=80 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 echo; echo 'Setting properties for clustera-7.nancy.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-7.nancy.grid5000.fr' and type='default'" -p ip='172.16.64.7' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 BK1CBX2' -p eth_count=1 -p eth_kavlan_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='GeForce RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='NO' -p cluster_priority=201906 -p max_walltime=604800 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
+oarnodesetting --sql "host='clustera-7.nancy.grid5000.fr' and type='default'" -p ip='172.16.64.7' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 BK1CBX2' -p eth_count=1 -p eth_kavlan_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='NO' -p cluster_priority=201906 -p max_walltime=604800 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
 
 echo '================================================================================'
 
@@ -268,24 +268,24 @@ echo '==========================================================================
 ###################################
 # clustera-8.nancy.grid5000.fr
 ###################################
-oarnodesetting --sql "host='clustera-8.nancy.grid5000.fr' AND resource_id='9763' AND type='default'" -p cpu=1629 -p core=8639 -p cpuset=0 -p gpu=81 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-8.nancy.grid5000.fr' AND resource_id='9764' AND type='default'" -p cpu=1629 -p core=8640 -p cpuset=2 -p gpu=81 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-8.nancy.grid5000.fr' AND resource_id='9765' AND type='default'" -p cpu=1629 -p core=8641 -p cpuset=4 -p gpu=81 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-8.nancy.grid5000.fr' AND resource_id='9766' AND type='default'" -p cpu=1629 -p core=8642 -p cpuset=6 -p gpu=81 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-8.nancy.grid5000.fr' AND resource_id='9767' AND type='default'" -p cpu=1629 -p core=8643 -p cpuset=8 -p gpu=82 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-8.nancy.grid5000.fr' AND resource_id='9768' AND type='default'" -p cpu=1629 -p core=8644 -p cpuset=10 -p gpu=82 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-8.nancy.grid5000.fr' AND resource_id='9769' AND type='default'" -p cpu=1629 -p core=8645 -p cpuset=12 -p gpu=82 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-8.nancy.grid5000.fr' AND resource_id='9770' AND type='default'" -p cpu=1629 -p core=8646 -p cpuset=14 -p gpu=82 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-8.nancy.grid5000.fr' AND resource_id='9771' AND type='default'" -p cpu=1630 -p core=8647 -p cpuset=1 -p gpu=83 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-8.nancy.grid5000.fr' AND resource_id='9772' AND type='default'" -p cpu=1630 -p core=8648 -p cpuset=3 -p gpu=83 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-8.nancy.grid5000.fr' AND resource_id='9773' AND type='default'" -p cpu=1630 -p core=8649 -p cpuset=5 -p gpu=83 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-8.nancy.grid5000.fr' AND resource_id='9774' AND type='default'" -p cpu=1630 -p core=8650 -p cpuset=7 -p gpu=83 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-8.nancy.grid5000.fr' AND resource_id='9775' AND type='default'" -p cpu=1630 -p core=8651 -p cpuset=9 -p gpu=84 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting --sql "host='clustera-8.nancy.grid5000.fr' AND resource_id='9776' AND type='default'" -p cpu=1630 -p core=8652 -p cpuset=11 -p gpu=84 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting --sql "host='clustera-8.nancy.grid5000.fr' AND resource_id='9777' AND type='default'" -p cpu=1630 -p core=8653 -p cpuset=13 -p gpu=84 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting --sql "host='clustera-8.nancy.grid5000.fr' AND resource_id='9778' AND type='default'" -p cpu=1630 -p core=8654 -p cpuset=15 -p gpu=84 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-8.nancy.grid5000.fr' AND resource_id='9763' AND type='default'" -p cpu=1629 -p core=8639 -p cpuset=0 -p gpu=81 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-8.nancy.grid5000.fr' AND resource_id='9764' AND type='default'" -p cpu=1629 -p core=8640 -p cpuset=2 -p gpu=81 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-8.nancy.grid5000.fr' AND resource_id='9765' AND type='default'" -p cpu=1629 -p core=8641 -p cpuset=4 -p gpu=81 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-8.nancy.grid5000.fr' AND resource_id='9766' AND type='default'" -p cpu=1629 -p core=8642 -p cpuset=6 -p gpu=81 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-8.nancy.grid5000.fr' AND resource_id='9767' AND type='default'" -p cpu=1629 -p core=8643 -p cpuset=8 -p gpu=82 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-8.nancy.grid5000.fr' AND resource_id='9768' AND type='default'" -p cpu=1629 -p core=8644 -p cpuset=10 -p gpu=82 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-8.nancy.grid5000.fr' AND resource_id='9769' AND type='default'" -p cpu=1629 -p core=8645 -p cpuset=12 -p gpu=82 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-8.nancy.grid5000.fr' AND resource_id='9770' AND type='default'" -p cpu=1629 -p core=8646 -p cpuset=14 -p gpu=82 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-8.nancy.grid5000.fr' AND resource_id='9771' AND type='default'" -p cpu=1630 -p core=8647 -p cpuset=1 -p gpu=83 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-8.nancy.grid5000.fr' AND resource_id='9772' AND type='default'" -p cpu=1630 -p core=8648 -p cpuset=3 -p gpu=83 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-8.nancy.grid5000.fr' AND resource_id='9773' AND type='default'" -p cpu=1630 -p core=8649 -p cpuset=5 -p gpu=83 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-8.nancy.grid5000.fr' AND resource_id='9774' AND type='default'" -p cpu=1630 -p core=8650 -p cpuset=7 -p gpu=83 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-8.nancy.grid5000.fr' AND resource_id='9775' AND type='default'" -p cpu=1630 -p core=8651 -p cpuset=9 -p gpu=84 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-8.nancy.grid5000.fr' AND resource_id='9776' AND type='default'" -p cpu=1630 -p core=8652 -p cpuset=11 -p gpu=84 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-8.nancy.grid5000.fr' AND resource_id='9777' AND type='default'" -p cpu=1630 -p core=8653 -p cpuset=13 -p gpu=84 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-8.nancy.grid5000.fr' AND resource_id='9778' AND type='default'" -p cpu=1630 -p core=8654 -p cpuset=15 -p gpu=84 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 echo; echo 'Setting properties for clustera-8.nancy.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-8.nancy.grid5000.fr' and type='default'" -p ip='172.16.64.8' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 CK1CBX2' -p eth_count=1 -p eth_kavlan_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='GeForce RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='NO' -p cluster_priority=201906 -p max_walltime=604800 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
+oarnodesetting --sql "host='clustera-8.nancy.grid5000.fr' and type='default'" -p ip='172.16.64.8' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 CK1CBX2' -p eth_count=1 -p eth_kavlan_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='NO' -p cluster_priority=201906 -p max_walltime=604800 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
 
 echo '================================================================================'
 
@@ -293,24 +293,24 @@ echo '==========================================================================
 ###################################
 # clustera-9.nancy.grid5000.fr
 ###################################
-oarnodesetting --sql "host='clustera-9.nancy.grid5000.fr' AND resource_id='9779' AND type='default'" -p cpu=1631 -p core=8655 -p cpuset=0 -p gpu=85 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-9.nancy.grid5000.fr' AND resource_id='9780' AND type='default'" -p cpu=1631 -p core=8656 -p cpuset=2 -p gpu=85 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-9.nancy.grid5000.fr' AND resource_id='9781' AND type='default'" -p cpu=1631 -p core=8657 -p cpuset=4 -p gpu=85 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-9.nancy.grid5000.fr' AND resource_id='9782' AND type='default'" -p cpu=1631 -p core=8658 -p cpuset=6 -p gpu=85 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-9.nancy.grid5000.fr' AND resource_id='9783' AND type='default'" -p cpu=1631 -p core=8659 -p cpuset=8 -p gpu=86 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-9.nancy.grid5000.fr' AND resource_id='9784' AND type='default'" -p cpu=1631 -p core=8660 -p cpuset=10 -p gpu=86 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-9.nancy.grid5000.fr' AND resource_id='9785' AND type='default'" -p cpu=1631 -p core=8661 -p cpuset=12 -p gpu=86 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-9.nancy.grid5000.fr' AND resource_id='9786' AND type='default'" -p cpu=1631 -p core=8662 -p cpuset=14 -p gpu=86 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-9.nancy.grid5000.fr' AND resource_id='9787' AND type='default'" -p cpu=1632 -p core=8663 -p cpuset=1 -p gpu=87 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-9.nancy.grid5000.fr' AND resource_id='9788' AND type='default'" -p cpu=1632 -p core=8664 -p cpuset=3 -p gpu=87 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-9.nancy.grid5000.fr' AND resource_id='9789' AND type='default'" -p cpu=1632 -p core=8665 -p cpuset=5 -p gpu=87 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-9.nancy.grid5000.fr' AND resource_id='9790' AND type='default'" -p cpu=1632 -p core=8666 -p cpuset=7 -p gpu=87 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-9.nancy.grid5000.fr' AND resource_id='9791' AND type='default'" -p cpu=1632 -p core=8667 -p cpuset=9 -p gpu=88 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting --sql "host='clustera-9.nancy.grid5000.fr' AND resource_id='9792' AND type='default'" -p cpu=1632 -p core=8668 -p cpuset=11 -p gpu=88 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting --sql "host='clustera-9.nancy.grid5000.fr' AND resource_id='9793' AND type='default'" -p cpu=1632 -p core=8669 -p cpuset=13 -p gpu=88 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting --sql "host='clustera-9.nancy.grid5000.fr' AND resource_id='9794' AND type='default'" -p cpu=1632 -p core=8670 -p cpuset=15 -p gpu=88 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-9.nancy.grid5000.fr' AND resource_id='9779' AND type='default'" -p cpu=1631 -p core=8655 -p cpuset=0 -p gpu=85 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-9.nancy.grid5000.fr' AND resource_id='9780' AND type='default'" -p cpu=1631 -p core=8656 -p cpuset=2 -p gpu=85 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-9.nancy.grid5000.fr' AND resource_id='9781' AND type='default'" -p cpu=1631 -p core=8657 -p cpuset=4 -p gpu=85 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-9.nancy.grid5000.fr' AND resource_id='9782' AND type='default'" -p cpu=1631 -p core=8658 -p cpuset=6 -p gpu=85 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-9.nancy.grid5000.fr' AND resource_id='9783' AND type='default'" -p cpu=1631 -p core=8659 -p cpuset=8 -p gpu=86 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-9.nancy.grid5000.fr' AND resource_id='9784' AND type='default'" -p cpu=1631 -p core=8660 -p cpuset=10 -p gpu=86 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-9.nancy.grid5000.fr' AND resource_id='9785' AND type='default'" -p cpu=1631 -p core=8661 -p cpuset=12 -p gpu=86 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-9.nancy.grid5000.fr' AND resource_id='9786' AND type='default'" -p cpu=1631 -p core=8662 -p cpuset=14 -p gpu=86 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-9.nancy.grid5000.fr' AND resource_id='9787' AND type='default'" -p cpu=1632 -p core=8663 -p cpuset=1 -p gpu=87 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-9.nancy.grid5000.fr' AND resource_id='9788' AND type='default'" -p cpu=1632 -p core=8664 -p cpuset=3 -p gpu=87 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-9.nancy.grid5000.fr' AND resource_id='9789' AND type='default'" -p cpu=1632 -p core=8665 -p cpuset=5 -p gpu=87 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-9.nancy.grid5000.fr' AND resource_id='9790' AND type='default'" -p cpu=1632 -p core=8666 -p cpuset=7 -p gpu=87 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-9.nancy.grid5000.fr' AND resource_id='9791' AND type='default'" -p cpu=1632 -p core=8667 -p cpuset=9 -p gpu=88 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-9.nancy.grid5000.fr' AND resource_id='9792' AND type='default'" -p cpu=1632 -p core=8668 -p cpuset=11 -p gpu=88 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-9.nancy.grid5000.fr' AND resource_id='9793' AND type='default'" -p cpu=1632 -p core=8669 -p cpuset=13 -p gpu=88 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-9.nancy.grid5000.fr' AND resource_id='9794' AND type='default'" -p cpu=1632 -p core=8670 -p cpuset=15 -p gpu=88 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 echo; echo 'Setting properties for clustera-9.nancy.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-9.nancy.grid5000.fr' and type='default'" -p ip='172.16.64.9' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 9K1CBX2' -p eth_count=1 -p eth_kavlan_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='GeForce RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='NO' -p cluster_priority=201906 -p max_walltime=604800 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
+oarnodesetting --sql "host='clustera-9.nancy.grid5000.fr' and type='default'" -p ip='172.16.64.9' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 9K1CBX2' -p eth_count=1 -p eth_kavlan_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='NO' -p cluster_priority=201906 -p max_walltime=604800 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
 
 echo '================================================================================'
 
@@ -318,24 +318,24 @@ echo '==========================================================================
 ###################################
 # clustera-10.nancy.grid5000.fr
 ###################################
-oarnodesetting --sql "host='clustera-10.nancy.grid5000.fr' AND resource_id='9795' AND type='default'" -p cpu=1633 -p core=8671 -p cpuset=0 -p gpu=89 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-10.nancy.grid5000.fr' AND resource_id='9796' AND type='default'" -p cpu=1633 -p core=8672 -p cpuset=2 -p gpu=89 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-10.nancy.grid5000.fr' AND resource_id='9797' AND type='default'" -p cpu=1633 -p core=8673 -p cpuset=4 -p gpu=89 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-10.nancy.grid5000.fr' AND resource_id='9798' AND type='default'" -p cpu=1633 -p core=8674 -p cpuset=6 -p gpu=89 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-10.nancy.grid5000.fr' AND resource_id='9799' AND type='default'" -p cpu=1633 -p core=8675 -p cpuset=8 -p gpu=90 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-10.nancy.grid5000.fr' AND resource_id='9800' AND type='default'" -p cpu=1633 -p core=8676 -p cpuset=10 -p gpu=90 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-10.nancy.grid5000.fr' AND resource_id='9801' AND type='default'" -p cpu=1633 -p core=8677 -p cpuset=12 -p gpu=90 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-10.nancy.grid5000.fr' AND resource_id='9802' AND type='default'" -p cpu=1633 -p core=8678 -p cpuset=14 -p gpu=90 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-10.nancy.grid5000.fr' AND resource_id='9803' AND type='default'" -p cpu=1634 -p core=8679 -p cpuset=1 -p gpu=91 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-10.nancy.grid5000.fr' AND resource_id='9804' AND type='default'" -p cpu=1634 -p core=8680 -p cpuset=3 -p gpu=91 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-10.nancy.grid5000.fr' AND resource_id='9805' AND type='default'" -p cpu=1634 -p core=8681 -p cpuset=5 -p gpu=91 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-10.nancy.grid5000.fr' AND resource_id='9806' AND type='default'" -p cpu=1634 -p core=8682 -p cpuset=7 -p gpu=91 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-10.nancy.grid5000.fr' AND resource_id='9807' AND type='default'" -p cpu=1634 -p core=8683 -p cpuset=9 -p gpu=92 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting --sql "host='clustera-10.nancy.grid5000.fr' AND resource_id='9808' AND type='default'" -p cpu=1634 -p core=8684 -p cpuset=11 -p gpu=92 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting --sql "host='clustera-10.nancy.grid5000.fr' AND resource_id='9809' AND type='default'" -p cpu=1634 -p core=8685 -p cpuset=13 -p gpu=92 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting --sql "host='clustera-10.nancy.grid5000.fr' AND resource_id='9810' AND type='default'" -p cpu=1634 -p core=8686 -p cpuset=15 -p gpu=92 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-10.nancy.grid5000.fr' AND resource_id='9795' AND type='default'" -p cpu=1633 -p core=8671 -p cpuset=0 -p gpu=89 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-10.nancy.grid5000.fr' AND resource_id='9796' AND type='default'" -p cpu=1633 -p core=8672 -p cpuset=2 -p gpu=89 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-10.nancy.grid5000.fr' AND resource_id='9797' AND type='default'" -p cpu=1633 -p core=8673 -p cpuset=4 -p gpu=89 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-10.nancy.grid5000.fr' AND resource_id='9798' AND type='default'" -p cpu=1633 -p core=8674 -p cpuset=6 -p gpu=89 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-10.nancy.grid5000.fr' AND resource_id='9799' AND type='default'" -p cpu=1633 -p core=8675 -p cpuset=8 -p gpu=90 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-10.nancy.grid5000.fr' AND resource_id='9800' AND type='default'" -p cpu=1633 -p core=8676 -p cpuset=10 -p gpu=90 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-10.nancy.grid5000.fr' AND resource_id='9801' AND type='default'" -p cpu=1633 -p core=8677 -p cpuset=12 -p gpu=90 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-10.nancy.grid5000.fr' AND resource_id='9802' AND type='default'" -p cpu=1633 -p core=8678 -p cpuset=14 -p gpu=90 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-10.nancy.grid5000.fr' AND resource_id='9803' AND type='default'" -p cpu=1634 -p core=8679 -p cpuset=1 -p gpu=91 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-10.nancy.grid5000.fr' AND resource_id='9804' AND type='default'" -p cpu=1634 -p core=8680 -p cpuset=3 -p gpu=91 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-10.nancy.grid5000.fr' AND resource_id='9805' AND type='default'" -p cpu=1634 -p core=8681 -p cpuset=5 -p gpu=91 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-10.nancy.grid5000.fr' AND resource_id='9806' AND type='default'" -p cpu=1634 -p core=8682 -p cpuset=7 -p gpu=91 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-10.nancy.grid5000.fr' AND resource_id='9807' AND type='default'" -p cpu=1634 -p core=8683 -p cpuset=9 -p gpu=92 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-10.nancy.grid5000.fr' AND resource_id='9808' AND type='default'" -p cpu=1634 -p core=8684 -p cpuset=11 -p gpu=92 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-10.nancy.grid5000.fr' AND resource_id='9809' AND type='default'" -p cpu=1634 -p core=8685 -p cpuset=13 -p gpu=92 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-10.nancy.grid5000.fr' AND resource_id='9810' AND type='default'" -p cpu=1634 -p core=8686 -p cpuset=15 -p gpu=92 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 echo; echo 'Setting properties for clustera-10.nancy.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-10.nancy.grid5000.fr' and type='default'" -p ip='172.16.64.10' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 GL1CBX2' -p eth_count=1 -p eth_kavlan_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='GeForce RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='NO' -p cluster_priority=201906 -p max_walltime=604800 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
+oarnodesetting --sql "host='clustera-10.nancy.grid5000.fr' and type='default'" -p ip='172.16.64.10' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 GL1CBX2' -p eth_count=1 -p eth_kavlan_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='NO' -p cluster_priority=201906 -p max_walltime=604800 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
 
 echo '================================================================================'
 
@@ -343,24 +343,24 @@ echo '==========================================================================
 ###################################
 # clustera-11.nancy.grid5000.fr
 ###################################
-oarnodesetting --sql "host='clustera-11.nancy.grid5000.fr' AND resource_id='9811' AND type='default'" -p cpu=1635 -p core=8687 -p cpuset=0 -p gpu=93 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-11.nancy.grid5000.fr' AND resource_id='9812' AND type='default'" -p cpu=1635 -p core=8688 -p cpuset=2 -p gpu=93 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-11.nancy.grid5000.fr' AND resource_id='9813' AND type='default'" -p cpu=1635 -p core=8689 -p cpuset=4 -p gpu=93 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-11.nancy.grid5000.fr' AND resource_id='9814' AND type='default'" -p cpu=1635 -p core=8690 -p cpuset=6 -p gpu=93 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-11.nancy.grid5000.fr' AND resource_id='9815' AND type='default'" -p cpu=1635 -p core=8691 -p cpuset=8 -p gpu=94 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-11.nancy.grid5000.fr' AND resource_id='9816' AND type='default'" -p cpu=1635 -p core=8692 -p cpuset=10 -p gpu=94 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-11.nancy.grid5000.fr' AND resource_id='9817' AND type='default'" -p cpu=1635 -p core=8693 -p cpuset=12 -p gpu=94 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-11.nancy.grid5000.fr' AND resource_id='9818' AND type='default'" -p cpu=1635 -p core=8694 -p cpuset=14 -p gpu=94 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-11.nancy.grid5000.fr' AND resource_id='9819' AND type='default'" -p cpu=1636 -p core=8695 -p cpuset=1 -p gpu=95 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-11.nancy.grid5000.fr' AND resource_id='9820' AND type='default'" -p cpu=1636 -p core=8696 -p cpuset=3 -p gpu=95 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-11.nancy.grid5000.fr' AND resource_id='9821' AND type='default'" -p cpu=1636 -p core=8697 -p cpuset=5 -p gpu=95 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-11.nancy.grid5000.fr' AND resource_id='9822' AND type='default'" -p cpu=1636 -p core=8698 -p cpuset=7 -p gpu=95 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-11.nancy.grid5000.fr' AND resource_id='9823' AND type='default'" -p cpu=1636 -p core=8699 -p cpuset=9 -p gpu=96 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting --sql "host='clustera-11.nancy.grid5000.fr' AND resource_id='9824' AND type='default'" -p cpu=1636 -p core=8700 -p cpuset=11 -p gpu=96 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting --sql "host='clustera-11.nancy.grid5000.fr' AND resource_id='9825' AND type='default'" -p cpu=1636 -p core=8701 -p cpuset=13 -p gpu=96 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting --sql "host='clustera-11.nancy.grid5000.fr' AND resource_id='9826' AND type='default'" -p cpu=1636 -p core=8702 -p cpuset=15 -p gpu=96 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-11.nancy.grid5000.fr' AND resource_id='9811' AND type='default'" -p cpu=1635 -p core=8687 -p cpuset=0 -p gpu=93 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-11.nancy.grid5000.fr' AND resource_id='9812' AND type='default'" -p cpu=1635 -p core=8688 -p cpuset=2 -p gpu=93 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-11.nancy.grid5000.fr' AND resource_id='9813' AND type='default'" -p cpu=1635 -p core=8689 -p cpuset=4 -p gpu=93 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-11.nancy.grid5000.fr' AND resource_id='9814' AND type='default'" -p cpu=1635 -p core=8690 -p cpuset=6 -p gpu=93 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-11.nancy.grid5000.fr' AND resource_id='9815' AND type='default'" -p cpu=1635 -p core=8691 -p cpuset=8 -p gpu=94 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-11.nancy.grid5000.fr' AND resource_id='9816' AND type='default'" -p cpu=1635 -p core=8692 -p cpuset=10 -p gpu=94 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-11.nancy.grid5000.fr' AND resource_id='9817' AND type='default'" -p cpu=1635 -p core=8693 -p cpuset=12 -p gpu=94 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-11.nancy.grid5000.fr' AND resource_id='9818' AND type='default'" -p cpu=1635 -p core=8694 -p cpuset=14 -p gpu=94 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-11.nancy.grid5000.fr' AND resource_id='9819' AND type='default'" -p cpu=1636 -p core=8695 -p cpuset=1 -p gpu=95 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-11.nancy.grid5000.fr' AND resource_id='9820' AND type='default'" -p cpu=1636 -p core=8696 -p cpuset=3 -p gpu=95 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-11.nancy.grid5000.fr' AND resource_id='9821' AND type='default'" -p cpu=1636 -p core=8697 -p cpuset=5 -p gpu=95 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-11.nancy.grid5000.fr' AND resource_id='9822' AND type='default'" -p cpu=1636 -p core=8698 -p cpuset=7 -p gpu=95 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-11.nancy.grid5000.fr' AND resource_id='9823' AND type='default'" -p cpu=1636 -p core=8699 -p cpuset=9 -p gpu=96 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-11.nancy.grid5000.fr' AND resource_id='9824' AND type='default'" -p cpu=1636 -p core=8700 -p cpuset=11 -p gpu=96 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-11.nancy.grid5000.fr' AND resource_id='9825' AND type='default'" -p cpu=1636 -p core=8701 -p cpuset=13 -p gpu=96 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-11.nancy.grid5000.fr' AND resource_id='9826' AND type='default'" -p cpu=1636 -p core=8702 -p cpuset=15 -p gpu=96 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 echo; echo 'Setting properties for clustera-11.nancy.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-11.nancy.grid5000.fr' and type='default'" -p ip='172.16.64.11' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 JL1CBX2' -p eth_count=1 -p eth_kavlan_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='GeForce RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='NO' -p cluster_priority=201906 -p max_walltime=604800 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
+oarnodesetting --sql "host='clustera-11.nancy.grid5000.fr' and type='default'" -p ip='172.16.64.11' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 JL1CBX2' -p eth_count=1 -p eth_kavlan_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='NO' -p cluster_priority=201906 -p max_walltime=604800 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
 
 echo '================================================================================'
 
@@ -368,24 +368,24 @@ echo '==========================================================================
 ###################################
 # clustera-12.nancy.grid5000.fr
 ###################################
-oarnodesetting --sql "host='clustera-12.nancy.grid5000.fr' AND resource_id='9827' AND type='default'" -p cpu=1637 -p core=8703 -p cpuset=0 -p gpu=97 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-12.nancy.grid5000.fr' AND resource_id='9828' AND type='default'" -p cpu=1637 -p core=8704 -p cpuset=2 -p gpu=97 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-12.nancy.grid5000.fr' AND resource_id='9829' AND type='default'" -p cpu=1637 -p core=8705 -p cpuset=4 -p gpu=97 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-12.nancy.grid5000.fr' AND resource_id='9830' AND type='default'" -p cpu=1637 -p core=8706 -p cpuset=6 -p gpu=97 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-12.nancy.grid5000.fr' AND resource_id='9831' AND type='default'" -p cpu=1637 -p core=8707 -p cpuset=8 -p gpu=98 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-12.nancy.grid5000.fr' AND resource_id='9832' AND type='default'" -p cpu=1637 -p core=8708 -p cpuset=10 -p gpu=98 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-12.nancy.grid5000.fr' AND resource_id='9833' AND type='default'" -p cpu=1637 -p core=8709 -p cpuset=12 -p gpu=98 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-12.nancy.grid5000.fr' AND resource_id='9834' AND type='default'" -p cpu=1637 -p core=8710 -p cpuset=14 -p gpu=98 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-12.nancy.grid5000.fr' AND resource_id='9835' AND type='default'" -p cpu=1638 -p core=8711 -p cpuset=1 -p gpu=99 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-12.nancy.grid5000.fr' AND resource_id='9836' AND type='default'" -p cpu=1638 -p core=8712 -p cpuset=3 -p gpu=99 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-12.nancy.grid5000.fr' AND resource_id='9837' AND type='default'" -p cpu=1638 -p core=8713 -p cpuset=5 -p gpu=99 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-12.nancy.grid5000.fr' AND resource_id='9838' AND type='default'" -p cpu=1638 -p core=8714 -p cpuset=7 -p gpu=99 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-12.nancy.grid5000.fr' AND resource_id='9839' AND type='default'" -p cpu=1638 -p core=8715 -p cpuset=9 -p gpu=100 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting --sql "host='clustera-12.nancy.grid5000.fr' AND resource_id='9840' AND type='default'" -p cpu=1638 -p core=8716 -p cpuset=11 -p gpu=100 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting --sql "host='clustera-12.nancy.grid5000.fr' AND resource_id='9841' AND type='default'" -p cpu=1638 -p core=8717 -p cpuset=13 -p gpu=100 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting --sql "host='clustera-12.nancy.grid5000.fr' AND resource_id='9842' AND type='default'" -p cpu=1638 -p core=8718 -p cpuset=15 -p gpu=100 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-12.nancy.grid5000.fr' AND resource_id='9827' AND type='default'" -p cpu=1637 -p core=8703 -p cpuset=0 -p gpu=97 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-12.nancy.grid5000.fr' AND resource_id='9828' AND type='default'" -p cpu=1637 -p core=8704 -p cpuset=2 -p gpu=97 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-12.nancy.grid5000.fr' AND resource_id='9829' AND type='default'" -p cpu=1637 -p core=8705 -p cpuset=4 -p gpu=97 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-12.nancy.grid5000.fr' AND resource_id='9830' AND type='default'" -p cpu=1637 -p core=8706 -p cpuset=6 -p gpu=97 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-12.nancy.grid5000.fr' AND resource_id='9831' AND type='default'" -p cpu=1637 -p core=8707 -p cpuset=8 -p gpu=98 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-12.nancy.grid5000.fr' AND resource_id='9832' AND type='default'" -p cpu=1637 -p core=8708 -p cpuset=10 -p gpu=98 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-12.nancy.grid5000.fr' AND resource_id='9833' AND type='default'" -p cpu=1637 -p core=8709 -p cpuset=12 -p gpu=98 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-12.nancy.grid5000.fr' AND resource_id='9834' AND type='default'" -p cpu=1637 -p core=8710 -p cpuset=14 -p gpu=98 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-12.nancy.grid5000.fr' AND resource_id='9835' AND type='default'" -p cpu=1638 -p core=8711 -p cpuset=1 -p gpu=99 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-12.nancy.grid5000.fr' AND resource_id='9836' AND type='default'" -p cpu=1638 -p core=8712 -p cpuset=3 -p gpu=99 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-12.nancy.grid5000.fr' AND resource_id='9837' AND type='default'" -p cpu=1638 -p core=8713 -p cpuset=5 -p gpu=99 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-12.nancy.grid5000.fr' AND resource_id='9838' AND type='default'" -p cpu=1638 -p core=8714 -p cpuset=7 -p gpu=99 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-12.nancy.grid5000.fr' AND resource_id='9839' AND type='default'" -p cpu=1638 -p core=8715 -p cpuset=9 -p gpu=100 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-12.nancy.grid5000.fr' AND resource_id='9840' AND type='default'" -p cpu=1638 -p core=8716 -p cpuset=11 -p gpu=100 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-12.nancy.grid5000.fr' AND resource_id='9841' AND type='default'" -p cpu=1638 -p core=8717 -p cpuset=13 -p gpu=100 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-12.nancy.grid5000.fr' AND resource_id='9842' AND type='default'" -p cpu=1638 -p core=8718 -p cpuset=15 -p gpu=100 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 echo; echo 'Setting properties for clustera-12.nancy.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-12.nancy.grid5000.fr' and type='default'" -p ip='172.16.64.12' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 HL1CBX2' -p eth_count=1 -p eth_kavlan_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='GeForce RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='NO' -p cluster_priority=201906 -p max_walltime=604800 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
+oarnodesetting --sql "host='clustera-12.nancy.grid5000.fr' and type='default'" -p ip='172.16.64.12' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 HL1CBX2' -p eth_count=1 -p eth_kavlan_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='NO' -p cluster_priority=201906 -p max_walltime=604800 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
 
 echo '================================================================================'
 
@@ -393,23 +393,23 @@ echo '==========================================================================
 ###################################
 # clustera-13.nancy.grid5000.fr
 ###################################
-oarnodesetting --sql "host='clustera-13.nancy.grid5000.fr' AND resource_id='9843' AND type='default'" -p cpu=1639 -p core=8719 -p cpuset=0 -p gpu=101 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-13.nancy.grid5000.fr' AND resource_id='9844' AND type='default'" -p cpu=1639 -p core=8720 -p cpuset=2 -p gpu=101 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-13.nancy.grid5000.fr' AND resource_id='9845' AND type='default'" -p cpu=1639 -p core=8721 -p cpuset=4 -p gpu=101 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-13.nancy.grid5000.fr' AND resource_id='9846' AND type='default'" -p cpu=1639 -p core=8722 -p cpuset=6 -p gpu=101 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-13.nancy.grid5000.fr' AND resource_id='9847' AND type='default'" -p cpu=1639 -p core=8723 -p cpuset=8 -p gpu=102 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-13.nancy.grid5000.fr' AND resource_id='9848' AND type='default'" -p cpu=1639 -p core=8724 -p cpuset=10 -p gpu=102 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-13.nancy.grid5000.fr' AND resource_id='9849' AND type='default'" -p cpu=1639 -p core=8725 -p cpuset=12 -p gpu=102 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-13.nancy.grid5000.fr' AND resource_id='9850' AND type='default'" -p cpu=1639 -p core=8726 -p cpuset=14 -p gpu=102 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-13.nancy.grid5000.fr' AND resource_id='9851' AND type='default'" -p cpu=1640 -p core=8727 -p cpuset=1 -p gpu=103 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-13.nancy.grid5000.fr' AND resource_id='9852' AND type='default'" -p cpu=1640 -p core=8728 -p cpuset=3 -p gpu=103 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-13.nancy.grid5000.fr' AND resource_id='9853' AND type='default'" -p cpu=1640 -p core=8729 -p cpuset=5 -p gpu=103 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-13.nancy.grid5000.fr' AND resource_id='9854' AND type='default'" -p cpu=1640 -p core=8730 -p cpuset=7 -p gpu=103 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-13.nancy.grid5000.fr' AND resource_id='9855' AND type='default'" -p cpu=1640 -p core=8731 -p cpuset=9 -p gpu=104 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting --sql "host='clustera-13.nancy.grid5000.fr' AND resource_id='9856' AND type='default'" -p cpu=1640 -p core=8732 -p cpuset=11 -p gpu=104 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting --sql "host='clustera-13.nancy.grid5000.fr' AND resource_id='9857' AND type='default'" -p cpu=1640 -p core=8733 -p cpuset=13 -p gpu=104 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting --sql "host='clustera-13.nancy.grid5000.fr' AND resource_id='9858' AND type='default'" -p cpu=1640 -p core=8734 -p cpuset=15 -p gpu=104 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-13.nancy.grid5000.fr' AND resource_id='9843' AND type='default'" -p cpu=1639 -p core=8719 -p cpuset=0 -p gpu=101 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-13.nancy.grid5000.fr' AND resource_id='9844' AND type='default'" -p cpu=1639 -p core=8720 -p cpuset=2 -p gpu=101 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-13.nancy.grid5000.fr' AND resource_id='9845' AND type='default'" -p cpu=1639 -p core=8721 -p cpuset=4 -p gpu=101 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-13.nancy.grid5000.fr' AND resource_id='9846' AND type='default'" -p cpu=1639 -p core=8722 -p cpuset=6 -p gpu=101 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-13.nancy.grid5000.fr' AND resource_id='9847' AND type='default'" -p cpu=1639 -p core=8723 -p cpuset=8 -p gpu=102 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-13.nancy.grid5000.fr' AND resource_id='9848' AND type='default'" -p cpu=1639 -p core=8724 -p cpuset=10 -p gpu=102 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-13.nancy.grid5000.fr' AND resource_id='9849' AND type='default'" -p cpu=1639 -p core=8725 -p cpuset=12 -p gpu=102 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-13.nancy.grid5000.fr' AND resource_id='9850' AND type='default'" -p cpu=1639 -p core=8726 -p cpuset=14 -p gpu=102 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-13.nancy.grid5000.fr' AND resource_id='9851' AND type='default'" -p cpu=1640 -p core=8727 -p cpuset=1 -p gpu=103 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-13.nancy.grid5000.fr' AND resource_id='9852' AND type='default'" -p cpu=1640 -p core=8728 -p cpuset=3 -p gpu=103 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-13.nancy.grid5000.fr' AND resource_id='9853' AND type='default'" -p cpu=1640 -p core=8729 -p cpuset=5 -p gpu=103 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-13.nancy.grid5000.fr' AND resource_id='9854' AND type='default'" -p cpu=1640 -p core=8730 -p cpuset=7 -p gpu=103 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-13.nancy.grid5000.fr' AND resource_id='9855' AND type='default'" -p cpu=1640 -p core=8731 -p cpuset=9 -p gpu=104 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-13.nancy.grid5000.fr' AND resource_id='9856' AND type='default'" -p cpu=1640 -p core=8732 -p cpuset=11 -p gpu=104 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-13.nancy.grid5000.fr' AND resource_id='9857' AND type='default'" -p cpu=1640 -p core=8733 -p cpuset=13 -p gpu=104 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-13.nancy.grid5000.fr' AND resource_id='9858' AND type='default'" -p cpu=1640 -p core=8734 -p cpuset=15 -p gpu=104 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 echo; echo 'Setting properties for clustera-13.nancy.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-13.nancy.grid5000.fr' and type='default'" -p ip='172.16.64.13' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 7K1CBX2' -p eth_count=1 -p eth_kavlan_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='GeForce RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='NO' -p cluster_priority=201906 -p max_walltime=604800 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
+oarnodesetting --sql "host='clustera-13.nancy.grid5000.fr' and type='default'" -p ip='172.16.64.13' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 7K1CBX2' -p eth_count=1 -p eth_kavlan_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='NO' -p cluster_priority=201906 -p max_walltime=604800 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
 
 echo '================================================================================'
diff --git a/spec/output/graffiti-gpu-removed-OAR-updated_table_stdout.txt b/spec/output/graffiti-gpu-removed-OAR-updated_table_stdout.txt
index a4411a956db..53cfa064c2c 100644
--- a/spec/output/graffiti-gpu-removed-OAR-updated_table_stdout.txt
+++ b/spec/output/graffiti-gpu-removed-OAR-updated_table_stdout.txt
@@ -1,212 +1,212 @@
 +---------- + -------------------- + ----- + ----- + -------- + ---- + -------------------- + ------------------------------ + ------------------------------+
 |   cluster | host                 | cpu   | core  | cpuset   | gpu  | gpudevice            | cpumodel                       | gpumodel                      |
 +---------- + -------------------- + ----- + ----- + -------- + ---- + -------------------- + ------------------------------ + ------------------------------+
-|  clustera | clustera-1           | 1615  | 8527  | 0        | 53   | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 1615  | 8528  | 2        | 53   | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 1615  | 8529  | 4        | 53   | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 1615  | 8530  | 6        | 53   | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 1615  | 8531  | 8        | 54   | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 1615  | 8532  | 10       | 54   | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 1615  | 8533  | 12       | 54   | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 1615  | 8534  | 14       | 54   | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 1616  | 8535  | 1        | 55   | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 1616  | 8536  | 3        | 55   | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 1616  | 8537  | 5        | 55   | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 1616  | 8538  | 7        | 55   | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 1616  | 8539  | 9        | 56   | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 1616  | 8540  | 11       | 56   | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 1616  | 8541  | 13       | 56   | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 1616  | 8542  | 15       | 56   | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 1617  | 8543  | 0        | 57   | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 1617  | 8544  | 2        | 57   | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 1617  | 8545  | 4        | 57   | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 1617  | 8546  | 6        | 57   | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 1617  | 8547  | 8        | 58   | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 1617  | 8548  | 10       | 58   | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 1617  | 8549  | 12       | 58   | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 1617  | 8550  | 14       | 58   | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 1618  | 8551  | 1        | 59   | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 1618  | 8552  | 3        | 59   | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 1618  | 8553  | 5        | 59   | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 1618  | 8554  | 7        | 59   | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 1618  | 8555  | 9        | 59   | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 1618  | 8556  | 11       | 59   | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 1618  | 8557  | 13       | 59   | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 1618  | 8558  | 15       | 59   | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-3           | 1619  | 8559  | 0        | 61   | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-3           | 1619  | 8560  | 2        | 61   | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-3           | 1619  | 8561  | 4        | 61   | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-3           | 1619  | 8562  | 6        | 61   | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-3           | 1619  | 8563  | 8        | 62   | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-3           | 1619  | 8564  | 10       | 62   | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-3           | 1619  | 8565  | 12       | 62   | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-3           | 1619  | 8566  | 14       | 62   | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-3           | 1620  | 8567  | 1        | 63   | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-3           | 1620  | 8568  | 3        | 63   | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-3           | 1620  | 8569  | 5        | 63   | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-3           | 1620  | 8570  | 7        | 63   | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-3           | 1620  | 8571  | 9        | 64   | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-3           | 1620  | 8572  | 11       | 64   | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-3           | 1620  | 8573  | 13       | 64   | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-3           | 1620  | 8574  | 15       | 64   | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-4           | 1621  | 8575  | 0        | 65   | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-4           | 1621  | 8576  | 2        | 65   | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-4           | 1621  | 8577  | 4        | 65   | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-4           | 1621  | 8578  | 6        | 65   | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-4           | 1621  | 8579  | 8        | 66   | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-4           | 1621  | 8580  | 10       | 66   | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-4           | 1621  | 8581  | 12       | 66   | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-4           | 1621  | 8582  | 14       | 66   | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-4           | 1622  | 8583  | 1        | 67   | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-4           | 1622  | 8584  | 3        | 67   | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-4           | 1622  | 8585  | 5        | 67   | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-4           | 1622  | 8586  | 7        | 67   | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-4           | 1622  | 8587  | 9        | 68   | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-4           | 1622  | 8588  | 11       | 68   | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-4           | 1622  | 8589  | 13       | 68   | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-4           | 1622  | 8590  | 15       | 68   | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-5           | 1623  | 8591  | 0        | 69   | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-5           | 1623  | 8592  | 2        | 69   | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-5           | 1623  | 8593  | 4        | 69   | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-5           | 1623  | 8594  | 6        | 69   | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-5           | 1623  | 8595  | 8        | 70   | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-5           | 1623  | 8596  | 10       | 70   | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-5           | 1623  | 8597  | 12       | 70   | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-5           | 1623  | 8598  | 14       | 70   | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-5           | 1624  | 8599  | 1        | 71   | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-5           | 1624  | 8600  | 3        | 71   | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-5           | 1624  | 8601  | 5        | 71   | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-5           | 1624  | 8602  | 7        | 71   | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-5           | 1624  | 8603  | 9        | 72   | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-5           | 1624  | 8604  | 11       | 72   | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-5           | 1624  | 8605  | 13       | 72   | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-5           | 1624  | 8606  | 15       | 72   | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-6           | 1625  | 8607  | 0        | 73   | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-6           | 1625  | 8608  | 2        | 73   | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-6           | 1625  | 8609  | 4        | 73   | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-6           | 1625  | 8610  | 6        | 73   | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-6           | 1625  | 8611  | 8        | 74   | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-6           | 1625  | 8612  | 10       | 74   | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-6           | 1625  | 8613  | 12       | 74   | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-6           | 1625  | 8614  | 14       | 74   | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-6           | 1626  | 8615  | 1        | 75   | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-6           | 1626  | 8616  | 3        | 75   | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-6           | 1626  | 8617  | 5        | 75   | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-6           | 1626  | 8618  | 7        | 75   | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-6           | 1626  | 8619  | 9        | 76   | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-6           | 1626  | 8620  | 11       | 76   | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-6           | 1626  | 8621  | 13       | 76   | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-6           | 1626  | 8622  | 15       | 76   | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-7           | 1627  | 8623  | 0        | 77   | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-7           | 1627  | 8624  | 2        | 77   | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-7           | 1627  | 8625  | 4        | 77   | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-7           | 1627  | 8626  | 6        | 77   | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-7           | 1627  | 8627  | 8        | 78   | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-7           | 1627  | 8628  | 10       | 78   | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-7           | 1627  | 8629  | 12       | 78   | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-7           | 1627  | 8630  | 14       | 78   | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-7           | 1628  | 8631  | 1        | 79   | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-7           | 1628  | 8632  | 3        | 79   | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-7           | 1628  | 8633  | 5        | 79   | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-7           | 1628  | 8634  | 7        | 79   | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-7           | 1628  | 8635  | 9        | 80   | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-7           | 1628  | 8636  | 11       | 80   | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-7           | 1628  | 8637  | 13       | 80   | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-7           | 1628  | 8638  | 15       | 80   | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-8           | 1629  | 8639  | 0        | 81   | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-8           | 1629  | 8640  | 2        | 81   | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-8           | 1629  | 8641  | 4        | 81   | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-8           | 1629  | 8642  | 6        | 81   | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-8           | 1629  | 8643  | 8        | 82   | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-8           | 1629  | 8644  | 10       | 82   | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-8           | 1629  | 8645  | 12       | 82   | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-8           | 1629  | 8646  | 14       | 82   | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-8           | 1630  | 8647  | 1        | 83   | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-8           | 1630  | 8648  | 3        | 83   | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-8           | 1630  | 8649  | 5        | 83   | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-8           | 1630  | 8650  | 7        | 83   | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-8           | 1630  | 8651  | 9        | 84   | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-8           | 1630  | 8652  | 11       | 84   | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-8           | 1630  | 8653  | 13       | 84   | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-8           | 1630  | 8654  | 15       | 84   | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-9           | 1631  | 8655  | 0        | 85   | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-9           | 1631  | 8656  | 2        | 85   | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-9           | 1631  | 8657  | 4        | 85   | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-9           | 1631  | 8658  | 6        | 85   | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-9           | 1631  | 8659  | 8        | 86   | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-9           | 1631  | 8660  | 10       | 86   | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-9           | 1631  | 8661  | 12       | 86   | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-9           | 1631  | 8662  | 14       | 86   | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-9           | 1632  | 8663  | 1        | 87   | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-9           | 1632  | 8664  | 3        | 87   | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-9           | 1632  | 8665  | 5        | 87   | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-9           | 1632  | 8666  | 7        | 87   | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-9           | 1632  | 8667  | 9        | 88   | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-9           | 1632  | 8668  | 11       | 88   | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-9           | 1632  | 8669  | 13       | 88   | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-9           | 1632  | 8670  | 15       | 88   | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-10          | 1633  | 8671  | 0        | 89   | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-10          | 1633  | 8672  | 2        | 89   | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-10          | 1633  | 8673  | 4        | 89   | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-10          | 1633  | 8674  | 6        | 89   | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-10          | 1633  | 8675  | 8        | 90   | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-10          | 1633  | 8676  | 10       | 90   | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-10          | 1633  | 8677  | 12       | 90   | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-10          | 1633  | 8678  | 14       | 90   | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-10          | 1634  | 8679  | 1        | 91   | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-10          | 1634  | 8680  | 3        | 91   | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-10          | 1634  | 8681  | 5        | 91   | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-10          | 1634  | 8682  | 7        | 91   | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-10          | 1634  | 8683  | 9        | 92   | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-10          | 1634  | 8684  | 11       | 92   | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-10          | 1634  | 8685  | 13       | 92   | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-10          | 1634  | 8686  | 15       | 92   | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-11          | 1635  | 8687  | 0        | 93   | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-11          | 1635  | 8688  | 2        | 93   | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-11          | 1635  | 8689  | 4        | 93   | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-11          | 1635  | 8690  | 6        | 93   | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-11          | 1635  | 8691  | 8        | 94   | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-11          | 1635  | 8692  | 10       | 94   | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-11          | 1635  | 8693  | 12       | 94   | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-11          | 1635  | 8694  | 14       | 94   | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-11          | 1636  | 8695  | 1        | 95   | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-11          | 1636  | 8696  | 3        | 95   | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-11          | 1636  | 8697  | 5        | 95   | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-11          | 1636  | 8698  | 7        | 95   | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-11          | 1636  | 8699  | 9        | 96   | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-11          | 1636  | 8700  | 11       | 96   | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-11          | 1636  | 8701  | 13       | 96   | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-11          | 1636  | 8702  | 15       | 96   | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-12          | 1637  | 8703  | 0        | 97   | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-12          | 1637  | 8704  | 2        | 97   | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-12          | 1637  | 8705  | 4        | 97   | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-12          | 1637  | 8706  | 6        | 97   | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-12          | 1637  | 8707  | 8        | 98   | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-12          | 1637  | 8708  | 10       | 98   | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-12          | 1637  | 8709  | 12       | 98   | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-12          | 1637  | 8710  | 14       | 98   | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-12          | 1638  | 8711  | 1        | 99   | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-12          | 1638  | 8712  | 3        | 99   | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-12          | 1638  | 8713  | 5        | 99   | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-12          | 1638  | 8714  | 7        | 99   | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-12          | 1638  | 8715  | 9        | 100  | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-12          | 1638  | 8716  | 11       | 100  | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-12          | 1638  | 8717  | 13       | 100  | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-12          | 1638  | 8718  | 15       | 100  | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-13          | 1639  | 8719  | 0        | 101  | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-13          | 1639  | 8720  | 2        | 101  | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-13          | 1639  | 8721  | 4        | 101  | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-13          | 1639  | 8722  | 6        | 101  | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-13          | 1639  | 8723  | 8        | 102  | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-13          | 1639  | 8724  | 10       | 102  | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-13          | 1639  | 8725  | 12       | 102  | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-13          | 1639  | 8726  | 14       | 102  | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-13          | 1640  | 8727  | 1        | 103  | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-13          | 1640  | 8728  | 3        | 103  | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-13          | 1640  | 8729  | 5        | 103  | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-13          | 1640  | 8730  | 7        | 103  | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-13          | 1640  | 8731  | 9        | 104  | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-13          | 1640  | 8732  | 11       | 104  | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-13          | 1640  | 8733  | 13       | 104  | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-13          | 1640  | 8734  | 15       | 104  | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
+|  clustera | clustera-1           | 1615  | 8527  | 0        | 53   | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 1615  | 8528  | 2        | 53   | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 1615  | 8529  | 4        | 53   | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 1615  | 8530  | 6        | 53   | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 1615  | 8531  | 8        | 54   | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 1615  | 8532  | 10       | 54   | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 1615  | 8533  | 12       | 54   | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 1615  | 8534  | 14       | 54   | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 1616  | 8535  | 1        | 55   | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 1616  | 8536  | 3        | 55   | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 1616  | 8537  | 5        | 55   | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 1616  | 8538  | 7        | 55   | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 1616  | 8539  | 9        | 56   | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 1616  | 8540  | 11       | 56   | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 1616  | 8541  | 13       | 56   | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 1616  | 8542  | 15       | 56   | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 1617  | 8543  | 0        | 57   | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 1617  | 8544  | 2        | 57   | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 1617  | 8545  | 4        | 57   | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 1617  | 8546  | 6        | 57   | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 1617  | 8547  | 8        | 58   | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 1617  | 8548  | 10       | 58   | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 1617  | 8549  | 12       | 58   | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 1617  | 8550  | 14       | 58   | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 1618  | 8551  | 1        | 59   | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 1618  | 8552  | 3        | 59   | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 1618  | 8553  | 5        | 59   | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 1618  | 8554  | 7        | 59   | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 1618  | 8555  | 9        | 59   | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 1618  | 8556  | 11       | 59   | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 1618  | 8557  | 13       | 59   | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 1618  | 8558  | 15       | 59   | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-3           | 1619  | 8559  | 0        | 61   | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-3           | 1619  | 8560  | 2        | 61   | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-3           | 1619  | 8561  | 4        | 61   | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-3           | 1619  | 8562  | 6        | 61   | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-3           | 1619  | 8563  | 8        | 62   | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-3           | 1619  | 8564  | 10       | 62   | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-3           | 1619  | 8565  | 12       | 62   | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-3           | 1619  | 8566  | 14       | 62   | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-3           | 1620  | 8567  | 1        | 63   | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-3           | 1620  | 8568  | 3        | 63   | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-3           | 1620  | 8569  | 5        | 63   | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-3           | 1620  | 8570  | 7        | 63   | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-3           | 1620  | 8571  | 9        | 64   | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-3           | 1620  | 8572  | 11       | 64   | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-3           | 1620  | 8573  | 13       | 64   | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-3           | 1620  | 8574  | 15       | 64   | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-4           | 1621  | 8575  | 0        | 65   | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-4           | 1621  | 8576  | 2        | 65   | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-4           | 1621  | 8577  | 4        | 65   | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-4           | 1621  | 8578  | 6        | 65   | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-4           | 1621  | 8579  | 8        | 66   | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-4           | 1621  | 8580  | 10       | 66   | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-4           | 1621  | 8581  | 12       | 66   | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-4           | 1621  | 8582  | 14       | 66   | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-4           | 1622  | 8583  | 1        | 67   | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-4           | 1622  | 8584  | 3        | 67   | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-4           | 1622  | 8585  | 5        | 67   | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-4           | 1622  | 8586  | 7        | 67   | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-4           | 1622  | 8587  | 9        | 68   | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-4           | 1622  | 8588  | 11       | 68   | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-4           | 1622  | 8589  | 13       | 68   | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-4           | 1622  | 8590  | 15       | 68   | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-5           | 1623  | 8591  | 0        | 69   | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-5           | 1623  | 8592  | 2        | 69   | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-5           | 1623  | 8593  | 4        | 69   | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-5           | 1623  | 8594  | 6        | 69   | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-5           | 1623  | 8595  | 8        | 70   | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-5           | 1623  | 8596  | 10       | 70   | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-5           | 1623  | 8597  | 12       | 70   | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-5           | 1623  | 8598  | 14       | 70   | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-5           | 1624  | 8599  | 1        | 71   | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-5           | 1624  | 8600  | 3        | 71   | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-5           | 1624  | 8601  | 5        | 71   | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-5           | 1624  | 8602  | 7        | 71   | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-5           | 1624  | 8603  | 9        | 72   | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-5           | 1624  | 8604  | 11       | 72   | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-5           | 1624  | 8605  | 13       | 72   | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-5           | 1624  | 8606  | 15       | 72   | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-6           | 1625  | 8607  | 0        | 73   | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-6           | 1625  | 8608  | 2        | 73   | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-6           | 1625  | 8609  | 4        | 73   | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-6           | 1625  | 8610  | 6        | 73   | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-6           | 1625  | 8611  | 8        | 74   | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-6           | 1625  | 8612  | 10       | 74   | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-6           | 1625  | 8613  | 12       | 74   | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-6           | 1625  | 8614  | 14       | 74   | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-6           | 1626  | 8615  | 1        | 75   | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-6           | 1626  | 8616  | 3        | 75   | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-6           | 1626  | 8617  | 5        | 75   | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-6           | 1626  | 8618  | 7        | 75   | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-6           | 1626  | 8619  | 9        | 76   | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-6           | 1626  | 8620  | 11       | 76   | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-6           | 1626  | 8621  | 13       | 76   | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-6           | 1626  | 8622  | 15       | 76   | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-7           | 1627  | 8623  | 0        | 77   | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-7           | 1627  | 8624  | 2        | 77   | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-7           | 1627  | 8625  | 4        | 77   | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-7           | 1627  | 8626  | 6        | 77   | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-7           | 1627  | 8627  | 8        | 78   | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-7           | 1627  | 8628  | 10       | 78   | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-7           | 1627  | 8629  | 12       | 78   | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-7           | 1627  | 8630  | 14       | 78   | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-7           | 1628  | 8631  | 1        | 79   | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-7           | 1628  | 8632  | 3        | 79   | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-7           | 1628  | 8633  | 5        | 79   | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-7           | 1628  | 8634  | 7        | 79   | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-7           | 1628  | 8635  | 9        | 80   | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-7           | 1628  | 8636  | 11       | 80   | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-7           | 1628  | 8637  | 13       | 80   | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-7           | 1628  | 8638  | 15       | 80   | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-8           | 1629  | 8639  | 0        | 81   | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-8           | 1629  | 8640  | 2        | 81   | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-8           | 1629  | 8641  | 4        | 81   | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-8           | 1629  | 8642  | 6        | 81   | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-8           | 1629  | 8643  | 8        | 82   | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-8           | 1629  | 8644  | 10       | 82   | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-8           | 1629  | 8645  | 12       | 82   | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-8           | 1629  | 8646  | 14       | 82   | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-8           | 1630  | 8647  | 1        | 83   | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-8           | 1630  | 8648  | 3        | 83   | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-8           | 1630  | 8649  | 5        | 83   | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-8           | 1630  | 8650  | 7        | 83   | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-8           | 1630  | 8651  | 9        | 84   | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-8           | 1630  | 8652  | 11       | 84   | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-8           | 1630  | 8653  | 13       | 84   | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-8           | 1630  | 8654  | 15       | 84   | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-9           | 1631  | 8655  | 0        | 85   | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-9           | 1631  | 8656  | 2        | 85   | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-9           | 1631  | 8657  | 4        | 85   | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-9           | 1631  | 8658  | 6        | 85   | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-9           | 1631  | 8659  | 8        | 86   | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-9           | 1631  | 8660  | 10       | 86   | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-9           | 1631  | 8661  | 12       | 86   | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-9           | 1631  | 8662  | 14       | 86   | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-9           | 1632  | 8663  | 1        | 87   | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-9           | 1632  | 8664  | 3        | 87   | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-9           | 1632  | 8665  | 5        | 87   | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-9           | 1632  | 8666  | 7        | 87   | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-9           | 1632  | 8667  | 9        | 88   | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-9           | 1632  | 8668  | 11       | 88   | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-9           | 1632  | 8669  | 13       | 88   | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-9           | 1632  | 8670  | 15       | 88   | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-10          | 1633  | 8671  | 0        | 89   | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-10          | 1633  | 8672  | 2        | 89   | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-10          | 1633  | 8673  | 4        | 89   | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-10          | 1633  | 8674  | 6        | 89   | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-10          | 1633  | 8675  | 8        | 90   | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-10          | 1633  | 8676  | 10       | 90   | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-10          | 1633  | 8677  | 12       | 90   | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-10          | 1633  | 8678  | 14       | 90   | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-10          | 1634  | 8679  | 1        | 91   | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-10          | 1634  | 8680  | 3        | 91   | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-10          | 1634  | 8681  | 5        | 91   | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-10          | 1634  | 8682  | 7        | 91   | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-10          | 1634  | 8683  | 9        | 92   | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-10          | 1634  | 8684  | 11       | 92   | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-10          | 1634  | 8685  | 13       | 92   | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-10          | 1634  | 8686  | 15       | 92   | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-11          | 1635  | 8687  | 0        | 93   | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-11          | 1635  | 8688  | 2        | 93   | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-11          | 1635  | 8689  | 4        | 93   | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-11          | 1635  | 8690  | 6        | 93   | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-11          | 1635  | 8691  | 8        | 94   | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-11          | 1635  | 8692  | 10       | 94   | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-11          | 1635  | 8693  | 12       | 94   | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-11          | 1635  | 8694  | 14       | 94   | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-11          | 1636  | 8695  | 1        | 95   | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-11          | 1636  | 8696  | 3        | 95   | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-11          | 1636  | 8697  | 5        | 95   | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-11          | 1636  | 8698  | 7        | 95   | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-11          | 1636  | 8699  | 9        | 96   | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-11          | 1636  | 8700  | 11       | 96   | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-11          | 1636  | 8701  | 13       | 96   | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-11          | 1636  | 8702  | 15       | 96   | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-12          | 1637  | 8703  | 0        | 97   | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-12          | 1637  | 8704  | 2        | 97   | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-12          | 1637  | 8705  | 4        | 97   | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-12          | 1637  | 8706  | 6        | 97   | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-12          | 1637  | 8707  | 8        | 98   | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-12          | 1637  | 8708  | 10       | 98   | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-12          | 1637  | 8709  | 12       | 98   | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-12          | 1637  | 8710  | 14       | 98   | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-12          | 1638  | 8711  | 1        | 99   | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-12          | 1638  | 8712  | 3        | 99   | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-12          | 1638  | 8713  | 5        | 99   | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-12          | 1638  | 8714  | 7        | 99   | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-12          | 1638  | 8715  | 9        | 100  | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-12          | 1638  | 8716  | 11       | 100  | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-12          | 1638  | 8717  | 13       | 100  | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-12          | 1638  | 8718  | 15       | 100  | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-13          | 1639  | 8719  | 0        | 101  | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-13          | 1639  | 8720  | 2        | 101  | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-13          | 1639  | 8721  | 4        | 101  | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-13          | 1639  | 8722  | 6        | 101  | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-13          | 1639  | 8723  | 8        | 102  | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-13          | 1639  | 8724  | 10       | 102  | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-13          | 1639  | 8725  | 12       | 102  | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-13          | 1639  | 8726  | 14       | 102  | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-13          | 1640  | 8727  | 1        | 103  | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-13          | 1640  | 8728  | 3        | 103  | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-13          | 1640  | 8729  | 5        | 103  | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-13          | 1640  | 8730  | 7        | 103  | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-13          | 1640  | 8731  | 9        | 104  | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-13          | 1640  | 8732  | 11       | 104  | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-13          | 1640  | 8733  | 13       | 104  | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-13          | 1640  | 8734  | 15       | 104  | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
 +---------- + -------------------- + ----- + ----- + -------- + ---- + -------------------- + ------------------------------ + ------------------------------+
diff --git a/spec/output/graffiti_empty_diff_stdout.txt b/spec/output/graffiti_empty_diff_stdout.txt
index 6164c2449ea..ca997019736 100644
--- a/spec/output/graffiti_empty_diff_stdout.txt
+++ b/spec/output/graffiti_empty_diff_stdout.txt
@@ -18,7 +18,7 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "eth_rate", 10]
     ["+", "exotic", "NO"]
     ["+", "gpu_count", 4]
-    ["+", "gpu_model", "GeForce RTX 2080 Ti"]
+    ["+", "gpu_model", "NVIDIA GeForce RTX 2080 Ti"]
     ["+", "ib", "NO"]
     ["+", "ib_count", 0]
     ["+", "ib_rate", 0]
@@ -59,7 +59,7 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "eth_rate", 10]
     ["+", "exotic", "NO"]
     ["+", "gpu_count", 4]
-    ["+", "gpu_model", "GeForce RTX 2080 Ti"]
+    ["+", "gpu_model", "NVIDIA GeForce RTX 2080 Ti"]
     ["+", "ib", "NO"]
     ["+", "ib_count", 0]
     ["+", "ib_rate", 0]
@@ -100,7 +100,7 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "eth_rate", 10]
     ["+", "exotic", "NO"]
     ["+", "gpu_count", 4]
-    ["+", "gpu_model", "GeForce RTX 2080 Ti"]
+    ["+", "gpu_model", "NVIDIA GeForce RTX 2080 Ti"]
     ["+", "ib", "NO"]
     ["+", "ib_count", 0]
     ["+", "ib_rate", 0]
@@ -141,7 +141,7 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "eth_rate", 10]
     ["+", "exotic", "NO"]
     ["+", "gpu_count", 4]
-    ["+", "gpu_model", "GeForce RTX 2080 Ti"]
+    ["+", "gpu_model", "NVIDIA GeForce RTX 2080 Ti"]
     ["+", "ib", "NO"]
     ["+", "ib_count", 0]
     ["+", "ib_rate", 0]
@@ -182,7 +182,7 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "eth_rate", 10]
     ["+", "exotic", "NO"]
     ["+", "gpu_count", 4]
-    ["+", "gpu_model", "GeForce RTX 2080 Ti"]
+    ["+", "gpu_model", "NVIDIA GeForce RTX 2080 Ti"]
     ["+", "ib", "NO"]
     ["+", "ib_count", 0]
     ["+", "ib_rate", 0]
@@ -223,7 +223,7 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "eth_rate", 10]
     ["+", "exotic", "NO"]
     ["+", "gpu_count", 4]
-    ["+", "gpu_model", "GeForce RTX 2080 Ti"]
+    ["+", "gpu_model", "NVIDIA GeForce RTX 2080 Ti"]
     ["+", "ib", "NO"]
     ["+", "ib_count", 0]
     ["+", "ib_rate", 0]
@@ -264,7 +264,7 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "eth_rate", 10]
     ["+", "exotic", "NO"]
     ["+", "gpu_count", 4]
-    ["+", "gpu_model", "GeForce RTX 2080 Ti"]
+    ["+", "gpu_model", "NVIDIA GeForce RTX 2080 Ti"]
     ["+", "ib", "NO"]
     ["+", "ib_count", 0]
     ["+", "ib_rate", 0]
@@ -305,7 +305,7 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "eth_rate", 10]
     ["+", "exotic", "NO"]
     ["+", "gpu_count", 4]
-    ["+", "gpu_model", "GeForce RTX 2080 Ti"]
+    ["+", "gpu_model", "NVIDIA GeForce RTX 2080 Ti"]
     ["+", "ib", "NO"]
     ["+", "ib_count", 0]
     ["+", "ib_rate", 0]
@@ -346,7 +346,7 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "eth_rate", 10]
     ["+", "exotic", "NO"]
     ["+", "gpu_count", 4]
-    ["+", "gpu_model", "GeForce RTX 2080 Ti"]
+    ["+", "gpu_model", "NVIDIA GeForce RTX 2080 Ti"]
     ["+", "ib", "NO"]
     ["+", "ib_count", 0]
     ["+", "ib_rate", 0]
@@ -387,7 +387,7 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "eth_rate", 10]
     ["+", "exotic", "NO"]
     ["+", "gpu_count", 4]
-    ["+", "gpu_model", "GeForce RTX 2080 Ti"]
+    ["+", "gpu_model", "NVIDIA GeForce RTX 2080 Ti"]
     ["+", "ib", "NO"]
     ["+", "ib_count", 0]
     ["+", "ib_rate", 0]
@@ -428,7 +428,7 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "eth_rate", 10]
     ["+", "exotic", "NO"]
     ["+", "gpu_count", 4]
-    ["+", "gpu_model", "GeForce RTX 2080 Ti"]
+    ["+", "gpu_model", "NVIDIA GeForce RTX 2080 Ti"]
     ["+", "ib", "NO"]
     ["+", "ib_count", 0]
     ["+", "ib_rate", 0]
@@ -469,7 +469,7 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "eth_rate", 10]
     ["+", "exotic", "NO"]
     ["+", "gpu_count", 4]
-    ["+", "gpu_model", "GeForce RTX 2080 Ti"]
+    ["+", "gpu_model", "NVIDIA GeForce RTX 2080 Ti"]
     ["+", "ib", "NO"]
     ["+", "ib_count", 0]
     ["+", "ib_rate", 0]
diff --git a/spec/output/graffiti_empty_print_stdout.txt b/spec/output/graffiti_empty_print_stdout.txt
index 7de1bffec32..9128a32cc35 100644
--- a/spec/output/graffiti_empty_print_stdout.txt
+++ b/spec/output/graffiti_empty_print_stdout.txt
@@ -93,24 +93,24 @@ property_exist 'disk_reservation_count' || oarproperty -a disk_reservation_count
 ###################################
 # clustera-1.fakesite.grid5000.fr
 ###################################
-oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=1 -p core=1 -p cpuset=0 -p gpu=1 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=1 -p core=2 -p cpuset=2 -p gpu=1 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=1 -p core=3 -p cpuset=4 -p gpu=1 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=1 -p core=4 -p cpuset=6 -p gpu=1 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=1 -p core=5 -p cpuset=8 -p gpu=2 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=1 -p core=6 -p cpuset=10 -p gpu=2 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=1 -p core=7 -p cpuset=12 -p gpu=2 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=1 -p core=8 -p cpuset=14 -p gpu=2 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=2 -p core=9 -p cpuset=1 -p gpu=3 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=2 -p core=10 -p cpuset=3 -p gpu=3 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=2 -p core=11 -p cpuset=5 -p gpu=3 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=2 -p core=12 -p cpuset=7 -p gpu=3 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=2 -p core=13 -p cpuset=9 -p gpu=4 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=2 -p core=14 -p cpuset=11 -p gpu=4 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=2 -p core=15 -p cpuset=13 -p gpu=4 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=2 -p core=16 -p cpuset=15 -p gpu=4 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=1 -p core=1 -p cpuset=0 -p gpu=1 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=1 -p core=2 -p cpuset=2 -p gpu=1 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=1 -p core=3 -p cpuset=4 -p gpu=1 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=1 -p core=4 -p cpuset=6 -p gpu=1 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=1 -p core=5 -p cpuset=8 -p gpu=2 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=1 -p core=6 -p cpuset=10 -p gpu=2 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=1 -p core=7 -p cpuset=12 -p gpu=2 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=1 -p core=8 -p cpuset=14 -p gpu=2 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=2 -p core=9 -p cpuset=1 -p gpu=3 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=2 -p core=10 -p cpuset=3 -p gpu=3 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=2 -p core=11 -p cpuset=5 -p gpu=3 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=2 -p core=12 -p cpuset=7 -p gpu=3 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=2 -p core=13 -p cpuset=9 -p gpu=4 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=2 -p core=14 -p cpuset=11 -p gpu=4 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=2 -p core=15 -p cpuset=13 -p gpu=4 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=2 -p core=16 -p cpuset=15 -p gpu=4 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 echo; echo 'Setting properties for clustera-1.fakesite.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' and type='default'" -p ip='172.16.64.1' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/HDD' -p chassis='Dell Inc. PowerEdge T640 FL1CBX2' -p eth_count=1 -p eth_kavlan_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='GeForce RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='NO' -p cluster_priority=201906 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
+oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' and type='default'" -p ip='172.16.64.1' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/HDD' -p chassis='Dell Inc. PowerEdge T640 FL1CBX2' -p eth_count=1 -p eth_kavlan_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='NO' -p cluster_priority=201906 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
 
 echo '================================================================================'
 
@@ -118,24 +118,24 @@ echo '==========================================================================
 ###################################
 # clustera-2.fakesite.grid5000.fr
 ###################################
-oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=3 -p core=17 -p cpuset=0 -p gpu=5 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=3 -p core=18 -p cpuset=2 -p gpu=5 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=3 -p core=19 -p cpuset=4 -p gpu=5 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=3 -p core=20 -p cpuset=6 -p gpu=5 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=3 -p core=21 -p cpuset=8 -p gpu=6 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=3 -p core=22 -p cpuset=10 -p gpu=6 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=3 -p core=23 -p cpuset=12 -p gpu=6 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=3 -p core=24 -p cpuset=14 -p gpu=6 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=4 -p core=25 -p cpuset=1 -p gpu=7 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=4 -p core=26 -p cpuset=3 -p gpu=7 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=4 -p core=27 -p cpuset=5 -p gpu=7 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=4 -p core=28 -p cpuset=7 -p gpu=7 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=4 -p core=29 -p cpuset=9 -p gpu=8 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=4 -p core=30 -p cpuset=11 -p gpu=8 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=4 -p core=31 -p cpuset=13 -p gpu=8 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=4 -p core=32 -p cpuset=15 -p gpu=8 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=3 -p core=17 -p cpuset=0 -p gpu=5 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=3 -p core=18 -p cpuset=2 -p gpu=5 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=3 -p core=19 -p cpuset=4 -p gpu=5 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=3 -p core=20 -p cpuset=6 -p gpu=5 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=3 -p core=21 -p cpuset=8 -p gpu=6 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=3 -p core=22 -p cpuset=10 -p gpu=6 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=3 -p core=23 -p cpuset=12 -p gpu=6 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=3 -p core=24 -p cpuset=14 -p gpu=6 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=4 -p core=25 -p cpuset=1 -p gpu=7 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=4 -p core=26 -p cpuset=3 -p gpu=7 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=4 -p core=27 -p cpuset=5 -p gpu=7 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=4 -p core=28 -p cpuset=7 -p gpu=7 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=4 -p core=29 -p cpuset=9 -p gpu=8 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=4 -p core=30 -p cpuset=11 -p gpu=8 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=4 -p core=31 -p cpuset=13 -p gpu=8 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=4 -p core=32 -p cpuset=15 -p gpu=8 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 echo; echo 'Setting properties for clustera-2.fakesite.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' and type='default'" -p ip='172.16.64.2' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/HDD' -p chassis='Dell Inc. PowerEdge T640 9L1CBX2' -p eth_count=1 -p eth_kavlan_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='GeForce RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='NO' -p cluster_priority=201906 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
+oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' and type='default'" -p ip='172.16.64.2' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/HDD' -p chassis='Dell Inc. PowerEdge T640 9L1CBX2' -p eth_count=1 -p eth_kavlan_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='NO' -p cluster_priority=201906 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
 
 echo '================================================================================'
 
@@ -143,24 +143,24 @@ echo '==========================================================================
 ###################################
 # clustera-3.fakesite.grid5000.fr
 ###################################
-oarnodesetting -a -h 'clustera-3.fakesite.grid5000.fr' -s Absent -p host='clustera-3.fakesite.grid5000.fr' -p cpu=5 -p core=33 -p cpuset=0 -p gpu=9 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting -a -h 'clustera-3.fakesite.grid5000.fr' -s Absent -p host='clustera-3.fakesite.grid5000.fr' -p cpu=5 -p core=34 -p cpuset=2 -p gpu=9 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting -a -h 'clustera-3.fakesite.grid5000.fr' -s Absent -p host='clustera-3.fakesite.grid5000.fr' -p cpu=5 -p core=35 -p cpuset=4 -p gpu=9 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting -a -h 'clustera-3.fakesite.grid5000.fr' -s Absent -p host='clustera-3.fakesite.grid5000.fr' -p cpu=5 -p core=36 -p cpuset=6 -p gpu=9 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting -a -h 'clustera-3.fakesite.grid5000.fr' -s Absent -p host='clustera-3.fakesite.grid5000.fr' -p cpu=5 -p core=37 -p cpuset=8 -p gpu=10 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting -a -h 'clustera-3.fakesite.grid5000.fr' -s Absent -p host='clustera-3.fakesite.grid5000.fr' -p cpu=5 -p core=38 -p cpuset=10 -p gpu=10 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting -a -h 'clustera-3.fakesite.grid5000.fr' -s Absent -p host='clustera-3.fakesite.grid5000.fr' -p cpu=5 -p core=39 -p cpuset=12 -p gpu=10 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting -a -h 'clustera-3.fakesite.grid5000.fr' -s Absent -p host='clustera-3.fakesite.grid5000.fr' -p cpu=5 -p core=40 -p cpuset=14 -p gpu=10 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting -a -h 'clustera-3.fakesite.grid5000.fr' -s Absent -p host='clustera-3.fakesite.grid5000.fr' -p cpu=6 -p core=41 -p cpuset=1 -p gpu=11 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting -a -h 'clustera-3.fakesite.grid5000.fr' -s Absent -p host='clustera-3.fakesite.grid5000.fr' -p cpu=6 -p core=42 -p cpuset=3 -p gpu=11 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting -a -h 'clustera-3.fakesite.grid5000.fr' -s Absent -p host='clustera-3.fakesite.grid5000.fr' -p cpu=6 -p core=43 -p cpuset=5 -p gpu=11 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting -a -h 'clustera-3.fakesite.grid5000.fr' -s Absent -p host='clustera-3.fakesite.grid5000.fr' -p cpu=6 -p core=44 -p cpuset=7 -p gpu=11 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting -a -h 'clustera-3.fakesite.grid5000.fr' -s Absent -p host='clustera-3.fakesite.grid5000.fr' -p cpu=6 -p core=45 -p cpuset=9 -p gpu=12 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting -a -h 'clustera-3.fakesite.grid5000.fr' -s Absent -p host='clustera-3.fakesite.grid5000.fr' -p cpu=6 -p core=46 -p cpuset=11 -p gpu=12 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting -a -h 'clustera-3.fakesite.grid5000.fr' -s Absent -p host='clustera-3.fakesite.grid5000.fr' -p cpu=6 -p core=47 -p cpuset=13 -p gpu=12 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting -a -h 'clustera-3.fakesite.grid5000.fr' -s Absent -p host='clustera-3.fakesite.grid5000.fr' -p cpu=6 -p core=48 -p cpuset=15 -p gpu=12 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting -a -h 'clustera-3.fakesite.grid5000.fr' -s Absent -p host='clustera-3.fakesite.grid5000.fr' -p cpu=5 -p core=33 -p cpuset=0 -p gpu=9 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting -a -h 'clustera-3.fakesite.grid5000.fr' -s Absent -p host='clustera-3.fakesite.grid5000.fr' -p cpu=5 -p core=34 -p cpuset=2 -p gpu=9 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting -a -h 'clustera-3.fakesite.grid5000.fr' -s Absent -p host='clustera-3.fakesite.grid5000.fr' -p cpu=5 -p core=35 -p cpuset=4 -p gpu=9 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting -a -h 'clustera-3.fakesite.grid5000.fr' -s Absent -p host='clustera-3.fakesite.grid5000.fr' -p cpu=5 -p core=36 -p cpuset=6 -p gpu=9 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting -a -h 'clustera-3.fakesite.grid5000.fr' -s Absent -p host='clustera-3.fakesite.grid5000.fr' -p cpu=5 -p core=37 -p cpuset=8 -p gpu=10 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting -a -h 'clustera-3.fakesite.grid5000.fr' -s Absent -p host='clustera-3.fakesite.grid5000.fr' -p cpu=5 -p core=38 -p cpuset=10 -p gpu=10 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting -a -h 'clustera-3.fakesite.grid5000.fr' -s Absent -p host='clustera-3.fakesite.grid5000.fr' -p cpu=5 -p core=39 -p cpuset=12 -p gpu=10 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting -a -h 'clustera-3.fakesite.grid5000.fr' -s Absent -p host='clustera-3.fakesite.grid5000.fr' -p cpu=5 -p core=40 -p cpuset=14 -p gpu=10 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting -a -h 'clustera-3.fakesite.grid5000.fr' -s Absent -p host='clustera-3.fakesite.grid5000.fr' -p cpu=6 -p core=41 -p cpuset=1 -p gpu=11 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting -a -h 'clustera-3.fakesite.grid5000.fr' -s Absent -p host='clustera-3.fakesite.grid5000.fr' -p cpu=6 -p core=42 -p cpuset=3 -p gpu=11 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting -a -h 'clustera-3.fakesite.grid5000.fr' -s Absent -p host='clustera-3.fakesite.grid5000.fr' -p cpu=6 -p core=43 -p cpuset=5 -p gpu=11 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting -a -h 'clustera-3.fakesite.grid5000.fr' -s Absent -p host='clustera-3.fakesite.grid5000.fr' -p cpu=6 -p core=44 -p cpuset=7 -p gpu=11 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting -a -h 'clustera-3.fakesite.grid5000.fr' -s Absent -p host='clustera-3.fakesite.grid5000.fr' -p cpu=6 -p core=45 -p cpuset=9 -p gpu=12 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting -a -h 'clustera-3.fakesite.grid5000.fr' -s Absent -p host='clustera-3.fakesite.grid5000.fr' -p cpu=6 -p core=46 -p cpuset=11 -p gpu=12 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting -a -h 'clustera-3.fakesite.grid5000.fr' -s Absent -p host='clustera-3.fakesite.grid5000.fr' -p cpu=6 -p core=47 -p cpuset=13 -p gpu=12 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting -a -h 'clustera-3.fakesite.grid5000.fr' -s Absent -p host='clustera-3.fakesite.grid5000.fr' -p cpu=6 -p core=48 -p cpuset=15 -p gpu=12 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 echo; echo 'Setting properties for clustera-3.fakesite.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-3.fakesite.grid5000.fr' and type='default'" -p ip='172.16.64.3' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/HDD' -p chassis='Dell Inc. PowerEdge T640 BL1CBX2' -p eth_count=1 -p eth_kavlan_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='GeForce RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='NO' -p cluster_priority=201906 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
+oarnodesetting --sql "host='clustera-3.fakesite.grid5000.fr' and type='default'" -p ip='172.16.64.3' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/HDD' -p chassis='Dell Inc. PowerEdge T640 BL1CBX2' -p eth_count=1 -p eth_kavlan_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='NO' -p cluster_priority=201906 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
 
 echo '================================================================================'
 
@@ -168,24 +168,24 @@ echo '==========================================================================
 ###################################
 # clustera-4.fakesite.grid5000.fr
 ###################################
-oarnodesetting -a -h 'clustera-4.fakesite.grid5000.fr' -s Absent -p host='clustera-4.fakesite.grid5000.fr' -p cpu=7 -p core=49 -p cpuset=0 -p gpu=13 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting -a -h 'clustera-4.fakesite.grid5000.fr' -s Absent -p host='clustera-4.fakesite.grid5000.fr' -p cpu=7 -p core=50 -p cpuset=2 -p gpu=13 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting -a -h 'clustera-4.fakesite.grid5000.fr' -s Absent -p host='clustera-4.fakesite.grid5000.fr' -p cpu=7 -p core=51 -p cpuset=4 -p gpu=13 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting -a -h 'clustera-4.fakesite.grid5000.fr' -s Absent -p host='clustera-4.fakesite.grid5000.fr' -p cpu=7 -p core=52 -p cpuset=6 -p gpu=13 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting -a -h 'clustera-4.fakesite.grid5000.fr' -s Absent -p host='clustera-4.fakesite.grid5000.fr' -p cpu=7 -p core=53 -p cpuset=8 -p gpu=14 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting -a -h 'clustera-4.fakesite.grid5000.fr' -s Absent -p host='clustera-4.fakesite.grid5000.fr' -p cpu=7 -p core=54 -p cpuset=10 -p gpu=14 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting -a -h 'clustera-4.fakesite.grid5000.fr' -s Absent -p host='clustera-4.fakesite.grid5000.fr' -p cpu=7 -p core=55 -p cpuset=12 -p gpu=14 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting -a -h 'clustera-4.fakesite.grid5000.fr' -s Absent -p host='clustera-4.fakesite.grid5000.fr' -p cpu=7 -p core=56 -p cpuset=14 -p gpu=14 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting -a -h 'clustera-4.fakesite.grid5000.fr' -s Absent -p host='clustera-4.fakesite.grid5000.fr' -p cpu=8 -p core=57 -p cpuset=1 -p gpu=15 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting -a -h 'clustera-4.fakesite.grid5000.fr' -s Absent -p host='clustera-4.fakesite.grid5000.fr' -p cpu=8 -p core=58 -p cpuset=3 -p gpu=15 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting -a -h 'clustera-4.fakesite.grid5000.fr' -s Absent -p host='clustera-4.fakesite.grid5000.fr' -p cpu=8 -p core=59 -p cpuset=5 -p gpu=15 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting -a -h 'clustera-4.fakesite.grid5000.fr' -s Absent -p host='clustera-4.fakesite.grid5000.fr' -p cpu=8 -p core=60 -p cpuset=7 -p gpu=15 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting -a -h 'clustera-4.fakesite.grid5000.fr' -s Absent -p host='clustera-4.fakesite.grid5000.fr' -p cpu=8 -p core=61 -p cpuset=9 -p gpu=16 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting -a -h 'clustera-4.fakesite.grid5000.fr' -s Absent -p host='clustera-4.fakesite.grid5000.fr' -p cpu=8 -p core=62 -p cpuset=11 -p gpu=16 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting -a -h 'clustera-4.fakesite.grid5000.fr' -s Absent -p host='clustera-4.fakesite.grid5000.fr' -p cpu=8 -p core=63 -p cpuset=13 -p gpu=16 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting -a -h 'clustera-4.fakesite.grid5000.fr' -s Absent -p host='clustera-4.fakesite.grid5000.fr' -p cpu=8 -p core=64 -p cpuset=15 -p gpu=16 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting -a -h 'clustera-4.fakesite.grid5000.fr' -s Absent -p host='clustera-4.fakesite.grid5000.fr' -p cpu=7 -p core=49 -p cpuset=0 -p gpu=13 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting -a -h 'clustera-4.fakesite.grid5000.fr' -s Absent -p host='clustera-4.fakesite.grid5000.fr' -p cpu=7 -p core=50 -p cpuset=2 -p gpu=13 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting -a -h 'clustera-4.fakesite.grid5000.fr' -s Absent -p host='clustera-4.fakesite.grid5000.fr' -p cpu=7 -p core=51 -p cpuset=4 -p gpu=13 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting -a -h 'clustera-4.fakesite.grid5000.fr' -s Absent -p host='clustera-4.fakesite.grid5000.fr' -p cpu=7 -p core=52 -p cpuset=6 -p gpu=13 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting -a -h 'clustera-4.fakesite.grid5000.fr' -s Absent -p host='clustera-4.fakesite.grid5000.fr' -p cpu=7 -p core=53 -p cpuset=8 -p gpu=14 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting -a -h 'clustera-4.fakesite.grid5000.fr' -s Absent -p host='clustera-4.fakesite.grid5000.fr' -p cpu=7 -p core=54 -p cpuset=10 -p gpu=14 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting -a -h 'clustera-4.fakesite.grid5000.fr' -s Absent -p host='clustera-4.fakesite.grid5000.fr' -p cpu=7 -p core=55 -p cpuset=12 -p gpu=14 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting -a -h 'clustera-4.fakesite.grid5000.fr' -s Absent -p host='clustera-4.fakesite.grid5000.fr' -p cpu=7 -p core=56 -p cpuset=14 -p gpu=14 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting -a -h 'clustera-4.fakesite.grid5000.fr' -s Absent -p host='clustera-4.fakesite.grid5000.fr' -p cpu=8 -p core=57 -p cpuset=1 -p gpu=15 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting -a -h 'clustera-4.fakesite.grid5000.fr' -s Absent -p host='clustera-4.fakesite.grid5000.fr' -p cpu=8 -p core=58 -p cpuset=3 -p gpu=15 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting -a -h 'clustera-4.fakesite.grid5000.fr' -s Absent -p host='clustera-4.fakesite.grid5000.fr' -p cpu=8 -p core=59 -p cpuset=5 -p gpu=15 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting -a -h 'clustera-4.fakesite.grid5000.fr' -s Absent -p host='clustera-4.fakesite.grid5000.fr' -p cpu=8 -p core=60 -p cpuset=7 -p gpu=15 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting -a -h 'clustera-4.fakesite.grid5000.fr' -s Absent -p host='clustera-4.fakesite.grid5000.fr' -p cpu=8 -p core=61 -p cpuset=9 -p gpu=16 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting -a -h 'clustera-4.fakesite.grid5000.fr' -s Absent -p host='clustera-4.fakesite.grid5000.fr' -p cpu=8 -p core=62 -p cpuset=11 -p gpu=16 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting -a -h 'clustera-4.fakesite.grid5000.fr' -s Absent -p host='clustera-4.fakesite.grid5000.fr' -p cpu=8 -p core=63 -p cpuset=13 -p gpu=16 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting -a -h 'clustera-4.fakesite.grid5000.fr' -s Absent -p host='clustera-4.fakesite.grid5000.fr' -p cpu=8 -p core=64 -p cpuset=15 -p gpu=16 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 echo; echo 'Setting properties for clustera-4.fakesite.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-4.fakesite.grid5000.fr' and type='default'" -p ip='172.16.64.4' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/HDD' -p chassis='Dell Inc. PowerEdge T640 DL1CBX2' -p eth_count=1 -p eth_kavlan_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='GeForce RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='NO' -p cluster_priority=201906 -p max_walltime=172800 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
+oarnodesetting --sql "host='clustera-4.fakesite.grid5000.fr' and type='default'" -p ip='172.16.64.4' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/HDD' -p chassis='Dell Inc. PowerEdge T640 DL1CBX2' -p eth_count=1 -p eth_kavlan_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='NO' -p cluster_priority=201906 -p max_walltime=172800 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
 
 echo '================================================================================'
 
@@ -193,24 +193,24 @@ echo '==========================================================================
 ###################################
 # clustera-5.fakesite.grid5000.fr
 ###################################
-oarnodesetting -a -h 'clustera-5.fakesite.grid5000.fr' -s Absent -p host='clustera-5.fakesite.grid5000.fr' -p cpu=9 -p core=65 -p cpuset=0 -p gpu=17 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting -a -h 'clustera-5.fakesite.grid5000.fr' -s Absent -p host='clustera-5.fakesite.grid5000.fr' -p cpu=9 -p core=66 -p cpuset=2 -p gpu=17 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting -a -h 'clustera-5.fakesite.grid5000.fr' -s Absent -p host='clustera-5.fakesite.grid5000.fr' -p cpu=9 -p core=67 -p cpuset=4 -p gpu=17 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting -a -h 'clustera-5.fakesite.grid5000.fr' -s Absent -p host='clustera-5.fakesite.grid5000.fr' -p cpu=9 -p core=68 -p cpuset=6 -p gpu=17 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting -a -h 'clustera-5.fakesite.grid5000.fr' -s Absent -p host='clustera-5.fakesite.grid5000.fr' -p cpu=9 -p core=69 -p cpuset=8 -p gpu=18 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting -a -h 'clustera-5.fakesite.grid5000.fr' -s Absent -p host='clustera-5.fakesite.grid5000.fr' -p cpu=9 -p core=70 -p cpuset=10 -p gpu=18 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting -a -h 'clustera-5.fakesite.grid5000.fr' -s Absent -p host='clustera-5.fakesite.grid5000.fr' -p cpu=9 -p core=71 -p cpuset=12 -p gpu=18 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting -a -h 'clustera-5.fakesite.grid5000.fr' -s Absent -p host='clustera-5.fakesite.grid5000.fr' -p cpu=9 -p core=72 -p cpuset=14 -p gpu=18 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting -a -h 'clustera-5.fakesite.grid5000.fr' -s Absent -p host='clustera-5.fakesite.grid5000.fr' -p cpu=10 -p core=73 -p cpuset=1 -p gpu=19 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting -a -h 'clustera-5.fakesite.grid5000.fr' -s Absent -p host='clustera-5.fakesite.grid5000.fr' -p cpu=10 -p core=74 -p cpuset=3 -p gpu=19 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting -a -h 'clustera-5.fakesite.grid5000.fr' -s Absent -p host='clustera-5.fakesite.grid5000.fr' -p cpu=10 -p core=75 -p cpuset=5 -p gpu=19 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting -a -h 'clustera-5.fakesite.grid5000.fr' -s Absent -p host='clustera-5.fakesite.grid5000.fr' -p cpu=10 -p core=76 -p cpuset=7 -p gpu=19 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting -a -h 'clustera-5.fakesite.grid5000.fr' -s Absent -p host='clustera-5.fakesite.grid5000.fr' -p cpu=10 -p core=77 -p cpuset=9 -p gpu=20 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting -a -h 'clustera-5.fakesite.grid5000.fr' -s Absent -p host='clustera-5.fakesite.grid5000.fr' -p cpu=10 -p core=78 -p cpuset=11 -p gpu=20 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting -a -h 'clustera-5.fakesite.grid5000.fr' -s Absent -p host='clustera-5.fakesite.grid5000.fr' -p cpu=10 -p core=79 -p cpuset=13 -p gpu=20 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting -a -h 'clustera-5.fakesite.grid5000.fr' -s Absent -p host='clustera-5.fakesite.grid5000.fr' -p cpu=10 -p core=80 -p cpuset=15 -p gpu=20 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting -a -h 'clustera-5.fakesite.grid5000.fr' -s Absent -p host='clustera-5.fakesite.grid5000.fr' -p cpu=9 -p core=65 -p cpuset=0 -p gpu=17 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting -a -h 'clustera-5.fakesite.grid5000.fr' -s Absent -p host='clustera-5.fakesite.grid5000.fr' -p cpu=9 -p core=66 -p cpuset=2 -p gpu=17 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting -a -h 'clustera-5.fakesite.grid5000.fr' -s Absent -p host='clustera-5.fakesite.grid5000.fr' -p cpu=9 -p core=67 -p cpuset=4 -p gpu=17 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting -a -h 'clustera-5.fakesite.grid5000.fr' -s Absent -p host='clustera-5.fakesite.grid5000.fr' -p cpu=9 -p core=68 -p cpuset=6 -p gpu=17 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting -a -h 'clustera-5.fakesite.grid5000.fr' -s Absent -p host='clustera-5.fakesite.grid5000.fr' -p cpu=9 -p core=69 -p cpuset=8 -p gpu=18 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting -a -h 'clustera-5.fakesite.grid5000.fr' -s Absent -p host='clustera-5.fakesite.grid5000.fr' -p cpu=9 -p core=70 -p cpuset=10 -p gpu=18 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting -a -h 'clustera-5.fakesite.grid5000.fr' -s Absent -p host='clustera-5.fakesite.grid5000.fr' -p cpu=9 -p core=71 -p cpuset=12 -p gpu=18 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting -a -h 'clustera-5.fakesite.grid5000.fr' -s Absent -p host='clustera-5.fakesite.grid5000.fr' -p cpu=9 -p core=72 -p cpuset=14 -p gpu=18 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting -a -h 'clustera-5.fakesite.grid5000.fr' -s Absent -p host='clustera-5.fakesite.grid5000.fr' -p cpu=10 -p core=73 -p cpuset=1 -p gpu=19 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting -a -h 'clustera-5.fakesite.grid5000.fr' -s Absent -p host='clustera-5.fakesite.grid5000.fr' -p cpu=10 -p core=74 -p cpuset=3 -p gpu=19 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting -a -h 'clustera-5.fakesite.grid5000.fr' -s Absent -p host='clustera-5.fakesite.grid5000.fr' -p cpu=10 -p core=75 -p cpuset=5 -p gpu=19 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting -a -h 'clustera-5.fakesite.grid5000.fr' -s Absent -p host='clustera-5.fakesite.grid5000.fr' -p cpu=10 -p core=76 -p cpuset=7 -p gpu=19 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting -a -h 'clustera-5.fakesite.grid5000.fr' -s Absent -p host='clustera-5.fakesite.grid5000.fr' -p cpu=10 -p core=77 -p cpuset=9 -p gpu=20 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting -a -h 'clustera-5.fakesite.grid5000.fr' -s Absent -p host='clustera-5.fakesite.grid5000.fr' -p cpu=10 -p core=78 -p cpuset=11 -p gpu=20 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting -a -h 'clustera-5.fakesite.grid5000.fr' -s Absent -p host='clustera-5.fakesite.grid5000.fr' -p cpu=10 -p core=79 -p cpuset=13 -p gpu=20 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting -a -h 'clustera-5.fakesite.grid5000.fr' -s Absent -p host='clustera-5.fakesite.grid5000.fr' -p cpu=10 -p core=80 -p cpuset=15 -p gpu=20 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 echo; echo 'Setting properties for clustera-5.fakesite.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-5.fakesite.grid5000.fr' and type='default'" -p ip='172.16.64.5' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/HDD' -p chassis='Dell Inc. PowerEdge T640 CL1CBX2' -p eth_count=1 -p eth_kavlan_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='GeForce RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='NO' -p cluster_priority=201906 -p max_walltime=172800 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
+oarnodesetting --sql "host='clustera-5.fakesite.grid5000.fr' and type='default'" -p ip='172.16.64.5' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/HDD' -p chassis='Dell Inc. PowerEdge T640 CL1CBX2' -p eth_count=1 -p eth_kavlan_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='NO' -p cluster_priority=201906 -p max_walltime=172800 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
 
 echo '================================================================================'
 
@@ -218,24 +218,24 @@ echo '==========================================================================
 ###################################
 # clustera-6.fakesite.grid5000.fr
 ###################################
-oarnodesetting -a -h 'clustera-6.fakesite.grid5000.fr' -s Absent -p host='clustera-6.fakesite.grid5000.fr' -p cpu=11 -p core=81 -p cpuset=0 -p gpu=21 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting -a -h 'clustera-6.fakesite.grid5000.fr' -s Absent -p host='clustera-6.fakesite.grid5000.fr' -p cpu=11 -p core=82 -p cpuset=2 -p gpu=21 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting -a -h 'clustera-6.fakesite.grid5000.fr' -s Absent -p host='clustera-6.fakesite.grid5000.fr' -p cpu=11 -p core=83 -p cpuset=4 -p gpu=21 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting -a -h 'clustera-6.fakesite.grid5000.fr' -s Absent -p host='clustera-6.fakesite.grid5000.fr' -p cpu=11 -p core=84 -p cpuset=6 -p gpu=21 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting -a -h 'clustera-6.fakesite.grid5000.fr' -s Absent -p host='clustera-6.fakesite.grid5000.fr' -p cpu=11 -p core=85 -p cpuset=8 -p gpu=22 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting -a -h 'clustera-6.fakesite.grid5000.fr' -s Absent -p host='clustera-6.fakesite.grid5000.fr' -p cpu=11 -p core=86 -p cpuset=10 -p gpu=22 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting -a -h 'clustera-6.fakesite.grid5000.fr' -s Absent -p host='clustera-6.fakesite.grid5000.fr' -p cpu=11 -p core=87 -p cpuset=12 -p gpu=22 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting -a -h 'clustera-6.fakesite.grid5000.fr' -s Absent -p host='clustera-6.fakesite.grid5000.fr' -p cpu=11 -p core=88 -p cpuset=14 -p gpu=22 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting -a -h 'clustera-6.fakesite.grid5000.fr' -s Absent -p host='clustera-6.fakesite.grid5000.fr' -p cpu=12 -p core=89 -p cpuset=1 -p gpu=23 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting -a -h 'clustera-6.fakesite.grid5000.fr' -s Absent -p host='clustera-6.fakesite.grid5000.fr' -p cpu=12 -p core=90 -p cpuset=3 -p gpu=23 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting -a -h 'clustera-6.fakesite.grid5000.fr' -s Absent -p host='clustera-6.fakesite.grid5000.fr' -p cpu=12 -p core=91 -p cpuset=5 -p gpu=23 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting -a -h 'clustera-6.fakesite.grid5000.fr' -s Absent -p host='clustera-6.fakesite.grid5000.fr' -p cpu=12 -p core=92 -p cpuset=7 -p gpu=23 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting -a -h 'clustera-6.fakesite.grid5000.fr' -s Absent -p host='clustera-6.fakesite.grid5000.fr' -p cpu=12 -p core=93 -p cpuset=9 -p gpu=24 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting -a -h 'clustera-6.fakesite.grid5000.fr' -s Absent -p host='clustera-6.fakesite.grid5000.fr' -p cpu=12 -p core=94 -p cpuset=11 -p gpu=24 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting -a -h 'clustera-6.fakesite.grid5000.fr' -s Absent -p host='clustera-6.fakesite.grid5000.fr' -p cpu=12 -p core=95 -p cpuset=13 -p gpu=24 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting -a -h 'clustera-6.fakesite.grid5000.fr' -s Absent -p host='clustera-6.fakesite.grid5000.fr' -p cpu=12 -p core=96 -p cpuset=15 -p gpu=24 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting -a -h 'clustera-6.fakesite.grid5000.fr' -s Absent -p host='clustera-6.fakesite.grid5000.fr' -p cpu=11 -p core=81 -p cpuset=0 -p gpu=21 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting -a -h 'clustera-6.fakesite.grid5000.fr' -s Absent -p host='clustera-6.fakesite.grid5000.fr' -p cpu=11 -p core=82 -p cpuset=2 -p gpu=21 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting -a -h 'clustera-6.fakesite.grid5000.fr' -s Absent -p host='clustera-6.fakesite.grid5000.fr' -p cpu=11 -p core=83 -p cpuset=4 -p gpu=21 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting -a -h 'clustera-6.fakesite.grid5000.fr' -s Absent -p host='clustera-6.fakesite.grid5000.fr' -p cpu=11 -p core=84 -p cpuset=6 -p gpu=21 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting -a -h 'clustera-6.fakesite.grid5000.fr' -s Absent -p host='clustera-6.fakesite.grid5000.fr' -p cpu=11 -p core=85 -p cpuset=8 -p gpu=22 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting -a -h 'clustera-6.fakesite.grid5000.fr' -s Absent -p host='clustera-6.fakesite.grid5000.fr' -p cpu=11 -p core=86 -p cpuset=10 -p gpu=22 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting -a -h 'clustera-6.fakesite.grid5000.fr' -s Absent -p host='clustera-6.fakesite.grid5000.fr' -p cpu=11 -p core=87 -p cpuset=12 -p gpu=22 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting -a -h 'clustera-6.fakesite.grid5000.fr' -s Absent -p host='clustera-6.fakesite.grid5000.fr' -p cpu=11 -p core=88 -p cpuset=14 -p gpu=22 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting -a -h 'clustera-6.fakesite.grid5000.fr' -s Absent -p host='clustera-6.fakesite.grid5000.fr' -p cpu=12 -p core=89 -p cpuset=1 -p gpu=23 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting -a -h 'clustera-6.fakesite.grid5000.fr' -s Absent -p host='clustera-6.fakesite.grid5000.fr' -p cpu=12 -p core=90 -p cpuset=3 -p gpu=23 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting -a -h 'clustera-6.fakesite.grid5000.fr' -s Absent -p host='clustera-6.fakesite.grid5000.fr' -p cpu=12 -p core=91 -p cpuset=5 -p gpu=23 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting -a -h 'clustera-6.fakesite.grid5000.fr' -s Absent -p host='clustera-6.fakesite.grid5000.fr' -p cpu=12 -p core=92 -p cpuset=7 -p gpu=23 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting -a -h 'clustera-6.fakesite.grid5000.fr' -s Absent -p host='clustera-6.fakesite.grid5000.fr' -p cpu=12 -p core=93 -p cpuset=9 -p gpu=24 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting -a -h 'clustera-6.fakesite.grid5000.fr' -s Absent -p host='clustera-6.fakesite.grid5000.fr' -p cpu=12 -p core=94 -p cpuset=11 -p gpu=24 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting -a -h 'clustera-6.fakesite.grid5000.fr' -s Absent -p host='clustera-6.fakesite.grid5000.fr' -p cpu=12 -p core=95 -p cpuset=13 -p gpu=24 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting -a -h 'clustera-6.fakesite.grid5000.fr' -s Absent -p host='clustera-6.fakesite.grid5000.fr' -p cpu=12 -p core=96 -p cpuset=15 -p gpu=24 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 echo; echo 'Setting properties for clustera-6.fakesite.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-6.fakesite.grid5000.fr' and type='default'" -p ip='172.16.64.6' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/HDD' -p chassis='Dell Inc. PowerEdge T640 8K1CBX2' -p eth_count=1 -p eth_kavlan_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='GeForce RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='NO' -p cluster_priority=201906 -p max_walltime=172800 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
+oarnodesetting --sql "host='clustera-6.fakesite.grid5000.fr' and type='default'" -p ip='172.16.64.6' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/HDD' -p chassis='Dell Inc. PowerEdge T640 8K1CBX2' -p eth_count=1 -p eth_kavlan_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='NO' -p cluster_priority=201906 -p max_walltime=172800 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
 
 echo '================================================================================'
 
@@ -243,24 +243,24 @@ echo '==========================================================================
 ###################################
 # clustera-7.fakesite.grid5000.fr
 ###################################
-oarnodesetting -a -h 'clustera-7.fakesite.grid5000.fr' -s Absent -p host='clustera-7.fakesite.grid5000.fr' -p cpu=13 -p core=97 -p cpuset=0 -p gpu=25 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting -a -h 'clustera-7.fakesite.grid5000.fr' -s Absent -p host='clustera-7.fakesite.grid5000.fr' -p cpu=13 -p core=98 -p cpuset=2 -p gpu=25 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting -a -h 'clustera-7.fakesite.grid5000.fr' -s Absent -p host='clustera-7.fakesite.grid5000.fr' -p cpu=13 -p core=99 -p cpuset=4 -p gpu=25 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting -a -h 'clustera-7.fakesite.grid5000.fr' -s Absent -p host='clustera-7.fakesite.grid5000.fr' -p cpu=13 -p core=100 -p cpuset=6 -p gpu=25 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting -a -h 'clustera-7.fakesite.grid5000.fr' -s Absent -p host='clustera-7.fakesite.grid5000.fr' -p cpu=13 -p core=101 -p cpuset=8 -p gpu=26 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting -a -h 'clustera-7.fakesite.grid5000.fr' -s Absent -p host='clustera-7.fakesite.grid5000.fr' -p cpu=13 -p core=102 -p cpuset=10 -p gpu=26 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting -a -h 'clustera-7.fakesite.grid5000.fr' -s Absent -p host='clustera-7.fakesite.grid5000.fr' -p cpu=13 -p core=103 -p cpuset=12 -p gpu=26 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting -a -h 'clustera-7.fakesite.grid5000.fr' -s Absent -p host='clustera-7.fakesite.grid5000.fr' -p cpu=13 -p core=104 -p cpuset=14 -p gpu=26 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting -a -h 'clustera-7.fakesite.grid5000.fr' -s Absent -p host='clustera-7.fakesite.grid5000.fr' -p cpu=14 -p core=105 -p cpuset=1 -p gpu=27 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting -a -h 'clustera-7.fakesite.grid5000.fr' -s Absent -p host='clustera-7.fakesite.grid5000.fr' -p cpu=14 -p core=106 -p cpuset=3 -p gpu=27 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting -a -h 'clustera-7.fakesite.grid5000.fr' -s Absent -p host='clustera-7.fakesite.grid5000.fr' -p cpu=14 -p core=107 -p cpuset=5 -p gpu=27 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting -a -h 'clustera-7.fakesite.grid5000.fr' -s Absent -p host='clustera-7.fakesite.grid5000.fr' -p cpu=14 -p core=108 -p cpuset=7 -p gpu=27 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting -a -h 'clustera-7.fakesite.grid5000.fr' -s Absent -p host='clustera-7.fakesite.grid5000.fr' -p cpu=14 -p core=109 -p cpuset=9 -p gpu=28 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting -a -h 'clustera-7.fakesite.grid5000.fr' -s Absent -p host='clustera-7.fakesite.grid5000.fr' -p cpu=14 -p core=110 -p cpuset=11 -p gpu=28 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting -a -h 'clustera-7.fakesite.grid5000.fr' -s Absent -p host='clustera-7.fakesite.grid5000.fr' -p cpu=14 -p core=111 -p cpuset=13 -p gpu=28 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting -a -h 'clustera-7.fakesite.grid5000.fr' -s Absent -p host='clustera-7.fakesite.grid5000.fr' -p cpu=14 -p core=112 -p cpuset=15 -p gpu=28 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting -a -h 'clustera-7.fakesite.grid5000.fr' -s Absent -p host='clustera-7.fakesite.grid5000.fr' -p cpu=13 -p core=97 -p cpuset=0 -p gpu=25 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting -a -h 'clustera-7.fakesite.grid5000.fr' -s Absent -p host='clustera-7.fakesite.grid5000.fr' -p cpu=13 -p core=98 -p cpuset=2 -p gpu=25 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting -a -h 'clustera-7.fakesite.grid5000.fr' -s Absent -p host='clustera-7.fakesite.grid5000.fr' -p cpu=13 -p core=99 -p cpuset=4 -p gpu=25 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting -a -h 'clustera-7.fakesite.grid5000.fr' -s Absent -p host='clustera-7.fakesite.grid5000.fr' -p cpu=13 -p core=100 -p cpuset=6 -p gpu=25 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting -a -h 'clustera-7.fakesite.grid5000.fr' -s Absent -p host='clustera-7.fakesite.grid5000.fr' -p cpu=13 -p core=101 -p cpuset=8 -p gpu=26 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting -a -h 'clustera-7.fakesite.grid5000.fr' -s Absent -p host='clustera-7.fakesite.grid5000.fr' -p cpu=13 -p core=102 -p cpuset=10 -p gpu=26 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting -a -h 'clustera-7.fakesite.grid5000.fr' -s Absent -p host='clustera-7.fakesite.grid5000.fr' -p cpu=13 -p core=103 -p cpuset=12 -p gpu=26 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting -a -h 'clustera-7.fakesite.grid5000.fr' -s Absent -p host='clustera-7.fakesite.grid5000.fr' -p cpu=13 -p core=104 -p cpuset=14 -p gpu=26 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting -a -h 'clustera-7.fakesite.grid5000.fr' -s Absent -p host='clustera-7.fakesite.grid5000.fr' -p cpu=14 -p core=105 -p cpuset=1 -p gpu=27 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting -a -h 'clustera-7.fakesite.grid5000.fr' -s Absent -p host='clustera-7.fakesite.grid5000.fr' -p cpu=14 -p core=106 -p cpuset=3 -p gpu=27 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting -a -h 'clustera-7.fakesite.grid5000.fr' -s Absent -p host='clustera-7.fakesite.grid5000.fr' -p cpu=14 -p core=107 -p cpuset=5 -p gpu=27 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting -a -h 'clustera-7.fakesite.grid5000.fr' -s Absent -p host='clustera-7.fakesite.grid5000.fr' -p cpu=14 -p core=108 -p cpuset=7 -p gpu=27 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting -a -h 'clustera-7.fakesite.grid5000.fr' -s Absent -p host='clustera-7.fakesite.grid5000.fr' -p cpu=14 -p core=109 -p cpuset=9 -p gpu=28 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting -a -h 'clustera-7.fakesite.grid5000.fr' -s Absent -p host='clustera-7.fakesite.grid5000.fr' -p cpu=14 -p core=110 -p cpuset=11 -p gpu=28 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting -a -h 'clustera-7.fakesite.grid5000.fr' -s Absent -p host='clustera-7.fakesite.grid5000.fr' -p cpu=14 -p core=111 -p cpuset=13 -p gpu=28 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting -a -h 'clustera-7.fakesite.grid5000.fr' -s Absent -p host='clustera-7.fakesite.grid5000.fr' -p cpu=14 -p core=112 -p cpuset=15 -p gpu=28 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 echo; echo 'Setting properties for clustera-7.fakesite.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-7.fakesite.grid5000.fr' and type='default'" -p ip='172.16.64.7' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/HDD' -p chassis='Dell Inc. PowerEdge T640 BK1CBX2' -p eth_count=1 -p eth_kavlan_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='GeForce RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='NO' -p cluster_priority=201906 -p max_walltime=604800 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
+oarnodesetting --sql "host='clustera-7.fakesite.grid5000.fr' and type='default'" -p ip='172.16.64.7' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/HDD' -p chassis='Dell Inc. PowerEdge T640 BK1CBX2' -p eth_count=1 -p eth_kavlan_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='NO' -p cluster_priority=201906 -p max_walltime=604800 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
 
 echo '================================================================================'
 
@@ -268,24 +268,24 @@ echo '==========================================================================
 ###################################
 # clustera-8.fakesite.grid5000.fr
 ###################################
-oarnodesetting -a -h 'clustera-8.fakesite.grid5000.fr' -s Absent -p host='clustera-8.fakesite.grid5000.fr' -p cpu=15 -p core=113 -p cpuset=0 -p gpu=29 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting -a -h 'clustera-8.fakesite.grid5000.fr' -s Absent -p host='clustera-8.fakesite.grid5000.fr' -p cpu=15 -p core=114 -p cpuset=2 -p gpu=29 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting -a -h 'clustera-8.fakesite.grid5000.fr' -s Absent -p host='clustera-8.fakesite.grid5000.fr' -p cpu=15 -p core=115 -p cpuset=4 -p gpu=29 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting -a -h 'clustera-8.fakesite.grid5000.fr' -s Absent -p host='clustera-8.fakesite.grid5000.fr' -p cpu=15 -p core=116 -p cpuset=6 -p gpu=29 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting -a -h 'clustera-8.fakesite.grid5000.fr' -s Absent -p host='clustera-8.fakesite.grid5000.fr' -p cpu=15 -p core=117 -p cpuset=8 -p gpu=30 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting -a -h 'clustera-8.fakesite.grid5000.fr' -s Absent -p host='clustera-8.fakesite.grid5000.fr' -p cpu=15 -p core=118 -p cpuset=10 -p gpu=30 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting -a -h 'clustera-8.fakesite.grid5000.fr' -s Absent -p host='clustera-8.fakesite.grid5000.fr' -p cpu=15 -p core=119 -p cpuset=12 -p gpu=30 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting -a -h 'clustera-8.fakesite.grid5000.fr' -s Absent -p host='clustera-8.fakesite.grid5000.fr' -p cpu=15 -p core=120 -p cpuset=14 -p gpu=30 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting -a -h 'clustera-8.fakesite.grid5000.fr' -s Absent -p host='clustera-8.fakesite.grid5000.fr' -p cpu=16 -p core=121 -p cpuset=1 -p gpu=31 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting -a -h 'clustera-8.fakesite.grid5000.fr' -s Absent -p host='clustera-8.fakesite.grid5000.fr' -p cpu=16 -p core=122 -p cpuset=3 -p gpu=31 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting -a -h 'clustera-8.fakesite.grid5000.fr' -s Absent -p host='clustera-8.fakesite.grid5000.fr' -p cpu=16 -p core=123 -p cpuset=5 -p gpu=31 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting -a -h 'clustera-8.fakesite.grid5000.fr' -s Absent -p host='clustera-8.fakesite.grid5000.fr' -p cpu=16 -p core=124 -p cpuset=7 -p gpu=31 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting -a -h 'clustera-8.fakesite.grid5000.fr' -s Absent -p host='clustera-8.fakesite.grid5000.fr' -p cpu=16 -p core=125 -p cpuset=9 -p gpu=32 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting -a -h 'clustera-8.fakesite.grid5000.fr' -s Absent -p host='clustera-8.fakesite.grid5000.fr' -p cpu=16 -p core=126 -p cpuset=11 -p gpu=32 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting -a -h 'clustera-8.fakesite.grid5000.fr' -s Absent -p host='clustera-8.fakesite.grid5000.fr' -p cpu=16 -p core=127 -p cpuset=13 -p gpu=32 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting -a -h 'clustera-8.fakesite.grid5000.fr' -s Absent -p host='clustera-8.fakesite.grid5000.fr' -p cpu=16 -p core=128 -p cpuset=15 -p gpu=32 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting -a -h 'clustera-8.fakesite.grid5000.fr' -s Absent -p host='clustera-8.fakesite.grid5000.fr' -p cpu=15 -p core=113 -p cpuset=0 -p gpu=29 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting -a -h 'clustera-8.fakesite.grid5000.fr' -s Absent -p host='clustera-8.fakesite.grid5000.fr' -p cpu=15 -p core=114 -p cpuset=2 -p gpu=29 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting -a -h 'clustera-8.fakesite.grid5000.fr' -s Absent -p host='clustera-8.fakesite.grid5000.fr' -p cpu=15 -p core=115 -p cpuset=4 -p gpu=29 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting -a -h 'clustera-8.fakesite.grid5000.fr' -s Absent -p host='clustera-8.fakesite.grid5000.fr' -p cpu=15 -p core=116 -p cpuset=6 -p gpu=29 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting -a -h 'clustera-8.fakesite.grid5000.fr' -s Absent -p host='clustera-8.fakesite.grid5000.fr' -p cpu=15 -p core=117 -p cpuset=8 -p gpu=30 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting -a -h 'clustera-8.fakesite.grid5000.fr' -s Absent -p host='clustera-8.fakesite.grid5000.fr' -p cpu=15 -p core=118 -p cpuset=10 -p gpu=30 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting -a -h 'clustera-8.fakesite.grid5000.fr' -s Absent -p host='clustera-8.fakesite.grid5000.fr' -p cpu=15 -p core=119 -p cpuset=12 -p gpu=30 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting -a -h 'clustera-8.fakesite.grid5000.fr' -s Absent -p host='clustera-8.fakesite.grid5000.fr' -p cpu=15 -p core=120 -p cpuset=14 -p gpu=30 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting -a -h 'clustera-8.fakesite.grid5000.fr' -s Absent -p host='clustera-8.fakesite.grid5000.fr' -p cpu=16 -p core=121 -p cpuset=1 -p gpu=31 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting -a -h 'clustera-8.fakesite.grid5000.fr' -s Absent -p host='clustera-8.fakesite.grid5000.fr' -p cpu=16 -p core=122 -p cpuset=3 -p gpu=31 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting -a -h 'clustera-8.fakesite.grid5000.fr' -s Absent -p host='clustera-8.fakesite.grid5000.fr' -p cpu=16 -p core=123 -p cpuset=5 -p gpu=31 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting -a -h 'clustera-8.fakesite.grid5000.fr' -s Absent -p host='clustera-8.fakesite.grid5000.fr' -p cpu=16 -p core=124 -p cpuset=7 -p gpu=31 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting -a -h 'clustera-8.fakesite.grid5000.fr' -s Absent -p host='clustera-8.fakesite.grid5000.fr' -p cpu=16 -p core=125 -p cpuset=9 -p gpu=32 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting -a -h 'clustera-8.fakesite.grid5000.fr' -s Absent -p host='clustera-8.fakesite.grid5000.fr' -p cpu=16 -p core=126 -p cpuset=11 -p gpu=32 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting -a -h 'clustera-8.fakesite.grid5000.fr' -s Absent -p host='clustera-8.fakesite.grid5000.fr' -p cpu=16 -p core=127 -p cpuset=13 -p gpu=32 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting -a -h 'clustera-8.fakesite.grid5000.fr' -s Absent -p host='clustera-8.fakesite.grid5000.fr' -p cpu=16 -p core=128 -p cpuset=15 -p gpu=32 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 echo; echo 'Setting properties for clustera-8.fakesite.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-8.fakesite.grid5000.fr' and type='default'" -p ip='172.16.64.8' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/HDD' -p chassis='Dell Inc. PowerEdge T640 CK1CBX2' -p eth_count=1 -p eth_kavlan_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='GeForce RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='NO' -p cluster_priority=201906 -p max_walltime=604800 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
+oarnodesetting --sql "host='clustera-8.fakesite.grid5000.fr' and type='default'" -p ip='172.16.64.8' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/HDD' -p chassis='Dell Inc. PowerEdge T640 CK1CBX2' -p eth_count=1 -p eth_kavlan_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='NO' -p cluster_priority=201906 -p max_walltime=604800 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
 
 echo '================================================================================'
 
@@ -293,24 +293,24 @@ echo '==========================================================================
 ###################################
 # clustera-9.fakesite.grid5000.fr
 ###################################
-oarnodesetting -a -h 'clustera-9.fakesite.grid5000.fr' -s Absent -p host='clustera-9.fakesite.grid5000.fr' -p cpu=17 -p core=129 -p cpuset=0 -p gpu=33 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting -a -h 'clustera-9.fakesite.grid5000.fr' -s Absent -p host='clustera-9.fakesite.grid5000.fr' -p cpu=17 -p core=130 -p cpuset=2 -p gpu=33 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting -a -h 'clustera-9.fakesite.grid5000.fr' -s Absent -p host='clustera-9.fakesite.grid5000.fr' -p cpu=17 -p core=131 -p cpuset=4 -p gpu=33 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting -a -h 'clustera-9.fakesite.grid5000.fr' -s Absent -p host='clustera-9.fakesite.grid5000.fr' -p cpu=17 -p core=132 -p cpuset=6 -p gpu=33 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting -a -h 'clustera-9.fakesite.grid5000.fr' -s Absent -p host='clustera-9.fakesite.grid5000.fr' -p cpu=17 -p core=133 -p cpuset=8 -p gpu=34 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting -a -h 'clustera-9.fakesite.grid5000.fr' -s Absent -p host='clustera-9.fakesite.grid5000.fr' -p cpu=17 -p core=134 -p cpuset=10 -p gpu=34 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting -a -h 'clustera-9.fakesite.grid5000.fr' -s Absent -p host='clustera-9.fakesite.grid5000.fr' -p cpu=17 -p core=135 -p cpuset=12 -p gpu=34 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting -a -h 'clustera-9.fakesite.grid5000.fr' -s Absent -p host='clustera-9.fakesite.grid5000.fr' -p cpu=17 -p core=136 -p cpuset=14 -p gpu=34 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting -a -h 'clustera-9.fakesite.grid5000.fr' -s Absent -p host='clustera-9.fakesite.grid5000.fr' -p cpu=18 -p core=137 -p cpuset=1 -p gpu=35 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting -a -h 'clustera-9.fakesite.grid5000.fr' -s Absent -p host='clustera-9.fakesite.grid5000.fr' -p cpu=18 -p core=138 -p cpuset=3 -p gpu=35 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting -a -h 'clustera-9.fakesite.grid5000.fr' -s Absent -p host='clustera-9.fakesite.grid5000.fr' -p cpu=18 -p core=139 -p cpuset=5 -p gpu=35 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting -a -h 'clustera-9.fakesite.grid5000.fr' -s Absent -p host='clustera-9.fakesite.grid5000.fr' -p cpu=18 -p core=140 -p cpuset=7 -p gpu=35 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting -a -h 'clustera-9.fakesite.grid5000.fr' -s Absent -p host='clustera-9.fakesite.grid5000.fr' -p cpu=18 -p core=141 -p cpuset=9 -p gpu=36 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting -a -h 'clustera-9.fakesite.grid5000.fr' -s Absent -p host='clustera-9.fakesite.grid5000.fr' -p cpu=18 -p core=142 -p cpuset=11 -p gpu=36 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting -a -h 'clustera-9.fakesite.grid5000.fr' -s Absent -p host='clustera-9.fakesite.grid5000.fr' -p cpu=18 -p core=143 -p cpuset=13 -p gpu=36 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting -a -h 'clustera-9.fakesite.grid5000.fr' -s Absent -p host='clustera-9.fakesite.grid5000.fr' -p cpu=18 -p core=144 -p cpuset=15 -p gpu=36 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting -a -h 'clustera-9.fakesite.grid5000.fr' -s Absent -p host='clustera-9.fakesite.grid5000.fr' -p cpu=17 -p core=129 -p cpuset=0 -p gpu=33 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting -a -h 'clustera-9.fakesite.grid5000.fr' -s Absent -p host='clustera-9.fakesite.grid5000.fr' -p cpu=17 -p core=130 -p cpuset=2 -p gpu=33 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting -a -h 'clustera-9.fakesite.grid5000.fr' -s Absent -p host='clustera-9.fakesite.grid5000.fr' -p cpu=17 -p core=131 -p cpuset=4 -p gpu=33 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting -a -h 'clustera-9.fakesite.grid5000.fr' -s Absent -p host='clustera-9.fakesite.grid5000.fr' -p cpu=17 -p core=132 -p cpuset=6 -p gpu=33 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting -a -h 'clustera-9.fakesite.grid5000.fr' -s Absent -p host='clustera-9.fakesite.grid5000.fr' -p cpu=17 -p core=133 -p cpuset=8 -p gpu=34 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting -a -h 'clustera-9.fakesite.grid5000.fr' -s Absent -p host='clustera-9.fakesite.grid5000.fr' -p cpu=17 -p core=134 -p cpuset=10 -p gpu=34 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting -a -h 'clustera-9.fakesite.grid5000.fr' -s Absent -p host='clustera-9.fakesite.grid5000.fr' -p cpu=17 -p core=135 -p cpuset=12 -p gpu=34 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting -a -h 'clustera-9.fakesite.grid5000.fr' -s Absent -p host='clustera-9.fakesite.grid5000.fr' -p cpu=17 -p core=136 -p cpuset=14 -p gpu=34 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting -a -h 'clustera-9.fakesite.grid5000.fr' -s Absent -p host='clustera-9.fakesite.grid5000.fr' -p cpu=18 -p core=137 -p cpuset=1 -p gpu=35 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting -a -h 'clustera-9.fakesite.grid5000.fr' -s Absent -p host='clustera-9.fakesite.grid5000.fr' -p cpu=18 -p core=138 -p cpuset=3 -p gpu=35 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting -a -h 'clustera-9.fakesite.grid5000.fr' -s Absent -p host='clustera-9.fakesite.grid5000.fr' -p cpu=18 -p core=139 -p cpuset=5 -p gpu=35 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting -a -h 'clustera-9.fakesite.grid5000.fr' -s Absent -p host='clustera-9.fakesite.grid5000.fr' -p cpu=18 -p core=140 -p cpuset=7 -p gpu=35 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting -a -h 'clustera-9.fakesite.grid5000.fr' -s Absent -p host='clustera-9.fakesite.grid5000.fr' -p cpu=18 -p core=141 -p cpuset=9 -p gpu=36 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting -a -h 'clustera-9.fakesite.grid5000.fr' -s Absent -p host='clustera-9.fakesite.grid5000.fr' -p cpu=18 -p core=142 -p cpuset=11 -p gpu=36 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting -a -h 'clustera-9.fakesite.grid5000.fr' -s Absent -p host='clustera-9.fakesite.grid5000.fr' -p cpu=18 -p core=143 -p cpuset=13 -p gpu=36 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting -a -h 'clustera-9.fakesite.grid5000.fr' -s Absent -p host='clustera-9.fakesite.grid5000.fr' -p cpu=18 -p core=144 -p cpuset=15 -p gpu=36 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 echo; echo 'Setting properties for clustera-9.fakesite.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-9.fakesite.grid5000.fr' and type='default'" -p ip='172.16.64.9' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/HDD' -p chassis='Dell Inc. PowerEdge T640 9K1CBX2' -p eth_count=1 -p eth_kavlan_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='GeForce RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='NO' -p cluster_priority=201906 -p max_walltime=604800 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
+oarnodesetting --sql "host='clustera-9.fakesite.grid5000.fr' and type='default'" -p ip='172.16.64.9' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/HDD' -p chassis='Dell Inc. PowerEdge T640 9K1CBX2' -p eth_count=1 -p eth_kavlan_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='NO' -p cluster_priority=201906 -p max_walltime=604800 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
 
 echo '================================================================================'
 
@@ -318,24 +318,24 @@ echo '==========================================================================
 ###################################
 # clustera-10.fakesite.grid5000.fr
 ###################################
-oarnodesetting -a -h 'clustera-10.fakesite.grid5000.fr' -s Absent -p host='clustera-10.fakesite.grid5000.fr' -p cpu=19 -p core=145 -p cpuset=0 -p gpu=37 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting -a -h 'clustera-10.fakesite.grid5000.fr' -s Absent -p host='clustera-10.fakesite.grid5000.fr' -p cpu=19 -p core=146 -p cpuset=2 -p gpu=37 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting -a -h 'clustera-10.fakesite.grid5000.fr' -s Absent -p host='clustera-10.fakesite.grid5000.fr' -p cpu=19 -p core=147 -p cpuset=4 -p gpu=37 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting -a -h 'clustera-10.fakesite.grid5000.fr' -s Absent -p host='clustera-10.fakesite.grid5000.fr' -p cpu=19 -p core=148 -p cpuset=6 -p gpu=37 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting -a -h 'clustera-10.fakesite.grid5000.fr' -s Absent -p host='clustera-10.fakesite.grid5000.fr' -p cpu=19 -p core=149 -p cpuset=8 -p gpu=38 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting -a -h 'clustera-10.fakesite.grid5000.fr' -s Absent -p host='clustera-10.fakesite.grid5000.fr' -p cpu=19 -p core=150 -p cpuset=10 -p gpu=38 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting -a -h 'clustera-10.fakesite.grid5000.fr' -s Absent -p host='clustera-10.fakesite.grid5000.fr' -p cpu=19 -p core=151 -p cpuset=12 -p gpu=38 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting -a -h 'clustera-10.fakesite.grid5000.fr' -s Absent -p host='clustera-10.fakesite.grid5000.fr' -p cpu=19 -p core=152 -p cpuset=14 -p gpu=38 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting -a -h 'clustera-10.fakesite.grid5000.fr' -s Absent -p host='clustera-10.fakesite.grid5000.fr' -p cpu=20 -p core=153 -p cpuset=1 -p gpu=39 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting -a -h 'clustera-10.fakesite.grid5000.fr' -s Absent -p host='clustera-10.fakesite.grid5000.fr' -p cpu=20 -p core=154 -p cpuset=3 -p gpu=39 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting -a -h 'clustera-10.fakesite.grid5000.fr' -s Absent -p host='clustera-10.fakesite.grid5000.fr' -p cpu=20 -p core=155 -p cpuset=5 -p gpu=39 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting -a -h 'clustera-10.fakesite.grid5000.fr' -s Absent -p host='clustera-10.fakesite.grid5000.fr' -p cpu=20 -p core=156 -p cpuset=7 -p gpu=39 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting -a -h 'clustera-10.fakesite.grid5000.fr' -s Absent -p host='clustera-10.fakesite.grid5000.fr' -p cpu=20 -p core=157 -p cpuset=9 -p gpu=40 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting -a -h 'clustera-10.fakesite.grid5000.fr' -s Absent -p host='clustera-10.fakesite.grid5000.fr' -p cpu=20 -p core=158 -p cpuset=11 -p gpu=40 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting -a -h 'clustera-10.fakesite.grid5000.fr' -s Absent -p host='clustera-10.fakesite.grid5000.fr' -p cpu=20 -p core=159 -p cpuset=13 -p gpu=40 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting -a -h 'clustera-10.fakesite.grid5000.fr' -s Absent -p host='clustera-10.fakesite.grid5000.fr' -p cpu=20 -p core=160 -p cpuset=15 -p gpu=40 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting -a -h 'clustera-10.fakesite.grid5000.fr' -s Absent -p host='clustera-10.fakesite.grid5000.fr' -p cpu=19 -p core=145 -p cpuset=0 -p gpu=37 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting -a -h 'clustera-10.fakesite.grid5000.fr' -s Absent -p host='clustera-10.fakesite.grid5000.fr' -p cpu=19 -p core=146 -p cpuset=2 -p gpu=37 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting -a -h 'clustera-10.fakesite.grid5000.fr' -s Absent -p host='clustera-10.fakesite.grid5000.fr' -p cpu=19 -p core=147 -p cpuset=4 -p gpu=37 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting -a -h 'clustera-10.fakesite.grid5000.fr' -s Absent -p host='clustera-10.fakesite.grid5000.fr' -p cpu=19 -p core=148 -p cpuset=6 -p gpu=37 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting -a -h 'clustera-10.fakesite.grid5000.fr' -s Absent -p host='clustera-10.fakesite.grid5000.fr' -p cpu=19 -p core=149 -p cpuset=8 -p gpu=38 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting -a -h 'clustera-10.fakesite.grid5000.fr' -s Absent -p host='clustera-10.fakesite.grid5000.fr' -p cpu=19 -p core=150 -p cpuset=10 -p gpu=38 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting -a -h 'clustera-10.fakesite.grid5000.fr' -s Absent -p host='clustera-10.fakesite.grid5000.fr' -p cpu=19 -p core=151 -p cpuset=12 -p gpu=38 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting -a -h 'clustera-10.fakesite.grid5000.fr' -s Absent -p host='clustera-10.fakesite.grid5000.fr' -p cpu=19 -p core=152 -p cpuset=14 -p gpu=38 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting -a -h 'clustera-10.fakesite.grid5000.fr' -s Absent -p host='clustera-10.fakesite.grid5000.fr' -p cpu=20 -p core=153 -p cpuset=1 -p gpu=39 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting -a -h 'clustera-10.fakesite.grid5000.fr' -s Absent -p host='clustera-10.fakesite.grid5000.fr' -p cpu=20 -p core=154 -p cpuset=3 -p gpu=39 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting -a -h 'clustera-10.fakesite.grid5000.fr' -s Absent -p host='clustera-10.fakesite.grid5000.fr' -p cpu=20 -p core=155 -p cpuset=5 -p gpu=39 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting -a -h 'clustera-10.fakesite.grid5000.fr' -s Absent -p host='clustera-10.fakesite.grid5000.fr' -p cpu=20 -p core=156 -p cpuset=7 -p gpu=39 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting -a -h 'clustera-10.fakesite.grid5000.fr' -s Absent -p host='clustera-10.fakesite.grid5000.fr' -p cpu=20 -p core=157 -p cpuset=9 -p gpu=40 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting -a -h 'clustera-10.fakesite.grid5000.fr' -s Absent -p host='clustera-10.fakesite.grid5000.fr' -p cpu=20 -p core=158 -p cpuset=11 -p gpu=40 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting -a -h 'clustera-10.fakesite.grid5000.fr' -s Absent -p host='clustera-10.fakesite.grid5000.fr' -p cpu=20 -p core=159 -p cpuset=13 -p gpu=40 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting -a -h 'clustera-10.fakesite.grid5000.fr' -s Absent -p host='clustera-10.fakesite.grid5000.fr' -p cpu=20 -p core=160 -p cpuset=15 -p gpu=40 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 echo; echo 'Setting properties for clustera-10.fakesite.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-10.fakesite.grid5000.fr' and type='default'" -p ip='172.16.64.10' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/HDD' -p chassis='Dell Inc. PowerEdge T640 GL1CBX2' -p eth_count=1 -p eth_kavlan_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='GeForce RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='NO' -p cluster_priority=201906 -p max_walltime=604800 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
+oarnodesetting --sql "host='clustera-10.fakesite.grid5000.fr' and type='default'" -p ip='172.16.64.10' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/HDD' -p chassis='Dell Inc. PowerEdge T640 GL1CBX2' -p eth_count=1 -p eth_kavlan_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='NO' -p cluster_priority=201906 -p max_walltime=604800 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
 
 echo '================================================================================'
 
@@ -343,24 +343,24 @@ echo '==========================================================================
 ###################################
 # clustera-11.fakesite.grid5000.fr
 ###################################
-oarnodesetting -a -h 'clustera-11.fakesite.grid5000.fr' -s Absent -p host='clustera-11.fakesite.grid5000.fr' -p cpu=21 -p core=161 -p cpuset=0 -p gpu=41 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting -a -h 'clustera-11.fakesite.grid5000.fr' -s Absent -p host='clustera-11.fakesite.grid5000.fr' -p cpu=21 -p core=162 -p cpuset=2 -p gpu=41 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting -a -h 'clustera-11.fakesite.grid5000.fr' -s Absent -p host='clustera-11.fakesite.grid5000.fr' -p cpu=21 -p core=163 -p cpuset=4 -p gpu=41 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting -a -h 'clustera-11.fakesite.grid5000.fr' -s Absent -p host='clustera-11.fakesite.grid5000.fr' -p cpu=21 -p core=164 -p cpuset=6 -p gpu=41 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting -a -h 'clustera-11.fakesite.grid5000.fr' -s Absent -p host='clustera-11.fakesite.grid5000.fr' -p cpu=21 -p core=165 -p cpuset=8 -p gpu=42 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting -a -h 'clustera-11.fakesite.grid5000.fr' -s Absent -p host='clustera-11.fakesite.grid5000.fr' -p cpu=21 -p core=166 -p cpuset=10 -p gpu=42 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting -a -h 'clustera-11.fakesite.grid5000.fr' -s Absent -p host='clustera-11.fakesite.grid5000.fr' -p cpu=21 -p core=167 -p cpuset=12 -p gpu=42 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting -a -h 'clustera-11.fakesite.grid5000.fr' -s Absent -p host='clustera-11.fakesite.grid5000.fr' -p cpu=21 -p core=168 -p cpuset=14 -p gpu=42 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting -a -h 'clustera-11.fakesite.grid5000.fr' -s Absent -p host='clustera-11.fakesite.grid5000.fr' -p cpu=22 -p core=169 -p cpuset=1 -p gpu=43 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting -a -h 'clustera-11.fakesite.grid5000.fr' -s Absent -p host='clustera-11.fakesite.grid5000.fr' -p cpu=22 -p core=170 -p cpuset=3 -p gpu=43 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting -a -h 'clustera-11.fakesite.grid5000.fr' -s Absent -p host='clustera-11.fakesite.grid5000.fr' -p cpu=22 -p core=171 -p cpuset=5 -p gpu=43 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting -a -h 'clustera-11.fakesite.grid5000.fr' -s Absent -p host='clustera-11.fakesite.grid5000.fr' -p cpu=22 -p core=172 -p cpuset=7 -p gpu=43 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting -a -h 'clustera-11.fakesite.grid5000.fr' -s Absent -p host='clustera-11.fakesite.grid5000.fr' -p cpu=22 -p core=173 -p cpuset=9 -p gpu=44 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting -a -h 'clustera-11.fakesite.grid5000.fr' -s Absent -p host='clustera-11.fakesite.grid5000.fr' -p cpu=22 -p core=174 -p cpuset=11 -p gpu=44 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting -a -h 'clustera-11.fakesite.grid5000.fr' -s Absent -p host='clustera-11.fakesite.grid5000.fr' -p cpu=22 -p core=175 -p cpuset=13 -p gpu=44 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting -a -h 'clustera-11.fakesite.grid5000.fr' -s Absent -p host='clustera-11.fakesite.grid5000.fr' -p cpu=22 -p core=176 -p cpuset=15 -p gpu=44 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting -a -h 'clustera-11.fakesite.grid5000.fr' -s Absent -p host='clustera-11.fakesite.grid5000.fr' -p cpu=21 -p core=161 -p cpuset=0 -p gpu=41 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting -a -h 'clustera-11.fakesite.grid5000.fr' -s Absent -p host='clustera-11.fakesite.grid5000.fr' -p cpu=21 -p core=162 -p cpuset=2 -p gpu=41 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting -a -h 'clustera-11.fakesite.grid5000.fr' -s Absent -p host='clustera-11.fakesite.grid5000.fr' -p cpu=21 -p core=163 -p cpuset=4 -p gpu=41 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting -a -h 'clustera-11.fakesite.grid5000.fr' -s Absent -p host='clustera-11.fakesite.grid5000.fr' -p cpu=21 -p core=164 -p cpuset=6 -p gpu=41 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting -a -h 'clustera-11.fakesite.grid5000.fr' -s Absent -p host='clustera-11.fakesite.grid5000.fr' -p cpu=21 -p core=165 -p cpuset=8 -p gpu=42 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting -a -h 'clustera-11.fakesite.grid5000.fr' -s Absent -p host='clustera-11.fakesite.grid5000.fr' -p cpu=21 -p core=166 -p cpuset=10 -p gpu=42 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting -a -h 'clustera-11.fakesite.grid5000.fr' -s Absent -p host='clustera-11.fakesite.grid5000.fr' -p cpu=21 -p core=167 -p cpuset=12 -p gpu=42 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting -a -h 'clustera-11.fakesite.grid5000.fr' -s Absent -p host='clustera-11.fakesite.grid5000.fr' -p cpu=21 -p core=168 -p cpuset=14 -p gpu=42 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting -a -h 'clustera-11.fakesite.grid5000.fr' -s Absent -p host='clustera-11.fakesite.grid5000.fr' -p cpu=22 -p core=169 -p cpuset=1 -p gpu=43 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting -a -h 'clustera-11.fakesite.grid5000.fr' -s Absent -p host='clustera-11.fakesite.grid5000.fr' -p cpu=22 -p core=170 -p cpuset=3 -p gpu=43 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting -a -h 'clustera-11.fakesite.grid5000.fr' -s Absent -p host='clustera-11.fakesite.grid5000.fr' -p cpu=22 -p core=171 -p cpuset=5 -p gpu=43 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting -a -h 'clustera-11.fakesite.grid5000.fr' -s Absent -p host='clustera-11.fakesite.grid5000.fr' -p cpu=22 -p core=172 -p cpuset=7 -p gpu=43 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting -a -h 'clustera-11.fakesite.grid5000.fr' -s Absent -p host='clustera-11.fakesite.grid5000.fr' -p cpu=22 -p core=173 -p cpuset=9 -p gpu=44 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting -a -h 'clustera-11.fakesite.grid5000.fr' -s Absent -p host='clustera-11.fakesite.grid5000.fr' -p cpu=22 -p core=174 -p cpuset=11 -p gpu=44 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting -a -h 'clustera-11.fakesite.grid5000.fr' -s Absent -p host='clustera-11.fakesite.grid5000.fr' -p cpu=22 -p core=175 -p cpuset=13 -p gpu=44 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting -a -h 'clustera-11.fakesite.grid5000.fr' -s Absent -p host='clustera-11.fakesite.grid5000.fr' -p cpu=22 -p core=176 -p cpuset=15 -p gpu=44 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 echo; echo 'Setting properties for clustera-11.fakesite.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-11.fakesite.grid5000.fr' and type='default'" -p ip='172.16.64.11' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/HDD' -p chassis='Dell Inc. PowerEdge T640 JL1CBX2' -p eth_count=1 -p eth_kavlan_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='GeForce RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='NO' -p cluster_priority=201906 -p max_walltime=604800 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
+oarnodesetting --sql "host='clustera-11.fakesite.grid5000.fr' and type='default'" -p ip='172.16.64.11' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/HDD' -p chassis='Dell Inc. PowerEdge T640 JL1CBX2' -p eth_count=1 -p eth_kavlan_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='NO' -p cluster_priority=201906 -p max_walltime=604800 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
 
 echo '================================================================================'
 
@@ -368,24 +368,24 @@ echo '==========================================================================
 ###################################
 # clustera-12.fakesite.grid5000.fr
 ###################################
-oarnodesetting -a -h 'clustera-12.fakesite.grid5000.fr' -s Absent -p host='clustera-12.fakesite.grid5000.fr' -p cpu=23 -p core=177 -p cpuset=0 -p gpu=45 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting -a -h 'clustera-12.fakesite.grid5000.fr' -s Absent -p host='clustera-12.fakesite.grid5000.fr' -p cpu=23 -p core=178 -p cpuset=2 -p gpu=45 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting -a -h 'clustera-12.fakesite.grid5000.fr' -s Absent -p host='clustera-12.fakesite.grid5000.fr' -p cpu=23 -p core=179 -p cpuset=4 -p gpu=45 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting -a -h 'clustera-12.fakesite.grid5000.fr' -s Absent -p host='clustera-12.fakesite.grid5000.fr' -p cpu=23 -p core=180 -p cpuset=6 -p gpu=45 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting -a -h 'clustera-12.fakesite.grid5000.fr' -s Absent -p host='clustera-12.fakesite.grid5000.fr' -p cpu=23 -p core=181 -p cpuset=8 -p gpu=46 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting -a -h 'clustera-12.fakesite.grid5000.fr' -s Absent -p host='clustera-12.fakesite.grid5000.fr' -p cpu=23 -p core=182 -p cpuset=10 -p gpu=46 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting -a -h 'clustera-12.fakesite.grid5000.fr' -s Absent -p host='clustera-12.fakesite.grid5000.fr' -p cpu=23 -p core=183 -p cpuset=12 -p gpu=46 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting -a -h 'clustera-12.fakesite.grid5000.fr' -s Absent -p host='clustera-12.fakesite.grid5000.fr' -p cpu=23 -p core=184 -p cpuset=14 -p gpu=46 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting -a -h 'clustera-12.fakesite.grid5000.fr' -s Absent -p host='clustera-12.fakesite.grid5000.fr' -p cpu=24 -p core=185 -p cpuset=1 -p gpu=47 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting -a -h 'clustera-12.fakesite.grid5000.fr' -s Absent -p host='clustera-12.fakesite.grid5000.fr' -p cpu=24 -p core=186 -p cpuset=3 -p gpu=47 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting -a -h 'clustera-12.fakesite.grid5000.fr' -s Absent -p host='clustera-12.fakesite.grid5000.fr' -p cpu=24 -p core=187 -p cpuset=5 -p gpu=47 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting -a -h 'clustera-12.fakesite.grid5000.fr' -s Absent -p host='clustera-12.fakesite.grid5000.fr' -p cpu=24 -p core=188 -p cpuset=7 -p gpu=47 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting -a -h 'clustera-12.fakesite.grid5000.fr' -s Absent -p host='clustera-12.fakesite.grid5000.fr' -p cpu=24 -p core=189 -p cpuset=9 -p gpu=48 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting -a -h 'clustera-12.fakesite.grid5000.fr' -s Absent -p host='clustera-12.fakesite.grid5000.fr' -p cpu=24 -p core=190 -p cpuset=11 -p gpu=48 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting -a -h 'clustera-12.fakesite.grid5000.fr' -s Absent -p host='clustera-12.fakesite.grid5000.fr' -p cpu=24 -p core=191 -p cpuset=13 -p gpu=48 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting -a -h 'clustera-12.fakesite.grid5000.fr' -s Absent -p host='clustera-12.fakesite.grid5000.fr' -p cpu=24 -p core=192 -p cpuset=15 -p gpu=48 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting -a -h 'clustera-12.fakesite.grid5000.fr' -s Absent -p host='clustera-12.fakesite.grid5000.fr' -p cpu=23 -p core=177 -p cpuset=0 -p gpu=45 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting -a -h 'clustera-12.fakesite.grid5000.fr' -s Absent -p host='clustera-12.fakesite.grid5000.fr' -p cpu=23 -p core=178 -p cpuset=2 -p gpu=45 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting -a -h 'clustera-12.fakesite.grid5000.fr' -s Absent -p host='clustera-12.fakesite.grid5000.fr' -p cpu=23 -p core=179 -p cpuset=4 -p gpu=45 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting -a -h 'clustera-12.fakesite.grid5000.fr' -s Absent -p host='clustera-12.fakesite.grid5000.fr' -p cpu=23 -p core=180 -p cpuset=6 -p gpu=45 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting -a -h 'clustera-12.fakesite.grid5000.fr' -s Absent -p host='clustera-12.fakesite.grid5000.fr' -p cpu=23 -p core=181 -p cpuset=8 -p gpu=46 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting -a -h 'clustera-12.fakesite.grid5000.fr' -s Absent -p host='clustera-12.fakesite.grid5000.fr' -p cpu=23 -p core=182 -p cpuset=10 -p gpu=46 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting -a -h 'clustera-12.fakesite.grid5000.fr' -s Absent -p host='clustera-12.fakesite.grid5000.fr' -p cpu=23 -p core=183 -p cpuset=12 -p gpu=46 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting -a -h 'clustera-12.fakesite.grid5000.fr' -s Absent -p host='clustera-12.fakesite.grid5000.fr' -p cpu=23 -p core=184 -p cpuset=14 -p gpu=46 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting -a -h 'clustera-12.fakesite.grid5000.fr' -s Absent -p host='clustera-12.fakesite.grid5000.fr' -p cpu=24 -p core=185 -p cpuset=1 -p gpu=47 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting -a -h 'clustera-12.fakesite.grid5000.fr' -s Absent -p host='clustera-12.fakesite.grid5000.fr' -p cpu=24 -p core=186 -p cpuset=3 -p gpu=47 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting -a -h 'clustera-12.fakesite.grid5000.fr' -s Absent -p host='clustera-12.fakesite.grid5000.fr' -p cpu=24 -p core=187 -p cpuset=5 -p gpu=47 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting -a -h 'clustera-12.fakesite.grid5000.fr' -s Absent -p host='clustera-12.fakesite.grid5000.fr' -p cpu=24 -p core=188 -p cpuset=7 -p gpu=47 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting -a -h 'clustera-12.fakesite.grid5000.fr' -s Absent -p host='clustera-12.fakesite.grid5000.fr' -p cpu=24 -p core=189 -p cpuset=9 -p gpu=48 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting -a -h 'clustera-12.fakesite.grid5000.fr' -s Absent -p host='clustera-12.fakesite.grid5000.fr' -p cpu=24 -p core=190 -p cpuset=11 -p gpu=48 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting -a -h 'clustera-12.fakesite.grid5000.fr' -s Absent -p host='clustera-12.fakesite.grid5000.fr' -p cpu=24 -p core=191 -p cpuset=13 -p gpu=48 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting -a -h 'clustera-12.fakesite.grid5000.fr' -s Absent -p host='clustera-12.fakesite.grid5000.fr' -p cpu=24 -p core=192 -p cpuset=15 -p gpu=48 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 echo; echo 'Setting properties for clustera-12.fakesite.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-12.fakesite.grid5000.fr' and type='default'" -p ip='172.16.64.12' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/HDD' -p chassis='Dell Inc. PowerEdge T640 HL1CBX2' -p eth_count=1 -p eth_kavlan_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='GeForce RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='NO' -p cluster_priority=201906 -p max_walltime=604800 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
+oarnodesetting --sql "host='clustera-12.fakesite.grid5000.fr' and type='default'" -p ip='172.16.64.12' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/HDD' -p chassis='Dell Inc. PowerEdge T640 HL1CBX2' -p eth_count=1 -p eth_kavlan_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='NO' -p cluster_priority=201906 -p max_walltime=604800 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
 
 echo '================================================================================'
 
diff --git a/spec/output/graffiti_empty_table_stdout.txt b/spec/output/graffiti_empty_table_stdout.txt
index 24c3fae3e7a..047dc6e3196 100644
--- a/spec/output/graffiti_empty_table_stdout.txt
+++ b/spec/output/graffiti_empty_table_stdout.txt
@@ -1,198 +1,198 @@
 +---------- + -------------------- + ----- + ----- + -------- + ---- + -------------------- + ------------------------------ + ------------------------------+
 |   cluster | host                 | cpu   | core  | cpuset   | gpu  | gpudevice            | cpumodel                       | gpumodel                      |
 +---------- + -------------------- + ----- + ----- + -------- + ---- + -------------------- + ------------------------------ + ------------------------------+
-|  clustera | clustera-1           | 1     | 1     | 0        | 1    | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 1     | 2     | 2        | 1    | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 1     | 3     | 4        | 1    | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 1     | 4     | 6        | 1    | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 1     | 5     | 8        | 2    | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 1     | 6     | 10       | 2    | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 1     | 7     | 12       | 2    | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 1     | 8     | 14       | 2    | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 2     | 9     | 1        | 3    | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 2     | 10    | 3        | 3    | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 2     | 11    | 5        | 3    | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 2     | 12    | 7        | 3    | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 2     | 13    | 9        | 4    | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 2     | 14    | 11       | 4    | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 2     | 15    | 13       | 4    | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 2     | 16    | 15       | 4    | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 3     | 17    | 0        | 5    | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 3     | 18    | 2        | 5    | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 3     | 19    | 4        | 5    | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 3     | 20    | 6        | 5    | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 3     | 21    | 8        | 6    | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 3     | 22    | 10       | 6    | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 3     | 23    | 12       | 6    | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 3     | 24    | 14       | 6    | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 4     | 25    | 1        | 7    | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 4     | 26    | 3        | 7    | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 4     | 27    | 5        | 7    | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 4     | 28    | 7        | 7    | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 4     | 29    | 9        | 8    | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 4     | 30    | 11       | 8    | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 4     | 31    | 13       | 8    | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 4     | 32    | 15       | 8    | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-3           | 5     | 33    | 0        | 9    | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-3           | 5     | 34    | 2        | 9    | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-3           | 5     | 35    | 4        | 9    | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-3           | 5     | 36    | 6        | 9    | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-3           | 5     | 37    | 8        | 10   | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-3           | 5     | 38    | 10       | 10   | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-3           | 5     | 39    | 12       | 10   | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-3           | 5     | 40    | 14       | 10   | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-3           | 6     | 41    | 1        | 11   | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-3           | 6     | 42    | 3        | 11   | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-3           | 6     | 43    | 5        | 11   | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-3           | 6     | 44    | 7        | 11   | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-3           | 6     | 45    | 9        | 12   | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-3           | 6     | 46    | 11       | 12   | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-3           | 6     | 47    | 13       | 12   | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-3           | 6     | 48    | 15       | 12   | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-4           | 7     | 49    | 0        | 13   | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-4           | 7     | 50    | 2        | 13   | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-4           | 7     | 51    | 4        | 13   | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-4           | 7     | 52    | 6        | 13   | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-4           | 7     | 53    | 8        | 14   | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-4           | 7     | 54    | 10       | 14   | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-4           | 7     | 55    | 12       | 14   | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-4           | 7     | 56    | 14       | 14   | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-4           | 8     | 57    | 1        | 15   | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-4           | 8     | 58    | 3        | 15   | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-4           | 8     | 59    | 5        | 15   | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-4           | 8     | 60    | 7        | 15   | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-4           | 8     | 61    | 9        | 16   | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-4           | 8     | 62    | 11       | 16   | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-4           | 8     | 63    | 13       | 16   | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-4           | 8     | 64    | 15       | 16   | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-5           | 9     | 65    | 0        | 17   | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-5           | 9     | 66    | 2        | 17   | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-5           | 9     | 67    | 4        | 17   | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-5           | 9     | 68    | 6        | 17   | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-5           | 9     | 69    | 8        | 18   | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-5           | 9     | 70    | 10       | 18   | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-5           | 9     | 71    | 12       | 18   | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-5           | 9     | 72    | 14       | 18   | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-5           | 10    | 73    | 1        | 19   | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-5           | 10    | 74    | 3        | 19   | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-5           | 10    | 75    | 5        | 19   | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-5           | 10    | 76    | 7        | 19   | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-5           | 10    | 77    | 9        | 20   | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-5           | 10    | 78    | 11       | 20   | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-5           | 10    | 79    | 13       | 20   | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-5           | 10    | 80    | 15       | 20   | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-6           | 11    | 81    | 0        | 21   | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-6           | 11    | 82    | 2        | 21   | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-6           | 11    | 83    | 4        | 21   | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-6           | 11    | 84    | 6        | 21   | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-6           | 11    | 85    | 8        | 22   | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-6           | 11    | 86    | 10       | 22   | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-6           | 11    | 87    | 12       | 22   | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-6           | 11    | 88    | 14       | 22   | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-6           | 12    | 89    | 1        | 23   | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-6           | 12    | 90    | 3        | 23   | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-6           | 12    | 91    | 5        | 23   | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-6           | 12    | 92    | 7        | 23   | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-6           | 12    | 93    | 9        | 24   | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-6           | 12    | 94    | 11       | 24   | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-6           | 12    | 95    | 13       | 24   | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-6           | 12    | 96    | 15       | 24   | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-7           | 13    | 97    | 0        | 25   | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-7           | 13    | 98    | 2        | 25   | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-7           | 13    | 99    | 4        | 25   | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-7           | 13    | 100   | 6        | 25   | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-7           | 13    | 101   | 8        | 26   | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-7           | 13    | 102   | 10       | 26   | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-7           | 13    | 103   | 12       | 26   | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-7           | 13    | 104   | 14       | 26   | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-7           | 14    | 105   | 1        | 27   | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-7           | 14    | 106   | 3        | 27   | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-7           | 14    | 107   | 5        | 27   | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-7           | 14    | 108   | 7        | 27   | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-7           | 14    | 109   | 9        | 28   | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-7           | 14    | 110   | 11       | 28   | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-7           | 14    | 111   | 13       | 28   | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-7           | 14    | 112   | 15       | 28   | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-8           | 15    | 113   | 0        | 29   | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-8           | 15    | 114   | 2        | 29   | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-8           | 15    | 115   | 4        | 29   | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-8           | 15    | 116   | 6        | 29   | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-8           | 15    | 117   | 8        | 30   | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-8           | 15    | 118   | 10       | 30   | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-8           | 15    | 119   | 12       | 30   | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-8           | 15    | 120   | 14       | 30   | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-8           | 16    | 121   | 1        | 31   | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-8           | 16    | 122   | 3        | 31   | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-8           | 16    | 123   | 5        | 31   | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-8           | 16    | 124   | 7        | 31   | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-8           | 16    | 125   | 9        | 32   | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-8           | 16    | 126   | 11       | 32   | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-8           | 16    | 127   | 13       | 32   | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-8           | 16    | 128   | 15       | 32   | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-9           | 17    | 129   | 0        | 33   | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-9           | 17    | 130   | 2        | 33   | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-9           | 17    | 131   | 4        | 33   | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-9           | 17    | 132   | 6        | 33   | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-9           | 17    | 133   | 8        | 34   | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-9           | 17    | 134   | 10       | 34   | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-9           | 17    | 135   | 12       | 34   | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-9           | 17    | 136   | 14       | 34   | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-9           | 18    | 137   | 1        | 35   | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-9           | 18    | 138   | 3        | 35   | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-9           | 18    | 139   | 5        | 35   | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-9           | 18    | 140   | 7        | 35   | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-9           | 18    | 141   | 9        | 36   | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-9           | 18    | 142   | 11       | 36   | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-9           | 18    | 143   | 13       | 36   | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-9           | 18    | 144   | 15       | 36   | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-10          | 19    | 145   | 0        | 37   | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-10          | 19    | 146   | 2        | 37   | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-10          | 19    | 147   | 4        | 37   | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-10          | 19    | 148   | 6        | 37   | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-10          | 19    | 149   | 8        | 38   | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-10          | 19    | 150   | 10       | 38   | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-10          | 19    | 151   | 12       | 38   | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-10          | 19    | 152   | 14       | 38   | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-10          | 20    | 153   | 1        | 39   | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-10          | 20    | 154   | 3        | 39   | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-10          | 20    | 155   | 5        | 39   | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-10          | 20    | 156   | 7        | 39   | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-10          | 20    | 157   | 9        | 40   | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-10          | 20    | 158   | 11       | 40   | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-10          | 20    | 159   | 13       | 40   | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-10          | 20    | 160   | 15       | 40   | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-11          | 21    | 161   | 0        | 41   | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-11          | 21    | 162   | 2        | 41   | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-11          | 21    | 163   | 4        | 41   | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-11          | 21    | 164   | 6        | 41   | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-11          | 21    | 165   | 8        | 42   | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-11          | 21    | 166   | 10       | 42   | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-11          | 21    | 167   | 12       | 42   | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-11          | 21    | 168   | 14       | 42   | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-11          | 22    | 169   | 1        | 43   | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-11          | 22    | 170   | 3        | 43   | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-11          | 22    | 171   | 5        | 43   | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-11          | 22    | 172   | 7        | 43   | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-11          | 22    | 173   | 9        | 44   | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-11          | 22    | 174   | 11       | 44   | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-11          | 22    | 175   | 13       | 44   | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-11          | 22    | 176   | 15       | 44   | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-12          | 23    | 177   | 0        | 45   | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-12          | 23    | 178   | 2        | 45   | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-12          | 23    | 179   | 4        | 45   | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-12          | 23    | 180   | 6        | 45   | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-12          | 23    | 181   | 8        | 46   | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-12          | 23    | 182   | 10       | 46   | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-12          | 23    | 183   | 12       | 46   | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-12          | 23    | 184   | 14       | 46   | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-12          | 24    | 185   | 1        | 47   | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-12          | 24    | 186   | 3        | 47   | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-12          | 24    | 187   | 5        | 47   | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-12          | 24    | 188   | 7        | 47   | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-12          | 24    | 189   | 9        | 48   | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-12          | 24    | 190   | 11       | 48   | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-12          | 24    | 191   | 13       | 48   | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-12          | 24    | 192   | 15       | 48   | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
+|  clustera | clustera-1           | 1     | 1     | 0        | 1    | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 1     | 2     | 2        | 1    | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 1     | 3     | 4        | 1    | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 1     | 4     | 6        | 1    | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 1     | 5     | 8        | 2    | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 1     | 6     | 10       | 2    | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 1     | 7     | 12       | 2    | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 1     | 8     | 14       | 2    | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 2     | 9     | 1        | 3    | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 2     | 10    | 3        | 3    | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 2     | 11    | 5        | 3    | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 2     | 12    | 7        | 3    | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 2     | 13    | 9        | 4    | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 2     | 14    | 11       | 4    | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 2     | 15    | 13       | 4    | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 2     | 16    | 15       | 4    | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 3     | 17    | 0        | 5    | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 3     | 18    | 2        | 5    | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 3     | 19    | 4        | 5    | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 3     | 20    | 6        | 5    | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 3     | 21    | 8        | 6    | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 3     | 22    | 10       | 6    | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 3     | 23    | 12       | 6    | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 3     | 24    | 14       | 6    | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 4     | 25    | 1        | 7    | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 4     | 26    | 3        | 7    | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 4     | 27    | 5        | 7    | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 4     | 28    | 7        | 7    | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 4     | 29    | 9        | 8    | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 4     | 30    | 11       | 8    | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 4     | 31    | 13       | 8    | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 4     | 32    | 15       | 8    | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-3           | 5     | 33    | 0        | 9    | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-3           | 5     | 34    | 2        | 9    | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-3           | 5     | 35    | 4        | 9    | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-3           | 5     | 36    | 6        | 9    | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-3           | 5     | 37    | 8        | 10   | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-3           | 5     | 38    | 10       | 10   | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-3           | 5     | 39    | 12       | 10   | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-3           | 5     | 40    | 14       | 10   | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-3           | 6     | 41    | 1        | 11   | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-3           | 6     | 42    | 3        | 11   | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-3           | 6     | 43    | 5        | 11   | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-3           | 6     | 44    | 7        | 11   | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-3           | 6     | 45    | 9        | 12   | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-3           | 6     | 46    | 11       | 12   | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-3           | 6     | 47    | 13       | 12   | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-3           | 6     | 48    | 15       | 12   | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-4           | 7     | 49    | 0        | 13   | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-4           | 7     | 50    | 2        | 13   | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-4           | 7     | 51    | 4        | 13   | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-4           | 7     | 52    | 6        | 13   | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-4           | 7     | 53    | 8        | 14   | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-4           | 7     | 54    | 10       | 14   | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-4           | 7     | 55    | 12       | 14   | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-4           | 7     | 56    | 14       | 14   | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-4           | 8     | 57    | 1        | 15   | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-4           | 8     | 58    | 3        | 15   | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-4           | 8     | 59    | 5        | 15   | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-4           | 8     | 60    | 7        | 15   | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-4           | 8     | 61    | 9        | 16   | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-4           | 8     | 62    | 11       | 16   | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-4           | 8     | 63    | 13       | 16   | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-4           | 8     | 64    | 15       | 16   | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-5           | 9     | 65    | 0        | 17   | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-5           | 9     | 66    | 2        | 17   | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-5           | 9     | 67    | 4        | 17   | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-5           | 9     | 68    | 6        | 17   | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-5           | 9     | 69    | 8        | 18   | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-5           | 9     | 70    | 10       | 18   | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-5           | 9     | 71    | 12       | 18   | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-5           | 9     | 72    | 14       | 18   | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-5           | 10    | 73    | 1        | 19   | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-5           | 10    | 74    | 3        | 19   | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-5           | 10    | 75    | 5        | 19   | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-5           | 10    | 76    | 7        | 19   | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-5           | 10    | 77    | 9        | 20   | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-5           | 10    | 78    | 11       | 20   | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-5           | 10    | 79    | 13       | 20   | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-5           | 10    | 80    | 15       | 20   | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-6           | 11    | 81    | 0        | 21   | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-6           | 11    | 82    | 2        | 21   | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-6           | 11    | 83    | 4        | 21   | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-6           | 11    | 84    | 6        | 21   | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-6           | 11    | 85    | 8        | 22   | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-6           | 11    | 86    | 10       | 22   | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-6           | 11    | 87    | 12       | 22   | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-6           | 11    | 88    | 14       | 22   | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-6           | 12    | 89    | 1        | 23   | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-6           | 12    | 90    | 3        | 23   | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-6           | 12    | 91    | 5        | 23   | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-6           | 12    | 92    | 7        | 23   | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-6           | 12    | 93    | 9        | 24   | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-6           | 12    | 94    | 11       | 24   | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-6           | 12    | 95    | 13       | 24   | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-6           | 12    | 96    | 15       | 24   | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-7           | 13    | 97    | 0        | 25   | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-7           | 13    | 98    | 2        | 25   | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-7           | 13    | 99    | 4        | 25   | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-7           | 13    | 100   | 6        | 25   | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-7           | 13    | 101   | 8        | 26   | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-7           | 13    | 102   | 10       | 26   | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-7           | 13    | 103   | 12       | 26   | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-7           | 13    | 104   | 14       | 26   | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-7           | 14    | 105   | 1        | 27   | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-7           | 14    | 106   | 3        | 27   | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-7           | 14    | 107   | 5        | 27   | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-7           | 14    | 108   | 7        | 27   | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-7           | 14    | 109   | 9        | 28   | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-7           | 14    | 110   | 11       | 28   | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-7           | 14    | 111   | 13       | 28   | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-7           | 14    | 112   | 15       | 28   | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-8           | 15    | 113   | 0        | 29   | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-8           | 15    | 114   | 2        | 29   | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-8           | 15    | 115   | 4        | 29   | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-8           | 15    | 116   | 6        | 29   | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-8           | 15    | 117   | 8        | 30   | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-8           | 15    | 118   | 10       | 30   | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-8           | 15    | 119   | 12       | 30   | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-8           | 15    | 120   | 14       | 30   | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-8           | 16    | 121   | 1        | 31   | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-8           | 16    | 122   | 3        | 31   | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-8           | 16    | 123   | 5        | 31   | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-8           | 16    | 124   | 7        | 31   | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-8           | 16    | 125   | 9        | 32   | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-8           | 16    | 126   | 11       | 32   | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-8           | 16    | 127   | 13       | 32   | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-8           | 16    | 128   | 15       | 32   | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-9           | 17    | 129   | 0        | 33   | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-9           | 17    | 130   | 2        | 33   | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-9           | 17    | 131   | 4        | 33   | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-9           | 17    | 132   | 6        | 33   | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-9           | 17    | 133   | 8        | 34   | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-9           | 17    | 134   | 10       | 34   | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-9           | 17    | 135   | 12       | 34   | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-9           | 17    | 136   | 14       | 34   | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-9           | 18    | 137   | 1        | 35   | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-9           | 18    | 138   | 3        | 35   | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-9           | 18    | 139   | 5        | 35   | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-9           | 18    | 140   | 7        | 35   | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-9           | 18    | 141   | 9        | 36   | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-9           | 18    | 142   | 11       | 36   | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-9           | 18    | 143   | 13       | 36   | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-9           | 18    | 144   | 15       | 36   | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-10          | 19    | 145   | 0        | 37   | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-10          | 19    | 146   | 2        | 37   | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-10          | 19    | 147   | 4        | 37   | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-10          | 19    | 148   | 6        | 37   | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-10          | 19    | 149   | 8        | 38   | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-10          | 19    | 150   | 10       | 38   | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-10          | 19    | 151   | 12       | 38   | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-10          | 19    | 152   | 14       | 38   | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-10          | 20    | 153   | 1        | 39   | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-10          | 20    | 154   | 3        | 39   | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-10          | 20    | 155   | 5        | 39   | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-10          | 20    | 156   | 7        | 39   | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-10          | 20    | 157   | 9        | 40   | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-10          | 20    | 158   | 11       | 40   | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-10          | 20    | 159   | 13       | 40   | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-10          | 20    | 160   | 15       | 40   | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-11          | 21    | 161   | 0        | 41   | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-11          | 21    | 162   | 2        | 41   | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-11          | 21    | 163   | 4        | 41   | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-11          | 21    | 164   | 6        | 41   | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-11          | 21    | 165   | 8        | 42   | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-11          | 21    | 166   | 10       | 42   | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-11          | 21    | 167   | 12       | 42   | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-11          | 21    | 168   | 14       | 42   | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-11          | 22    | 169   | 1        | 43   | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-11          | 22    | 170   | 3        | 43   | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-11          | 22    | 171   | 5        | 43   | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-11          | 22    | 172   | 7        | 43   | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-11          | 22    | 173   | 9        | 44   | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-11          | 22    | 174   | 11       | 44   | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-11          | 22    | 175   | 13       | 44   | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-11          | 22    | 176   | 15       | 44   | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-12          | 23    | 177   | 0        | 45   | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-12          | 23    | 178   | 2        | 45   | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-12          | 23    | 179   | 4        | 45   | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-12          | 23    | 180   | 6        | 45   | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-12          | 23    | 181   | 8        | 46   | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-12          | 23    | 182   | 10       | 46   | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-12          | 23    | 183   | 12       | 46   | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-12          | 23    | 184   | 14       | 46   | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-12          | 24    | 185   | 1        | 47   | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-12          | 24    | 186   | 3        | 47   | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-12          | 24    | 187   | 5        | 47   | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-12          | 24    | 188   | 7        | 47   | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-12          | 24    | 189   | 9        | 48   | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-12          | 24    | 190   | 11       | 48   | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-12          | 24    | 191   | 13       | 48   | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-12          | 24    | 192   | 15       | 48   | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
 |  clustera | clustera-13          | 25    | 193   | 0        | 49   | 0                    | Intel Xeon Silver 4110         | Quadro RTX 6000               |
 |  clustera | clustera-13          | 25    | 194   | 2        | 49   | 0                    | Intel Xeon Silver 4110         | Quadro RTX 6000               |
 |  clustera | clustera-13          | 25    | 195   | 4        | 49   | 0                    | Intel Xeon Silver 4110         | Quadro RTX 6000               |
diff --git a/spec/output/missing_property_print_stdout.txt b/spec/output/missing_property_print_stdout.txt
index db086ef26b1..3722dfbd9eb 100644
--- a/spec/output/missing_property_print_stdout.txt
+++ b/spec/output/missing_property_print_stdout.txt
@@ -93,24 +93,24 @@ property_exist 'disk_reservation_count' || oarproperty -a disk_reservation_count
 ###################################
 # clustera-1.fakesite.grid5000.fr
 ###################################
-oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='1' AND type='default'" -p cpu=1 -p core=1 -p cpuset=0 -p gpu=1 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='2' AND type='default'" -p cpu=1 -p core=2 -p cpuset=1 -p gpu=1 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='3' AND type='default'" -p cpu=1 -p core=3 -p cpuset=2 -p gpu=1 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='4' AND type='default'" -p cpu=1 -p core=4 -p cpuset=3 -p gpu=1 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='5' AND type='default'" -p cpu=1 -p core=5 -p cpuset=4 -p gpu=2 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='6' AND type='default'" -p cpu=1 -p core=6 -p cpuset=5 -p gpu=2 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='7' AND type='default'" -p cpu=1 -p core=7 -p cpuset=6 -p gpu=2 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='8' AND type='default'" -p cpu=1 -p core=8 -p cpuset=7 -p gpu=2 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='9' AND type='default'" -p cpu=2 -p core=9 -p cpuset=8 -p gpu=3 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='10' AND type='default'" -p cpu=2 -p core=10 -p cpuset=9 -p gpu=3 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='11' AND type='default'" -p cpu=2 -p core=11 -p cpuset=10 -p gpu=3 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='12' AND type='default'" -p cpu=2 -p core=12 -p cpuset=11 -p gpu=3 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='13' AND type='default'" -p cpu=2 -p core=13 -p cpuset=12 -p gpu=4 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='14' AND type='default'" -p cpu=2 -p core=14 -p cpuset=13 -p gpu=4 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='15' AND type='default'" -p cpu=2 -p core=15 -p cpuset=14 -p gpu=4 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='16' AND type='default'" -p cpu=2 -p core=16 -p cpuset=15 -p gpu=4 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='1' AND type='default'" -p cpu=1 -p core=1 -p cpuset=0 -p gpu=1 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='2' AND type='default'" -p cpu=1 -p core=2 -p cpuset=1 -p gpu=1 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='3' AND type='default'" -p cpu=1 -p core=3 -p cpuset=2 -p gpu=1 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='4' AND type='default'" -p cpu=1 -p core=4 -p cpuset=3 -p gpu=1 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='5' AND type='default'" -p cpu=1 -p core=5 -p cpuset=4 -p gpu=2 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='6' AND type='default'" -p cpu=1 -p core=6 -p cpuset=5 -p gpu=2 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='7' AND type='default'" -p cpu=1 -p core=7 -p cpuset=6 -p gpu=2 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='8' AND type='default'" -p cpu=1 -p core=8 -p cpuset=7 -p gpu=2 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='9' AND type='default'" -p cpu=2 -p core=9 -p cpuset=8 -p gpu=3 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='10' AND type='default'" -p cpu=2 -p core=10 -p cpuset=9 -p gpu=3 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='11' AND type='default'" -p cpu=2 -p core=11 -p cpuset=10 -p gpu=3 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='12' AND type='default'" -p cpu=2 -p core=12 -p cpuset=11 -p gpu=3 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='13' AND type='default'" -p cpu=2 -p core=13 -p cpuset=12 -p gpu=4 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='14' AND type='default'" -p cpu=2 -p core=14 -p cpuset=13 -p gpu=4 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='15' AND type='default'" -p cpu=2 -p core=15 -p cpuset=14 -p gpu=4 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='16' AND type='default'" -p cpu=2 -p core=16 -p cpuset=15 -p gpu=4 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 echo; echo 'Setting properties for clustera-1.fakesite.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' and type='default'" -p ip='172.16.64.1' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw-fakesite' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 FL1CBX2' -p eth_count=1 -p eth_kavlan_count=0 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='GeForce RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='NO' -p cluster_priority=201906 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
+oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' and type='default'" -p ip='172.16.64.1' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw-fakesite' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 FL1CBX2' -p eth_count=1 -p eth_kavlan_count=0 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='NO' -p cluster_priority=201906 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
 
 echo '================================================================================'
 
@@ -118,23 +118,23 @@ echo '==========================================================================
 ###################################
 # clustera-2.fakesite.grid5000.fr
 ###################################
-oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='17' AND type='default'" -p cpu=3 -p core=17 -p cpuset=0 -p gpu=5 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='18' AND type='default'" -p cpu=3 -p core=18 -p cpuset=1 -p gpu=5 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='19' AND type='default'" -p cpu=3 -p core=19 -p cpuset=2 -p gpu=5 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='20' AND type='default'" -p cpu=3 -p core=20 -p cpuset=3 -p gpu=5 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='21' AND type='default'" -p cpu=3 -p core=21 -p cpuset=4 -p gpu=6 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='22' AND type='default'" -p cpu=3 -p core=22 -p cpuset=5 -p gpu=6 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='23' AND type='default'" -p cpu=3 -p core=23 -p cpuset=6 -p gpu=6 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='24' AND type='default'" -p cpu=3 -p core=24 -p cpuset=7 -p gpu=6 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='25' AND type='default'" -p cpu=4 -p core=25 -p cpuset=8 -p gpu=7 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='26' AND type='default'" -p cpu=4 -p core=26 -p cpuset=9 -p gpu=7 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='27' AND type='default'" -p cpu=4 -p core=27 -p cpuset=10 -p gpu=7 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='28' AND type='default'" -p cpu=4 -p core=28 -p cpuset=11 -p gpu=7 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='29' AND type='default'" -p cpu=4 -p core=29 -p cpuset=12 -p gpu=8 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='30' AND type='default'" -p cpu=4 -p core=30 -p cpuset=13 -p gpu=8 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='31' AND type='default'" -p cpu=4 -p core=31 -p cpuset=14 -p gpu=8 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='32' AND type='default'" -p cpu=4 -p core=32 -p cpuset=15 -p gpu=8 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='17' AND type='default'" -p cpu=3 -p core=17 -p cpuset=0 -p gpu=5 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='18' AND type='default'" -p cpu=3 -p core=18 -p cpuset=1 -p gpu=5 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='19' AND type='default'" -p cpu=3 -p core=19 -p cpuset=2 -p gpu=5 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='20' AND type='default'" -p cpu=3 -p core=20 -p cpuset=3 -p gpu=5 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='21' AND type='default'" -p cpu=3 -p core=21 -p cpuset=4 -p gpu=6 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='22' AND type='default'" -p cpu=3 -p core=22 -p cpuset=5 -p gpu=6 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='23' AND type='default'" -p cpu=3 -p core=23 -p cpuset=6 -p gpu=6 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='24' AND type='default'" -p cpu=3 -p core=24 -p cpuset=7 -p gpu=6 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='25' AND type='default'" -p cpu=4 -p core=25 -p cpuset=8 -p gpu=7 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='26' AND type='default'" -p cpu=4 -p core=26 -p cpuset=9 -p gpu=7 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='27' AND type='default'" -p cpu=4 -p core=27 -p cpuset=10 -p gpu=7 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='28' AND type='default'" -p cpu=4 -p core=28 -p cpuset=11 -p gpu=7 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='29' AND type='default'" -p cpu=4 -p core=29 -p cpuset=12 -p gpu=8 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='30' AND type='default'" -p cpu=4 -p core=30 -p cpuset=13 -p gpu=8 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='31' AND type='default'" -p cpu=4 -p core=31 -p cpuset=14 -p gpu=8 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='32' AND type='default'" -p cpu=4 -p core=32 -p cpuset=15 -p gpu=8 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 echo; echo 'Setting properties for clustera-2.fakesite.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' and type='default'" -p ip='172.16.64.2' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw-fakesite' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 9L1CBX2' -p eth_count=1 -p eth_kavlan_count=0 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='GeForce RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='NO' -p cluster_priority=201906 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
+oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' and type='default'" -p ip='172.16.64.2' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw-fakesite' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 9L1CBX2' -p eth_count=1 -p eth_kavlan_count=0 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='NO' -p cluster_priority=201906 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
 
 echo '================================================================================'
diff --git a/spec/output/missing_property_table_stdout.txt b/spec/output/missing_property_table_stdout.txt
index ff22c49a17b..78c01fb6074 100644
--- a/spec/output/missing_property_table_stdout.txt
+++ b/spec/output/missing_property_table_stdout.txt
@@ -1,36 +1,36 @@
 +---------- + -------------------- + ----- + ----- + -------- + ---- + -------------------- + ------------------------------ + ------------------------------+
 |   cluster | host                 | cpu   | core  | cpuset   | gpu  | gpudevice            | cpumodel                       | gpumodel                      |
 +---------- + -------------------- + ----- + ----- + -------- + ---- + -------------------- + ------------------------------ + ------------------------------+
-|  clustera | clustera-1           | 1     | 1     | 0        | 1    | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 1     | 2     | 1        | 1    | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 1     | 3     | 2        | 1    | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 1     | 4     | 3        | 1    | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 1     | 5     | 4        | 2    | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 1     | 6     | 5        | 2    | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 1     | 7     | 6        | 2    | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 1     | 8     | 7        | 2    | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 2     | 9     | 8        | 3    | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 2     | 10    | 9        | 3    | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 2     | 11    | 10       | 3    | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 2     | 12    | 11       | 3    | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 2     | 13    | 12       | 4    | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 2     | 14    | 13       | 4    | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 2     | 15    | 14       | 4    | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 2     | 16    | 15       | 4    | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 3     | 17    | 0        | 5    | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 3     | 18    | 1        | 5    | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 3     | 19    | 2        | 5    | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 3     | 20    | 3        | 5    | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 3     | 21    | 4        | 6    | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 3     | 22    | 5        | 6    | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 3     | 23    | 6        | 6    | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 3     | 24    | 7        | 6    | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 4     | 25    | 8        | 7    | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 4     | 26    | 9        | 7    | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 4     | 27    | 10       | 7    | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 4     | 28    | 11       | 7    | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 4     | 29    | 12       | 8    | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 4     | 30    | 13       | 8    | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 4     | 31    | 14       | 8    | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 4     | 32    | 15       | 8    | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
+|  clustera | clustera-1           | 1     | 1     | 0        | 1    | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 1     | 2     | 1        | 1    | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 1     | 3     | 2        | 1    | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 1     | 4     | 3        | 1    | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 1     | 5     | 4        | 2    | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 1     | 6     | 5        | 2    | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 1     | 7     | 6        | 2    | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 1     | 8     | 7        | 2    | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 2     | 9     | 8        | 3    | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 2     | 10    | 9        | 3    | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 2     | 11    | 10       | 3    | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 2     | 12    | 11       | 3    | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 2     | 13    | 12       | 4    | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 2     | 14    | 13       | 4    | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 2     | 15    | 14       | 4    | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 2     | 16    | 15       | 4    | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 3     | 17    | 0        | 5    | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 3     | 18    | 1        | 5    | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 3     | 19    | 2        | 5    | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 3     | 20    | 3        | 5    | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 3     | 21    | 4        | 6    | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 3     | 22    | 5        | 6    | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 3     | 23    | 6        | 6    | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 3     | 24    | 7        | 6    | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 4     | 25    | 8        | 7    | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 4     | 26    | 9        | 7    | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 4     | 27    | 10       | 7    | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 4     | 28    | 11       | 7    | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 4     | 29    | 12       | 8    | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 4     | 30    | 13       | 8    | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 4     | 31    | 14       | 8    | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 4     | 32    | 15       | 8    | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
 +---------- + -------------------- + ----- + ----- + -------- + ---- + -------------------- + ------------------------------ + ------------------------------+
diff --git a/spec/output/non_reservable_gpus_print_stdout.txt b/spec/output/non_reservable_gpus_print_stdout.txt
index b4ee4441a8d..5a4885d9984 100644
--- a/spec/output/non_reservable_gpus_print_stdout.txt
+++ b/spec/output/non_reservable_gpus_print_stdout.txt
@@ -110,7 +110,7 @@ oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='14
 oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='15' AND type='default'" -p cpu=2 -p core=15 -p cpuset=14
 oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='16' AND type='default'" -p cpu=2 -p core=16 -p cpuset=15
 echo; echo 'Setting properties for clustera-1.fakesite.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' and type='default'" -p ip='172.16.64.1' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw-fakesite' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 FL1CBX2' -p eth_count=1 -p eth_kavlan_count=0 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='GeForce RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='NO' -p cluster_priority=201906 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
+oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' and type='default'" -p ip='172.16.64.1' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw-fakesite' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 FL1CBX2' -p eth_count=1 -p eth_kavlan_count=0 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='NO' -p cluster_priority=201906 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
 
 echo '================================================================================'
 
@@ -135,6 +135,6 @@ oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='30
 oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='31' AND type='default'" -p cpu=4 -p core=31 -p cpuset=14
 oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='32' AND type='default'" -p cpu=4 -p core=32 -p cpuset=15
 echo; echo 'Setting properties for clustera-2.fakesite.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' and type='default'" -p ip='172.16.64.2' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw-fakesite' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 9L1CBX2' -p eth_count=1 -p eth_kavlan_count=0 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='GeForce RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='NO' -p cluster_priority=201906 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
+oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' and type='default'" -p ip='172.16.64.2' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw-fakesite' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 9L1CBX2' -p eth_count=1 -p eth_kavlan_count=0 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='NO' -p cluster_priority=201906 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
 
 echo '================================================================================'
diff --git a/spec/output/wattmeters_nil_print_stdout.txt b/spec/output/wattmeters_nil_print_stdout.txt
index db086ef26b1..3722dfbd9eb 100644
--- a/spec/output/wattmeters_nil_print_stdout.txt
+++ b/spec/output/wattmeters_nil_print_stdout.txt
@@ -93,24 +93,24 @@ property_exist 'disk_reservation_count' || oarproperty -a disk_reservation_count
 ###################################
 # clustera-1.fakesite.grid5000.fr
 ###################################
-oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='1' AND type='default'" -p cpu=1 -p core=1 -p cpuset=0 -p gpu=1 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='2' AND type='default'" -p cpu=1 -p core=2 -p cpuset=1 -p gpu=1 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='3' AND type='default'" -p cpu=1 -p core=3 -p cpuset=2 -p gpu=1 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='4' AND type='default'" -p cpu=1 -p core=4 -p cpuset=3 -p gpu=1 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='5' AND type='default'" -p cpu=1 -p core=5 -p cpuset=4 -p gpu=2 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='6' AND type='default'" -p cpu=1 -p core=6 -p cpuset=5 -p gpu=2 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='7' AND type='default'" -p cpu=1 -p core=7 -p cpuset=6 -p gpu=2 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='8' AND type='default'" -p cpu=1 -p core=8 -p cpuset=7 -p gpu=2 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='9' AND type='default'" -p cpu=2 -p core=9 -p cpuset=8 -p gpu=3 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='10' AND type='default'" -p cpu=2 -p core=10 -p cpuset=9 -p gpu=3 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='11' AND type='default'" -p cpu=2 -p core=11 -p cpuset=10 -p gpu=3 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='12' AND type='default'" -p cpu=2 -p core=12 -p cpuset=11 -p gpu=3 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='13' AND type='default'" -p cpu=2 -p core=13 -p cpuset=12 -p gpu=4 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='14' AND type='default'" -p cpu=2 -p core=14 -p cpuset=13 -p gpu=4 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='15' AND type='default'" -p cpu=2 -p core=15 -p cpuset=14 -p gpu=4 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='16' AND type='default'" -p cpu=2 -p core=16 -p cpuset=15 -p gpu=4 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='1' AND type='default'" -p cpu=1 -p core=1 -p cpuset=0 -p gpu=1 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='2' AND type='default'" -p cpu=1 -p core=2 -p cpuset=1 -p gpu=1 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='3' AND type='default'" -p cpu=1 -p core=3 -p cpuset=2 -p gpu=1 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='4' AND type='default'" -p cpu=1 -p core=4 -p cpuset=3 -p gpu=1 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='5' AND type='default'" -p cpu=1 -p core=5 -p cpuset=4 -p gpu=2 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='6' AND type='default'" -p cpu=1 -p core=6 -p cpuset=5 -p gpu=2 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='7' AND type='default'" -p cpu=1 -p core=7 -p cpuset=6 -p gpu=2 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='8' AND type='default'" -p cpu=1 -p core=8 -p cpuset=7 -p gpu=2 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='9' AND type='default'" -p cpu=2 -p core=9 -p cpuset=8 -p gpu=3 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='10' AND type='default'" -p cpu=2 -p core=10 -p cpuset=9 -p gpu=3 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='11' AND type='default'" -p cpu=2 -p core=11 -p cpuset=10 -p gpu=3 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='12' AND type='default'" -p cpu=2 -p core=12 -p cpuset=11 -p gpu=3 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='13' AND type='default'" -p cpu=2 -p core=13 -p cpuset=12 -p gpu=4 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='14' AND type='default'" -p cpu=2 -p core=14 -p cpuset=13 -p gpu=4 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='15' AND type='default'" -p cpu=2 -p core=15 -p cpuset=14 -p gpu=4 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='16' AND type='default'" -p cpu=2 -p core=16 -p cpuset=15 -p gpu=4 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 echo; echo 'Setting properties for clustera-1.fakesite.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' and type='default'" -p ip='172.16.64.1' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw-fakesite' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 FL1CBX2' -p eth_count=1 -p eth_kavlan_count=0 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='GeForce RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='NO' -p cluster_priority=201906 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
+oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' and type='default'" -p ip='172.16.64.1' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw-fakesite' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 FL1CBX2' -p eth_count=1 -p eth_kavlan_count=0 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='NO' -p cluster_priority=201906 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
 
 echo '================================================================================'
 
@@ -118,23 +118,23 @@ echo '==========================================================================
 ###################################
 # clustera-2.fakesite.grid5000.fr
 ###################################
-oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='17' AND type='default'" -p cpu=3 -p core=17 -p cpuset=0 -p gpu=5 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='18' AND type='default'" -p cpu=3 -p core=18 -p cpuset=1 -p gpu=5 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='19' AND type='default'" -p cpu=3 -p core=19 -p cpuset=2 -p gpu=5 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='20' AND type='default'" -p cpu=3 -p core=20 -p cpuset=3 -p gpu=5 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='21' AND type='default'" -p cpu=3 -p core=21 -p cpuset=4 -p gpu=6 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='22' AND type='default'" -p cpu=3 -p core=22 -p cpuset=5 -p gpu=6 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='23' AND type='default'" -p cpu=3 -p core=23 -p cpuset=6 -p gpu=6 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='24' AND type='default'" -p cpu=3 -p core=24 -p cpuset=7 -p gpu=6 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='25' AND type='default'" -p cpu=4 -p core=25 -p cpuset=8 -p gpu=7 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='26' AND type='default'" -p cpu=4 -p core=26 -p cpuset=9 -p gpu=7 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='27' AND type='default'" -p cpu=4 -p core=27 -p cpuset=10 -p gpu=7 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='28' AND type='default'" -p cpu=4 -p core=28 -p cpuset=11 -p gpu=7 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='29' AND type='default'" -p cpu=4 -p core=29 -p cpuset=12 -p gpu=8 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='30' AND type='default'" -p cpu=4 -p core=30 -p cpuset=13 -p gpu=8 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='31' AND type='default'" -p cpu=4 -p core=31 -p cpuset=14 -p gpu=8 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='32' AND type='default'" -p cpu=4 -p core=32 -p cpuset=15 -p gpu=8 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='17' AND type='default'" -p cpu=3 -p core=17 -p cpuset=0 -p gpu=5 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='18' AND type='default'" -p cpu=3 -p core=18 -p cpuset=1 -p gpu=5 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='19' AND type='default'" -p cpu=3 -p core=19 -p cpuset=2 -p gpu=5 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='20' AND type='default'" -p cpu=3 -p core=20 -p cpuset=3 -p gpu=5 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='21' AND type='default'" -p cpu=3 -p core=21 -p cpuset=4 -p gpu=6 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='22' AND type='default'" -p cpu=3 -p core=22 -p cpuset=5 -p gpu=6 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='23' AND type='default'" -p cpu=3 -p core=23 -p cpuset=6 -p gpu=6 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='24' AND type='default'" -p cpu=3 -p core=24 -p cpuset=7 -p gpu=6 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='25' AND type='default'" -p cpu=4 -p core=25 -p cpuset=8 -p gpu=7 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='26' AND type='default'" -p cpu=4 -p core=26 -p cpuset=9 -p gpu=7 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='27' AND type='default'" -p cpu=4 -p core=27 -p cpuset=10 -p gpu=7 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='28' AND type='default'" -p cpu=4 -p core=28 -p cpuset=11 -p gpu=7 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='29' AND type='default'" -p cpu=4 -p core=29 -p cpuset=12 -p gpu=8 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='30' AND type='default'" -p cpu=4 -p core=30 -p cpuset=13 -p gpu=8 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='31' AND type='default'" -p cpu=4 -p core=31 -p cpuset=14 -p gpu=8 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='32' AND type='default'" -p cpu=4 -p core=32 -p cpuset=15 -p gpu=8 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 echo; echo 'Setting properties for clustera-2.fakesite.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' and type='default'" -p ip='172.16.64.2' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw-fakesite' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 9L1CBX2' -p eth_count=1 -p eth_kavlan_count=0 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='GeForce RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='NO' -p cluster_priority=201906 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
+oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' and type='default'" -p ip='172.16.64.2' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw-fakesite' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 9L1CBX2' -p eth_count=1 -p eth_kavlan_count=0 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='NO' -p cluster_priority=201906 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
 
 echo '================================================================================'
diff --git a/spec/output/wattmeters_nil_table_stdout.txt b/spec/output/wattmeters_nil_table_stdout.txt
index ff22c49a17b..78c01fb6074 100644
--- a/spec/output/wattmeters_nil_table_stdout.txt
+++ b/spec/output/wattmeters_nil_table_stdout.txt
@@ -1,36 +1,36 @@
 +---------- + -------------------- + ----- + ----- + -------- + ---- + -------------------- + ------------------------------ + ------------------------------+
 |   cluster | host                 | cpu   | core  | cpuset   | gpu  | gpudevice            | cpumodel                       | gpumodel                      |
 +---------- + -------------------- + ----- + ----- + -------- + ---- + -------------------- + ------------------------------ + ------------------------------+
-|  clustera | clustera-1           | 1     | 1     | 0        | 1    | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 1     | 2     | 1        | 1    | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 1     | 3     | 2        | 1    | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 1     | 4     | 3        | 1    | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 1     | 5     | 4        | 2    | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 1     | 6     | 5        | 2    | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 1     | 7     | 6        | 2    | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 1     | 8     | 7        | 2    | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 2     | 9     | 8        | 3    | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 2     | 10    | 9        | 3    | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 2     | 11    | 10       | 3    | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 2     | 12    | 11       | 3    | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 2     | 13    | 12       | 4    | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 2     | 14    | 13       | 4    | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 2     | 15    | 14       | 4    | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 2     | 16    | 15       | 4    | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 3     | 17    | 0        | 5    | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 3     | 18    | 1        | 5    | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 3     | 19    | 2        | 5    | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 3     | 20    | 3        | 5    | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 3     | 21    | 4        | 6    | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 3     | 22    | 5        | 6    | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 3     | 23    | 6        | 6    | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 3     | 24    | 7        | 6    | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 4     | 25    | 8        | 7    | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 4     | 26    | 9        | 7    | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 4     | 27    | 10       | 7    | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 4     | 28    | 11       | 7    | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 4     | 29    | 12       | 8    | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 4     | 30    | 13       | 8    | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 4     | 31    | 14       | 8    | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 4     | 32    | 15       | 8    | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
+|  clustera | clustera-1           | 1     | 1     | 0        | 1    | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 1     | 2     | 1        | 1    | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 1     | 3     | 2        | 1    | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 1     | 4     | 3        | 1    | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 1     | 5     | 4        | 2    | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 1     | 6     | 5        | 2    | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 1     | 7     | 6        | 2    | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 1     | 8     | 7        | 2    | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 2     | 9     | 8        | 3    | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 2     | 10    | 9        | 3    | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 2     | 11    | 10       | 3    | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 2     | 12    | 11       | 3    | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 2     | 13    | 12       | 4    | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 2     | 14    | 13       | 4    | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 2     | 15    | 14       | 4    | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 2     | 16    | 15       | 4    | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 3     | 17    | 0        | 5    | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 3     | 18    | 1        | 5    | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 3     | 19    | 2        | 5    | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 3     | 20    | 3        | 5    | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 3     | 21    | 4        | 6    | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 3     | 22    | 5        | 6    | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 3     | 23    | 6        | 6    | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 3     | 24    | 7        | 6    | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 4     | 25    | 8        | 7    | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 4     | 26    | 9        | 7    | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 4     | 27    | 10       | 7    | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 4     | 28    | 11       | 7    | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 4     | 29    | 12       | 8    | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 4     | 30    | 13       | 8    | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 4     | 31    | 14       | 8    | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 4     | 32    | 15       | 8    | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
 +---------- + -------------------- + ----- + ----- + -------- + ---- + -------------------- + ------------------------------ + ------------------------------+
diff --git a/spec/output/with-data_print_stdout.txt b/spec/output/with-data_print_stdout.txt
index db086ef26b1..3722dfbd9eb 100644
--- a/spec/output/with-data_print_stdout.txt
+++ b/spec/output/with-data_print_stdout.txt
@@ -93,24 +93,24 @@ property_exist 'disk_reservation_count' || oarproperty -a disk_reservation_count
 ###################################
 # clustera-1.fakesite.grid5000.fr
 ###################################
-oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='1' AND type='default'" -p cpu=1 -p core=1 -p cpuset=0 -p gpu=1 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='2' AND type='default'" -p cpu=1 -p core=2 -p cpuset=1 -p gpu=1 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='3' AND type='default'" -p cpu=1 -p core=3 -p cpuset=2 -p gpu=1 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='4' AND type='default'" -p cpu=1 -p core=4 -p cpuset=3 -p gpu=1 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='5' AND type='default'" -p cpu=1 -p core=5 -p cpuset=4 -p gpu=2 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='6' AND type='default'" -p cpu=1 -p core=6 -p cpuset=5 -p gpu=2 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='7' AND type='default'" -p cpu=1 -p core=7 -p cpuset=6 -p gpu=2 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='8' AND type='default'" -p cpu=1 -p core=8 -p cpuset=7 -p gpu=2 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='9' AND type='default'" -p cpu=2 -p core=9 -p cpuset=8 -p gpu=3 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='10' AND type='default'" -p cpu=2 -p core=10 -p cpuset=9 -p gpu=3 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='11' AND type='default'" -p cpu=2 -p core=11 -p cpuset=10 -p gpu=3 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='12' AND type='default'" -p cpu=2 -p core=12 -p cpuset=11 -p gpu=3 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='13' AND type='default'" -p cpu=2 -p core=13 -p cpuset=12 -p gpu=4 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='14' AND type='default'" -p cpu=2 -p core=14 -p cpuset=13 -p gpu=4 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='15' AND type='default'" -p cpu=2 -p core=15 -p cpuset=14 -p gpu=4 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='16' AND type='default'" -p cpu=2 -p core=16 -p cpuset=15 -p gpu=4 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='1' AND type='default'" -p cpu=1 -p core=1 -p cpuset=0 -p gpu=1 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='2' AND type='default'" -p cpu=1 -p core=2 -p cpuset=1 -p gpu=1 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='3' AND type='default'" -p cpu=1 -p core=3 -p cpuset=2 -p gpu=1 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='4' AND type='default'" -p cpu=1 -p core=4 -p cpuset=3 -p gpu=1 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='5' AND type='default'" -p cpu=1 -p core=5 -p cpuset=4 -p gpu=2 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='6' AND type='default'" -p cpu=1 -p core=6 -p cpuset=5 -p gpu=2 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='7' AND type='default'" -p cpu=1 -p core=7 -p cpuset=6 -p gpu=2 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='8' AND type='default'" -p cpu=1 -p core=8 -p cpuset=7 -p gpu=2 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='9' AND type='default'" -p cpu=2 -p core=9 -p cpuset=8 -p gpu=3 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='10' AND type='default'" -p cpu=2 -p core=10 -p cpuset=9 -p gpu=3 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='11' AND type='default'" -p cpu=2 -p core=11 -p cpuset=10 -p gpu=3 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='12' AND type='default'" -p cpu=2 -p core=12 -p cpuset=11 -p gpu=3 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='13' AND type='default'" -p cpu=2 -p core=13 -p cpuset=12 -p gpu=4 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='14' AND type='default'" -p cpu=2 -p core=14 -p cpuset=13 -p gpu=4 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='15' AND type='default'" -p cpu=2 -p core=15 -p cpuset=14 -p gpu=4 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='16' AND type='default'" -p cpu=2 -p core=16 -p cpuset=15 -p gpu=4 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 echo; echo 'Setting properties for clustera-1.fakesite.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' and type='default'" -p ip='172.16.64.1' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw-fakesite' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 FL1CBX2' -p eth_count=1 -p eth_kavlan_count=0 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='GeForce RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='NO' -p cluster_priority=201906 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
+oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' and type='default'" -p ip='172.16.64.1' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw-fakesite' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 FL1CBX2' -p eth_count=1 -p eth_kavlan_count=0 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='NO' -p cluster_priority=201906 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
 
 echo '================================================================================'
 
@@ -118,23 +118,23 @@ echo '==========================================================================
 ###################################
 # clustera-2.fakesite.grid5000.fr
 ###################################
-oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='17' AND type='default'" -p cpu=3 -p core=17 -p cpuset=0 -p gpu=5 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='18' AND type='default'" -p cpu=3 -p core=18 -p cpuset=1 -p gpu=5 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='19' AND type='default'" -p cpu=3 -p core=19 -p cpuset=2 -p gpu=5 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='20' AND type='default'" -p cpu=3 -p core=20 -p cpuset=3 -p gpu=5 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='21' AND type='default'" -p cpu=3 -p core=21 -p cpuset=4 -p gpu=6 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='22' AND type='default'" -p cpu=3 -p core=22 -p cpuset=5 -p gpu=6 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='23' AND type='default'" -p cpu=3 -p core=23 -p cpuset=6 -p gpu=6 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='24' AND type='default'" -p cpu=3 -p core=24 -p cpuset=7 -p gpu=6 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='25' AND type='default'" -p cpu=4 -p core=25 -p cpuset=8 -p gpu=7 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='26' AND type='default'" -p cpu=4 -p core=26 -p cpuset=9 -p gpu=7 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='27' AND type='default'" -p cpu=4 -p core=27 -p cpuset=10 -p gpu=7 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='28' AND type='default'" -p cpu=4 -p core=28 -p cpuset=11 -p gpu=7 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='29' AND type='default'" -p cpu=4 -p core=29 -p cpuset=12 -p gpu=8 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='30' AND type='default'" -p cpu=4 -p core=30 -p cpuset=13 -p gpu=8 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='31' AND type='default'" -p cpu=4 -p core=31 -p cpuset=14 -p gpu=8 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='32' AND type='default'" -p cpu=4 -p core=32 -p cpuset=15 -p gpu=8 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='17' AND type='default'" -p cpu=3 -p core=17 -p cpuset=0 -p gpu=5 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='18' AND type='default'" -p cpu=3 -p core=18 -p cpuset=1 -p gpu=5 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='19' AND type='default'" -p cpu=3 -p core=19 -p cpuset=2 -p gpu=5 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='20' AND type='default'" -p cpu=3 -p core=20 -p cpuset=3 -p gpu=5 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='21' AND type='default'" -p cpu=3 -p core=21 -p cpuset=4 -p gpu=6 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='22' AND type='default'" -p cpu=3 -p core=22 -p cpuset=5 -p gpu=6 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='23' AND type='default'" -p cpu=3 -p core=23 -p cpuset=6 -p gpu=6 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='24' AND type='default'" -p cpu=3 -p core=24 -p cpuset=7 -p gpu=6 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='25' AND type='default'" -p cpu=4 -p core=25 -p cpuset=8 -p gpu=7 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='26' AND type='default'" -p cpu=4 -p core=26 -p cpuset=9 -p gpu=7 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='27' AND type='default'" -p cpu=4 -p core=27 -p cpuset=10 -p gpu=7 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='28' AND type='default'" -p cpu=4 -p core=28 -p cpuset=11 -p gpu=7 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='29' AND type='default'" -p cpu=4 -p core=29 -p cpuset=12 -p gpu=8 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='30' AND type='default'" -p cpu=4 -p core=30 -p cpuset=13 -p gpu=8 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='31' AND type='default'" -p cpu=4 -p core=31 -p cpuset=14 -p gpu=8 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='32' AND type='default'" -p cpu=4 -p core=32 -p cpuset=15 -p gpu=8 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 echo; echo 'Setting properties for clustera-2.fakesite.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' and type='default'" -p ip='172.16.64.2' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw-fakesite' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 9L1CBX2' -p eth_count=1 -p eth_kavlan_count=0 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='GeForce RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='NO' -p cluster_priority=201906 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
+oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' and type='default'" -p ip='172.16.64.2' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw-fakesite' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 9L1CBX2' -p eth_count=1 -p eth_kavlan_count=0 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='NO' -p cluster_priority=201906 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
 
 echo '================================================================================'
diff --git a/spec/output/with-data_table_stdout.txt b/spec/output/with-data_table_stdout.txt
index ff22c49a17b..78c01fb6074 100644
--- a/spec/output/with-data_table_stdout.txt
+++ b/spec/output/with-data_table_stdout.txt
@@ -1,36 +1,36 @@
 +---------- + -------------------- + ----- + ----- + -------- + ---- + -------------------- + ------------------------------ + ------------------------------+
 |   cluster | host                 | cpu   | core  | cpuset   | gpu  | gpudevice            | cpumodel                       | gpumodel                      |
 +---------- + -------------------- + ----- + ----- + -------- + ---- + -------------------- + ------------------------------ + ------------------------------+
-|  clustera | clustera-1           | 1     | 1     | 0        | 1    | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 1     | 2     | 1        | 1    | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 1     | 3     | 2        | 1    | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 1     | 4     | 3        | 1    | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 1     | 5     | 4        | 2    | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 1     | 6     | 5        | 2    | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 1     | 7     | 6        | 2    | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 1     | 8     | 7        | 2    | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 2     | 9     | 8        | 3    | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 2     | 10    | 9        | 3    | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 2     | 11    | 10       | 3    | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 2     | 12    | 11       | 3    | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 2     | 13    | 12       | 4    | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 2     | 14    | 13       | 4    | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 2     | 15    | 14       | 4    | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 2     | 16    | 15       | 4    | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 3     | 17    | 0        | 5    | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 3     | 18    | 1        | 5    | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 3     | 19    | 2        | 5    | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 3     | 20    | 3        | 5    | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 3     | 21    | 4        | 6    | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 3     | 22    | 5        | 6    | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 3     | 23    | 6        | 6    | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 3     | 24    | 7        | 6    | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 4     | 25    | 8        | 7    | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 4     | 26    | 9        | 7    | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 4     | 27    | 10       | 7    | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 4     | 28    | 11       | 7    | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 4     | 29    | 12       | 8    | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 4     | 30    | 13       | 8    | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 4     | 31    | 14       | 8    | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 4     | 32    | 15       | 8    | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
+|  clustera | clustera-1           | 1     | 1     | 0        | 1    | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 1     | 2     | 1        | 1    | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 1     | 3     | 2        | 1    | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 1     | 4     | 3        | 1    | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 1     | 5     | 4        | 2    | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 1     | 6     | 5        | 2    | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 1     | 7     | 6        | 2    | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 1     | 8     | 7        | 2    | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 2     | 9     | 8        | 3    | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 2     | 10    | 9        | 3    | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 2     | 11    | 10       | 3    | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 2     | 12    | 11       | 3    | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 2     | 13    | 12       | 4    | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 2     | 14    | 13       | 4    | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 2     | 15    | 14       | 4    | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 2     | 16    | 15       | 4    | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 3     | 17    | 0        | 5    | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 3     | 18    | 1        | 5    | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 3     | 19    | 2        | 5    | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 3     | 20    | 3        | 5    | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 3     | 21    | 4        | 6    | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 3     | 22    | 5        | 6    | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 3     | 23    | 6        | 6    | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 3     | 24    | 7        | 6    | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 4     | 25    | 8        | 7    | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 4     | 26    | 9        | 7    | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 4     | 27    | 10       | 7    | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 4     | 28    | 11       | 7    | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 4     | 29    | 12       | 8    | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 4     | 30    | 13       | 8    | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 4     | 31    | 14       | 8    | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 4     | 32    | 15       | 8    | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
 +---------- + -------------------- + ----- + ----- + -------- + ---- + -------------------- + ------------------------------ + ------------------------------+
diff --git a/spec/output/with_disk_misconfigured_resources_properties_and_disks_diff_stdout.txt b/spec/output/with_disk_misconfigured_resources_properties_and_disks_diff_stdout.txt
index 44da3436b90..8d250829f9b 100644
--- a/spec/output/with_disk_misconfigured_resources_properties_and_disks_diff_stdout.txt
+++ b/spec/output/with_disk_misconfigured_resources_properties_and_disks_diff_stdout.txt
@@ -18,7 +18,7 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "eth_rate", 10]
     ["+", "exotic", "NO"]
     ["+", "gpu_count", 4]
-    ["+", "gpu_model", "GeForce RTX 2080 Ti"]
+    ["+", "gpu_model", "NVIDIA GeForce RTX 2080 Ti"]
     ["+", "ib", "NO"]
     ["+", "ib_count", 0]
     ["+", "ib_rate", 0]
@@ -59,7 +59,7 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad
     ["+", "eth_rate", 10]
     ["+", "exotic", "NO"]
     ["+", "gpu_count", 4]
-    ["+", "gpu_model", "GeForce RTX 2080 Ti"]
+    ["+", "gpu_model", "NVIDIA GeForce RTX 2080 Ti"]
     ["+", "ib", "NO"]
     ["+", "ib_count", 0]
     ["+", "ib_rate", 0]
diff --git a/spec/output/with_disk_misconfigured_resources_properties_and_disks_print_stdout.txt b/spec/output/with_disk_misconfigured_resources_properties_and_disks_print_stdout.txt
index 1592cb5b00d..52357c13f7c 100644
--- a/spec/output/with_disk_misconfigured_resources_properties_and_disks_print_stdout.txt
+++ b/spec/output/with_disk_misconfigured_resources_properties_and_disks_print_stdout.txt
@@ -95,24 +95,24 @@ property_exist 'diskpath' || oarproperty -a diskpath --varchar
 ###################################
 # clustera-1.fakesite.grid5000.fr
 ###################################
-oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=5 -p core=33 -p cpuset=0 -p gpu=9 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=5 -p core=34 -p cpuset=1 -p gpu=9 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=5 -p core=35 -p cpuset=2 -p gpu=9 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=5 -p core=36 -p cpuset=3 -p gpu=9 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=5 -p core=37 -p cpuset=4 -p gpu=10 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=5 -p core=38 -p cpuset=5 -p gpu=10 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=5 -p core=39 -p cpuset=6 -p gpu=10 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=5 -p core=40 -p cpuset=7 -p gpu=10 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=6 -p core=41 -p cpuset=8 -p gpu=11 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=6 -p core=42 -p cpuset=9 -p gpu=11 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=6 -p core=43 -p cpuset=10 -p gpu=11 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=6 -p core=44 -p cpuset=11 -p gpu=11 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=6 -p core=45 -p cpuset=12 -p gpu=12 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=6 -p core=46 -p cpuset=13 -p gpu=12 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=6 -p core=47 -p cpuset=14 -p gpu=12 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=6 -p core=48 -p cpuset=15 -p gpu=12 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=5 -p core=33 -p cpuset=0 -p gpu=9 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=5 -p core=34 -p cpuset=1 -p gpu=9 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=5 -p core=35 -p cpuset=2 -p gpu=9 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=5 -p core=36 -p cpuset=3 -p gpu=9 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=5 -p core=37 -p cpuset=4 -p gpu=10 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=5 -p core=38 -p cpuset=5 -p gpu=10 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=5 -p core=39 -p cpuset=6 -p gpu=10 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=5 -p core=40 -p cpuset=7 -p gpu=10 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=6 -p core=41 -p cpuset=8 -p gpu=11 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=6 -p core=42 -p cpuset=9 -p gpu=11 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=6 -p core=43 -p cpuset=10 -p gpu=11 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=6 -p core=44 -p cpuset=11 -p gpu=11 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=6 -p core=45 -p cpuset=12 -p gpu=12 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=6 -p core=46 -p cpuset=13 -p gpu=12 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=6 -p core=47 -p cpuset=14 -p gpu=12 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting -a -h 'clustera-1.fakesite.grid5000.fr' -s Absent -p host='clustera-1.fakesite.grid5000.fr' -p cpu=6 -p core=48 -p cpuset=15 -p gpu=12 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 echo; echo 'Setting properties for clustera-1.fakesite.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' and type='default'" -p ip='172.16.64.1' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw-fakesite' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 FL1CBX2' -p eth_count=1 -p eth_kavlan_count=0 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='GeForce RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='NO' -p cluster_priority=201906 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
+oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' and type='default'" -p ip='172.16.64.1' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw-fakesite' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 FL1CBX2' -p eth_count=1 -p eth_kavlan_count=0 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='NO' -p cluster_priority=201906 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
 
 echo '================================================================================'
 
@@ -120,23 +120,23 @@ echo '==========================================================================
 ###################################
 # clustera-2.fakesite.grid5000.fr
 ###################################
-oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=7 -p core=49 -p cpuset=0 -p gpu=13 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=7 -p core=50 -p cpuset=1 -p gpu=13 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=7 -p core=51 -p cpuset=2 -p gpu=13 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=7 -p core=52 -p cpuset=3 -p gpu=13 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=7 -p core=53 -p cpuset=4 -p gpu=14 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=7 -p core=54 -p cpuset=5 -p gpu=14 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=7 -p core=55 -p cpuset=6 -p gpu=14 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=7 -p core=56 -p cpuset=7 -p gpu=14 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=8 -p core=57 -p cpuset=8 -p gpu=15 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=8 -p core=58 -p cpuset=9 -p gpu=15 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=8 -p core=59 -p cpuset=10 -p gpu=15 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=8 -p core=60 -p cpuset=11 -p gpu=15 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=8 -p core=61 -p cpuset=12 -p gpu=16 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=8 -p core=62 -p cpuset=13 -p gpu=16 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=8 -p core=63 -p cpuset=14 -p gpu=16 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=8 -p core=64 -p cpuset=15 -p gpu=16 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=7 -p core=49 -p cpuset=0 -p gpu=13 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=7 -p core=50 -p cpuset=1 -p gpu=13 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=7 -p core=51 -p cpuset=2 -p gpu=13 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=7 -p core=52 -p cpuset=3 -p gpu=13 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=7 -p core=53 -p cpuset=4 -p gpu=14 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=7 -p core=54 -p cpuset=5 -p gpu=14 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=7 -p core=55 -p cpuset=6 -p gpu=14 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=7 -p core=56 -p cpuset=7 -p gpu=14 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=8 -p core=57 -p cpuset=8 -p gpu=15 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=8 -p core=58 -p cpuset=9 -p gpu=15 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=8 -p core=59 -p cpuset=10 -p gpu=15 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=8 -p core=60 -p cpuset=11 -p gpu=15 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=8 -p core=61 -p cpuset=12 -p gpu=16 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=8 -p core=62 -p cpuset=13 -p gpu=16 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=8 -p core=63 -p cpuset=14 -p gpu=16 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=8 -p core=64 -p cpuset=15 -p gpu=16 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 echo; echo 'Setting properties for clustera-2.fakesite.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' and type='default'" -p ip='172.16.64.2' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw-fakesite' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 9L1CBX2' -p eth_count=1 -p eth_kavlan_count=0 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='GeForce RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='NO' -p cluster_priority=201906 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
+oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' and type='default'" -p ip='172.16.64.2' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw-fakesite' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 9L1CBX2' -p eth_count=1 -p eth_kavlan_count=0 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='NO' -p cluster_priority=201906 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
 
 echo '================================================================================'
diff --git a/spec/output/with_disk_misconfigured_resources_properties_and_disks_table_stdout.txt b/spec/output/with_disk_misconfigured_resources_properties_and_disks_table_stdout.txt
index 61ea618d71d..e74b511b992 100644
--- a/spec/output/with_disk_misconfigured_resources_properties_and_disks_table_stdout.txt
+++ b/spec/output/with_disk_misconfigured_resources_properties_and_disks_table_stdout.txt
@@ -1,36 +1,36 @@
 +---------- + -------------------- + ----- + ----- + -------- + ---- + -------------------- + ------------------------------ + ------------------------------+
 |   cluster | host                 | cpu   | core  | cpuset   | gpu  | gpudevice            | cpumodel                       | gpumodel                      |
 +---------- + -------------------- + ----- + ----- + -------- + ---- + -------------------- + ------------------------------ + ------------------------------+
-|  clustera | clustera-1           | 5     | 33    | 0        | 9    | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 5     | 34    | 1        | 9    | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 5     | 35    | 2        | 9    | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 5     | 36    | 3        | 9    | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 5     | 37    | 4        | 10   | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 5     | 38    | 5        | 10   | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 5     | 39    | 6        | 10   | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 5     | 40    | 7        | 10   | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 6     | 41    | 8        | 11   | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 6     | 42    | 9        | 11   | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 6     | 43    | 10       | 11   | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 6     | 44    | 11       | 11   | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 6     | 45    | 12       | 12   | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 6     | 46    | 13       | 12   | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 6     | 47    | 14       | 12   | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 6     | 48    | 15       | 12   | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 7     | 49    | 0        | 13   | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 7     | 50    | 1        | 13   | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 7     | 51    | 2        | 13   | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 7     | 52    | 3        | 13   | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 7     | 53    | 4        | 14   | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 7     | 54    | 5        | 14   | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 7     | 55    | 6        | 14   | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 7     | 56    | 7        | 14   | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 8     | 57    | 8        | 15   | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 8     | 58    | 9        | 15   | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 8     | 59    | 10       | 15   | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 8     | 60    | 11       | 15   | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 8     | 61    | 12       | 16   | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 8     | 62    | 13       | 16   | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 8     | 63    | 14       | 16   | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 8     | 64    | 15       | 16   | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
+|  clustera | clustera-1           | 5     | 33    | 0        | 9    | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 5     | 34    | 1        | 9    | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 5     | 35    | 2        | 9    | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 5     | 36    | 3        | 9    | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 5     | 37    | 4        | 10   | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 5     | 38    | 5        | 10   | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 5     | 39    | 6        | 10   | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 5     | 40    | 7        | 10   | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 6     | 41    | 8        | 11   | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 6     | 42    | 9        | 11   | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 6     | 43    | 10       | 11   | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 6     | 44    | 11       | 11   | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 6     | 45    | 12       | 12   | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 6     | 46    | 13       | 12   | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 6     | 47    | 14       | 12   | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 6     | 48    | 15       | 12   | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 7     | 49    | 0        | 13   | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 7     | 50    | 1        | 13   | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 7     | 51    | 2        | 13   | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 7     | 52    | 3        | 13   | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 7     | 53    | 4        | 14   | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 7     | 54    | 5        | 14   | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 7     | 55    | 6        | 14   | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 7     | 56    | 7        | 14   | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 8     | 57    | 8        | 15   | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 8     | 58    | 9        | 15   | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 8     | 59    | 10       | 15   | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 8     | 60    | 11       | 15   | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 8     | 61    | 12       | 16   | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 8     | 62    | 13       | 16   | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 8     | 63    | 14       | 16   | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 8     | 64    | 15       | 16   | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
 +---------- + -------------------- + ----- + ----- + -------- + ---- + -------------------- + ------------------------------ + ------------------------------+
diff --git a/spec/output/with_too_few_oar_resources_print_stdout.txt b/spec/output/with_too_few_oar_resources_print_stdout.txt
index 7bae3e45844..d9a8d0c6112 100644
--- a/spec/output/with_too_few_oar_resources_print_stdout.txt
+++ b/spec/output/with_too_few_oar_resources_print_stdout.txt
@@ -93,24 +93,24 @@ property_exist 'disk_reservation_count' || oarproperty -a disk_reservation_count
 ###################################
 # clustera-1.fakesite.grid5000.fr
 ###################################
-oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='1' AND type='default'" -p cpu=1 -p core=1 -p cpuset=0 -p gpu=1 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='2' AND type='default'" -p cpu=1 -p core=2 -p cpuset=1 -p gpu=1 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='3' AND type='default'" -p cpu=1 -p core=3 -p cpuset=2 -p gpu=1 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='4' AND type='default'" -p cpu=1 -p core=4 -p cpuset=3 -p gpu=1 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='5' AND type='default'" -p cpu=1 -p core=5 -p cpuset=4 -p gpu=2 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='6' AND type='default'" -p cpu=1 -p core=6 -p cpuset=5 -p gpu=2 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='7' AND type='default'" -p cpu=1 -p core=7 -p cpuset=6 -p gpu=2 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='8' AND type='default'" -p cpu=1 -p core=8 -p cpuset=7 -p gpu=2 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='9' AND type='default'" -p cpu=2 -p core=9 -p cpuset=8 -p gpu=3 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='10' AND type='default'" -p cpu=2 -p core=10 -p cpuset=9 -p gpu=3 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='11' AND type='default'" -p cpu=2 -p core=11 -p cpuset=10 -p gpu=3 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='12' AND type='default'" -p cpu=2 -p core=12 -p cpuset=11 -p gpu=3 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='13' AND type='default'" -p cpu=2 -p core=13 -p cpuset=12 -p gpu=4 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='14' AND type='default'" -p cpu=2 -p core=14 -p cpuset=13 -p gpu=4 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='15' AND type='default'" -p cpu=2 -p core=15 -p cpuset=14 -p gpu=4 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='16' AND type='default'" -p cpu=2 -p core=16 -p cpuset=15 -p gpu=4 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='1' AND type='default'" -p cpu=1 -p core=1 -p cpuset=0 -p gpu=1 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='2' AND type='default'" -p cpu=1 -p core=2 -p cpuset=1 -p gpu=1 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='3' AND type='default'" -p cpu=1 -p core=3 -p cpuset=2 -p gpu=1 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='4' AND type='default'" -p cpu=1 -p core=4 -p cpuset=3 -p gpu=1 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='5' AND type='default'" -p cpu=1 -p core=5 -p cpuset=4 -p gpu=2 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='6' AND type='default'" -p cpu=1 -p core=6 -p cpuset=5 -p gpu=2 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='7' AND type='default'" -p cpu=1 -p core=7 -p cpuset=6 -p gpu=2 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='8' AND type='default'" -p cpu=1 -p core=8 -p cpuset=7 -p gpu=2 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='9' AND type='default'" -p cpu=2 -p core=9 -p cpuset=8 -p gpu=3 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='10' AND type='default'" -p cpu=2 -p core=10 -p cpuset=9 -p gpu=3 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='11' AND type='default'" -p cpu=2 -p core=11 -p cpuset=10 -p gpu=3 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='12' AND type='default'" -p cpu=2 -p core=12 -p cpuset=11 -p gpu=3 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='13' AND type='default'" -p cpu=2 -p core=13 -p cpuset=12 -p gpu=4 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='14' AND type='default'" -p cpu=2 -p core=14 -p cpuset=13 -p gpu=4 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='15' AND type='default'" -p cpu=2 -p core=15 -p cpuset=14 -p gpu=4 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='16' AND type='default'" -p cpu=2 -p core=16 -p cpuset=15 -p gpu=4 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 echo; echo 'Setting properties for clustera-1.fakesite.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' and type='default'" -p ip='172.16.64.1' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw-fakesite' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 FL1CBX2' -p eth_count=1 -p eth_kavlan_count=0 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='GeForce RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='NO' -p cluster_priority=201906 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
+oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' and type='default'" -p ip='172.16.64.1' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw-fakesite' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 FL1CBX2' -p eth_count=1 -p eth_kavlan_count=0 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='NO' -p cluster_priority=201906 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
 
 echo '================================================================================'
 
@@ -118,23 +118,23 @@ echo '==========================================================================
 ###################################
 # clustera-2.fakesite.grid5000.fr
 ###################################
-oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='17' AND type='default'" -p cpu=3 -p core=17 -p cpuset=0 -p gpu=5 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='18' AND type='default'" -p cpu=3 -p core=18 -p cpuset=1 -p gpu=5 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='19' AND type='default'" -p cpu=3 -p core=19 -p cpuset=2 -p gpu=5 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='20' AND type='default'" -p cpu=3 -p core=20 -p cpuset=3 -p gpu=5 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='21' AND type='default'" -p cpu=3 -p core=21 -p cpuset=4 -p gpu=6 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='22' AND type='default'" -p cpu=3 -p core=22 -p cpuset=5 -p gpu=6 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='23' AND type='default'" -p cpu=3 -p core=23 -p cpuset=6 -p gpu=6 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='24' AND type='default'" -p cpu=3 -p core=24 -p cpuset=7 -p gpu=6 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='25' AND type='default'" -p cpu=4 -p core=25 -p cpuset=8 -p gpu=7 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='26' AND type='default'" -p cpu=4 -p core=26 -p cpuset=9 -p gpu=7 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='27' AND type='default'" -p cpu=4 -p core=27 -p cpuset=10 -p gpu=7 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='28' AND type='default'" -p cpu=4 -p core=28 -p cpuset=11 -p gpu=7 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='29' AND type='default'" -p cpu=4 -p core=29 -p cpuset=12 -p gpu=8 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='30' AND type='default'" -p cpu=4 -p core=30 -p cpuset=13 -p gpu=8 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='31' AND type='default'" -p cpu=4 -p core=31 -p cpuset=14 -p gpu=8 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=4 -p core=32 -p cpuset=15 -p gpu=8 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='17' AND type='default'" -p cpu=3 -p core=17 -p cpuset=0 -p gpu=5 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='18' AND type='default'" -p cpu=3 -p core=18 -p cpuset=1 -p gpu=5 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='19' AND type='default'" -p cpu=3 -p core=19 -p cpuset=2 -p gpu=5 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='20' AND type='default'" -p cpu=3 -p core=20 -p cpuset=3 -p gpu=5 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='21' AND type='default'" -p cpu=3 -p core=21 -p cpuset=4 -p gpu=6 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='22' AND type='default'" -p cpu=3 -p core=22 -p cpuset=5 -p gpu=6 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='23' AND type='default'" -p cpu=3 -p core=23 -p cpuset=6 -p gpu=6 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='24' AND type='default'" -p cpu=3 -p core=24 -p cpuset=7 -p gpu=6 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='25' AND type='default'" -p cpu=4 -p core=25 -p cpuset=8 -p gpu=7 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='26' AND type='default'" -p cpu=4 -p core=26 -p cpuset=9 -p gpu=7 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='27' AND type='default'" -p cpu=4 -p core=27 -p cpuset=10 -p gpu=7 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='28' AND type='default'" -p cpu=4 -p core=28 -p cpuset=11 -p gpu=7 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='29' AND type='default'" -p cpu=4 -p core=29 -p cpuset=12 -p gpu=8 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='30' AND type='default'" -p cpu=4 -p core=30 -p cpuset=13 -p gpu=8 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='31' AND type='default'" -p cpu=4 -p core=31 -p cpuset=14 -p gpu=8 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -s Absent -p host='clustera-2.fakesite.grid5000.fr' -p cpu=4 -p core=32 -p cpuset=15 -p gpu=8 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 echo; echo 'Setting properties for clustera-2.fakesite.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' and type='default'" -p ip='172.16.64.2' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw-fakesite' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 9L1CBX2' -p eth_count=1 -p eth_kavlan_count=0 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='GeForce RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='NO' -p cluster_priority=201906 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
+oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' and type='default'" -p ip='172.16.64.2' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw-fakesite' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 9L1CBX2' -p eth_count=1 -p eth_kavlan_count=0 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='NO' -p cluster_priority=201906 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
 
 echo '================================================================================'
diff --git a/spec/output/with_too_few_oar_resources_table_stdout.txt b/spec/output/with_too_few_oar_resources_table_stdout.txt
index ff22c49a17b..78c01fb6074 100644
--- a/spec/output/with_too_few_oar_resources_table_stdout.txt
+++ b/spec/output/with_too_few_oar_resources_table_stdout.txt
@@ -1,36 +1,36 @@
 +---------- + -------------------- + ----- + ----- + -------- + ---- + -------------------- + ------------------------------ + ------------------------------+
 |   cluster | host                 | cpu   | core  | cpuset   | gpu  | gpudevice            | cpumodel                       | gpumodel                      |
 +---------- + -------------------- + ----- + ----- + -------- + ---- + -------------------- + ------------------------------ + ------------------------------+
-|  clustera | clustera-1           | 1     | 1     | 0        | 1    | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 1     | 2     | 1        | 1    | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 1     | 3     | 2        | 1    | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 1     | 4     | 3        | 1    | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 1     | 5     | 4        | 2    | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 1     | 6     | 5        | 2    | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 1     | 7     | 6        | 2    | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 1     | 8     | 7        | 2    | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 2     | 9     | 8        | 3    | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 2     | 10    | 9        | 3    | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 2     | 11    | 10       | 3    | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 2     | 12    | 11       | 3    | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 2     | 13    | 12       | 4    | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 2     | 14    | 13       | 4    | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 2     | 15    | 14       | 4    | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 2     | 16    | 15       | 4    | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 3     | 17    | 0        | 5    | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 3     | 18    | 1        | 5    | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 3     | 19    | 2        | 5    | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 3     | 20    | 3        | 5    | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 3     | 21    | 4        | 6    | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 3     | 22    | 5        | 6    | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 3     | 23    | 6        | 6    | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 3     | 24    | 7        | 6    | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 4     | 25    | 8        | 7    | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 4     | 26    | 9        | 7    | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 4     | 27    | 10       | 7    | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 4     | 28    | 11       | 7    | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 4     | 29    | 12       | 8    | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 4     | 30    | 13       | 8    | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 4     | 31    | 14       | 8    | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 4     | 32    | 15       | 8    | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
+|  clustera | clustera-1           | 1     | 1     | 0        | 1    | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 1     | 2     | 1        | 1    | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 1     | 3     | 2        | 1    | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 1     | 4     | 3        | 1    | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 1     | 5     | 4        | 2    | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 1     | 6     | 5        | 2    | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 1     | 7     | 6        | 2    | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 1     | 8     | 7        | 2    | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 2     | 9     | 8        | 3    | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 2     | 10    | 9        | 3    | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 2     | 11    | 10       | 3    | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 2     | 12    | 11       | 3    | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 2     | 13    | 12       | 4    | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 2     | 14    | 13       | 4    | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 2     | 15    | 14       | 4    | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 2     | 16    | 15       | 4    | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 3     | 17    | 0        | 5    | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 3     | 18    | 1        | 5    | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 3     | 19    | 2        | 5    | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 3     | 20    | 3        | 5    | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 3     | 21    | 4        | 6    | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 3     | 22    | 5        | 6    | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 3     | 23    | 6        | 6    | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 3     | 24    | 7        | 6    | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 4     | 25    | 8        | 7    | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 4     | 26    | 9        | 7    | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 4     | 27    | 10       | 7    | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 4     | 28    | 11       | 7    | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 4     | 29    | 12       | 8    | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 4     | 30    | 13       | 8    | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 4     | 31    | 14       | 8    | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 4     | 32    | 15       | 8    | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
 +---------- + -------------------- + ----- + ----- + -------- + ---- + -------------------- + ------------------------------ + ------------------------------+
diff --git a/spec/output/wrong_variable_type_print_stdout.txt b/spec/output/wrong_variable_type_print_stdout.txt
index db086ef26b1..3722dfbd9eb 100644
--- a/spec/output/wrong_variable_type_print_stdout.txt
+++ b/spec/output/wrong_variable_type_print_stdout.txt
@@ -93,24 +93,24 @@ property_exist 'disk_reservation_count' || oarproperty -a disk_reservation_count
 ###################################
 # clustera-1.fakesite.grid5000.fr
 ###################################
-oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='1' AND type='default'" -p cpu=1 -p core=1 -p cpuset=0 -p gpu=1 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='2' AND type='default'" -p cpu=1 -p core=2 -p cpuset=1 -p gpu=1 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='3' AND type='default'" -p cpu=1 -p core=3 -p cpuset=2 -p gpu=1 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='4' AND type='default'" -p cpu=1 -p core=4 -p cpuset=3 -p gpu=1 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='5' AND type='default'" -p cpu=1 -p core=5 -p cpuset=4 -p gpu=2 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='6' AND type='default'" -p cpu=1 -p core=6 -p cpuset=5 -p gpu=2 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='7' AND type='default'" -p cpu=1 -p core=7 -p cpuset=6 -p gpu=2 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='8' AND type='default'" -p cpu=1 -p core=8 -p cpuset=7 -p gpu=2 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='9' AND type='default'" -p cpu=2 -p core=9 -p cpuset=8 -p gpu=3 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='10' AND type='default'" -p cpu=2 -p core=10 -p cpuset=9 -p gpu=3 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='11' AND type='default'" -p cpu=2 -p core=11 -p cpuset=10 -p gpu=3 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='12' AND type='default'" -p cpu=2 -p core=12 -p cpuset=11 -p gpu=3 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='13' AND type='default'" -p cpu=2 -p core=13 -p cpuset=12 -p gpu=4 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='14' AND type='default'" -p cpu=2 -p core=14 -p cpuset=13 -p gpu=4 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='15' AND type='default'" -p cpu=2 -p core=15 -p cpuset=14 -p gpu=4 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='16' AND type='default'" -p cpu=2 -p core=16 -p cpuset=15 -p gpu=4 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='1' AND type='default'" -p cpu=1 -p core=1 -p cpuset=0 -p gpu=1 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='2' AND type='default'" -p cpu=1 -p core=2 -p cpuset=1 -p gpu=1 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='3' AND type='default'" -p cpu=1 -p core=3 -p cpuset=2 -p gpu=1 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='4' AND type='default'" -p cpu=1 -p core=4 -p cpuset=3 -p gpu=1 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='5' AND type='default'" -p cpu=1 -p core=5 -p cpuset=4 -p gpu=2 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='6' AND type='default'" -p cpu=1 -p core=6 -p cpuset=5 -p gpu=2 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='7' AND type='default'" -p cpu=1 -p core=7 -p cpuset=6 -p gpu=2 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='8' AND type='default'" -p cpu=1 -p core=8 -p cpuset=7 -p gpu=2 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='9' AND type='default'" -p cpu=2 -p core=9 -p cpuset=8 -p gpu=3 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='10' AND type='default'" -p cpu=2 -p core=10 -p cpuset=9 -p gpu=3 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='11' AND type='default'" -p cpu=2 -p core=11 -p cpuset=10 -p gpu=3 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='12' AND type='default'" -p cpu=2 -p core=12 -p cpuset=11 -p gpu=3 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='13' AND type='default'" -p cpu=2 -p core=13 -p cpuset=12 -p gpu=4 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='14' AND type='default'" -p cpu=2 -p core=14 -p cpuset=13 -p gpu=4 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='15' AND type='default'" -p cpu=2 -p core=15 -p cpuset=14 -p gpu=4 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' AND resource_id='16' AND type='default'" -p cpu=2 -p core=16 -p cpuset=15 -p gpu=4 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 echo; echo 'Setting properties for clustera-1.fakesite.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' and type='default'" -p ip='172.16.64.1' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw-fakesite' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 FL1CBX2' -p eth_count=1 -p eth_kavlan_count=0 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='GeForce RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='NO' -p cluster_priority=201906 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
+oarnodesetting --sql "host='clustera-1.fakesite.grid5000.fr' and type='default'" -p ip='172.16.64.1' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw-fakesite' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 FL1CBX2' -p eth_count=1 -p eth_kavlan_count=0 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='NO' -p cluster_priority=201906 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
 
 echo '================================================================================'
 
@@ -118,23 +118,23 @@ echo '==========================================================================
 ###################################
 # clustera-2.fakesite.grid5000.fr
 ###################################
-oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='17' AND type='default'" -p cpu=3 -p core=17 -p cpuset=0 -p gpu=5 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='18' AND type='default'" -p cpu=3 -p core=18 -p cpuset=1 -p gpu=5 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='19' AND type='default'" -p cpu=3 -p core=19 -p cpuset=2 -p gpu=5 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='20' AND type='default'" -p cpu=3 -p core=20 -p cpuset=3 -p gpu=5 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
-oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='21' AND type='default'" -p cpu=3 -p core=21 -p cpuset=4 -p gpu=6 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='22' AND type='default'" -p cpu=3 -p core=22 -p cpuset=5 -p gpu=6 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='23' AND type='default'" -p cpu=3 -p core=23 -p cpuset=6 -p gpu=6 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='24' AND type='default'" -p cpu=3 -p core=24 -p cpuset=7 -p gpu=6 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
-oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='25' AND type='default'" -p cpu=4 -p core=25 -p cpuset=8 -p gpu=7 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='26' AND type='default'" -p cpu=4 -p core=26 -p cpuset=9 -p gpu=7 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='27' AND type='default'" -p cpu=4 -p core=27 -p cpuset=10 -p gpu=7 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='28' AND type='default'" -p cpu=4 -p core=28 -p cpuset=11 -p gpu=7 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
-oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='29' AND type='default'" -p cpu=4 -p core=29 -p cpuset=12 -p gpu=8 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='30' AND type='default'" -p cpu=4 -p core=30 -p cpuset=13 -p gpu=8 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='31' AND type='default'" -p cpu=4 -p core=31 -p cpuset=14 -p gpu=8 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
-oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='32' AND type='default'" -p cpu=4 -p core=32 -p cpuset=15 -p gpu=8 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='17' AND type='default'" -p cpu=3 -p core=17 -p cpuset=0 -p gpu=5 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='18' AND type='default'" -p cpu=3 -p core=18 -p cpuset=1 -p gpu=5 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='19' AND type='default'" -p cpu=3 -p core=19 -p cpuset=2 -p gpu=5 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='20' AND type='default'" -p cpu=3 -p core=20 -p cpuset=3 -p gpu=5 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=0 # This GPU is mapped on /dev/nvidia0
+oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='21' AND type='default'" -p cpu=3 -p core=21 -p cpuset=4 -p gpu=6 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='22' AND type='default'" -p cpu=3 -p core=22 -p cpuset=5 -p gpu=6 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='23' AND type='default'" -p cpu=3 -p core=23 -p cpuset=6 -p gpu=6 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='24' AND type='default'" -p cpu=3 -p core=24 -p cpuset=7 -p gpu=6 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=1 # This GPU is mapped on /dev/nvidia1
+oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='25' AND type='default'" -p cpu=4 -p core=25 -p cpuset=8 -p gpu=7 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='26' AND type='default'" -p cpu=4 -p core=26 -p cpuset=9 -p gpu=7 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='27' AND type='default'" -p cpu=4 -p core=27 -p cpuset=10 -p gpu=7 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='28' AND type='default'" -p cpu=4 -p core=28 -p cpuset=11 -p gpu=7 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=2 # This GPU is mapped on /dev/nvidia2
+oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='29' AND type='default'" -p cpu=4 -p core=29 -p cpuset=12 -p gpu=8 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='30' AND type='default'" -p cpu=4 -p core=30 -p cpuset=13 -p gpu=8 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='31' AND type='default'" -p cpu=4 -p core=31 -p cpuset=14 -p gpu=8 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
+oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='32' AND type='default'" -p cpu=4 -p core=32 -p cpuset=15 -p gpu=8 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
 echo; echo 'Setting properties for clustera-2.fakesite.grid5000.fr:'; echo
-oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' and type='default'" -p ip='172.16.64.2' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw-fakesite' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 9L1CBX2' -p eth_count=1 -p eth_kavlan_count=0 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='GeForce RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='NO' -p cluster_priority=201906 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
+oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' and type='default'" -p ip='172.16.64.2' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw-fakesite' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cpu_count=2 -p core_count=16 -p thread_count=32 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA/SSD' -p chassis='Dell Inc. PowerEdge T640 9L1CBX2' -p eth_count=1 -p eth_kavlan_count=0 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_model='NVIDIA GeForce RTX 2080 Ti' -p gpu_count=4 -p exotic='NO' -p mic='NO' -p wattmeter='NO' -p cluster_priority=201906 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
 
 echo '================================================================================'
diff --git a/spec/output/wrong_variable_type_table_stdout.txt b/spec/output/wrong_variable_type_table_stdout.txt
index ff22c49a17b..78c01fb6074 100644
--- a/spec/output/wrong_variable_type_table_stdout.txt
+++ b/spec/output/wrong_variable_type_table_stdout.txt
@@ -1,36 +1,36 @@
 +---------- + -------------------- + ----- + ----- + -------- + ---- + -------------------- + ------------------------------ + ------------------------------+
 |   cluster | host                 | cpu   | core  | cpuset   | gpu  | gpudevice            | cpumodel                       | gpumodel                      |
 +---------- + -------------------- + ----- + ----- + -------- + ---- + -------------------- + ------------------------------ + ------------------------------+
-|  clustera | clustera-1           | 1     | 1     | 0        | 1    | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 1     | 2     | 1        | 1    | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 1     | 3     | 2        | 1    | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 1     | 4     | 3        | 1    | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 1     | 5     | 4        | 2    | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 1     | 6     | 5        | 2    | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 1     | 7     | 6        | 2    | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 1     | 8     | 7        | 2    | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 2     | 9     | 8        | 3    | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 2     | 10    | 9        | 3    | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 2     | 11    | 10       | 3    | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 2     | 12    | 11       | 3    | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 2     | 13    | 12       | 4    | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 2     | 14    | 13       | 4    | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 2     | 15    | 14       | 4    | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-1           | 2     | 16    | 15       | 4    | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 3     | 17    | 0        | 5    | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 3     | 18    | 1        | 5    | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 3     | 19    | 2        | 5    | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 3     | 20    | 3        | 5    | 0                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 3     | 21    | 4        | 6    | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 3     | 22    | 5        | 6    | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 3     | 23    | 6        | 6    | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 3     | 24    | 7        | 6    | 1                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 4     | 25    | 8        | 7    | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 4     | 26    | 9        | 7    | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 4     | 27    | 10       | 7    | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 4     | 28    | 11       | 7    | 2                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 4     | 29    | 12       | 8    | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 4     | 30    | 13       | 8    | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 4     | 31    | 14       | 8    | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
-|  clustera | clustera-2           | 4     | 32    | 15       | 8    | 3                    | Intel Xeon Silver 4110         | GeForce RTX 2080 Ti           |
+|  clustera | clustera-1           | 1     | 1     | 0        | 1    | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 1     | 2     | 1        | 1    | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 1     | 3     | 2        | 1    | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 1     | 4     | 3        | 1    | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 1     | 5     | 4        | 2    | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 1     | 6     | 5        | 2    | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 1     | 7     | 6        | 2    | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 1     | 8     | 7        | 2    | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 2     | 9     | 8        | 3    | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 2     | 10    | 9        | 3    | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 2     | 11    | 10       | 3    | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 2     | 12    | 11       | 3    | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 2     | 13    | 12       | 4    | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 2     | 14    | 13       | 4    | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 2     | 15    | 14       | 4    | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-1           | 2     | 16    | 15       | 4    | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 3     | 17    | 0        | 5    | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 3     | 18    | 1        | 5    | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 3     | 19    | 2        | 5    | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 3     | 20    | 3        | 5    | 0                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 3     | 21    | 4        | 6    | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 3     | 22    | 5        | 6    | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 3     | 23    | 6        | 6    | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 3     | 24    | 7        | 6    | 1                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 4     | 25    | 8        | 7    | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 4     | 26    | 9        | 7    | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 4     | 27    | 10       | 7    | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 4     | 28    | 11       | 7    | 2                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 4     | 29    | 12       | 8    | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 4     | 30    | 13       | 8    | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 4     | 31    | 14       | 8    | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
+|  clustera | clustera-2           | 4     | 32    | 15       | 8    | 3                    | Intel Xeon Silver 4110         | NVIDIA GeForce RTX 2080 Ti    |
 +---------- + -------------------- + ----- + ----- + -------- + ---- + -------------------- + ------------------------------ + ------------------------------+
diff --git a/spec/stub_oar_properties/load_data_hierarchy_stubbed_data.json b/spec/stub_oar_properties/load_data_hierarchy_stubbed_data.json
index 1f67404c1c4..8e7fbd97bc0 100644
--- a/spec/stub_oar_properties/load_data_hierarchy_stubbed_data.json
+++ b/spec/stub_oar_properties/load_data_hierarchy_stubbed_data.json
@@ -34,7 +34,7 @@
                   "cpu_affinity": 0,
                   "device": "/dev/nvidia0",
                   "memory": 10989000000,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.17.00.B2",
                   "vendor": "Nvidia"
@@ -43,7 +43,7 @@
                   "cpu_affinity": 0,
                   "device": "/dev/nvidia1",
                   "memory": 10989000000,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.17.00.B2",
                   "vendor": "Nvidia"
@@ -52,7 +52,7 @@
                   "cpu_affinity": 1,
                   "device": "/dev/nvidia2",
                   "memory": 10989000000,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.0B.40.09",
                   "vendor": "Nvidia"
@@ -61,7 +61,7 @@
                   "cpu_affinity": 1,
                   "device": "/dev/nvidia3",
                   "memory": 10989000000,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.17.00.B2",
                   "vendor": "Nvidia"
@@ -241,7 +241,7 @@
                   "cpu_affinity": 0,
                   "device": "/dev/nvidia0",
                   "memory": 10989000000,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.17.00.B2",
                   "vendor": "Nvidia"
@@ -250,7 +250,7 @@
                   "cpu_affinity": 0,
                   "device": "/dev/nvidia1",
                   "memory": 10989000000,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.0B.40.09",
                   "vendor": "Nvidia"
@@ -259,7 +259,7 @@
                   "cpu_affinity": 1,
                   "device": "/dev/nvidia2",
                   "memory": 10989000000,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.0B.40.09",
                   "vendor": "Nvidia"
@@ -268,7 +268,7 @@
                   "cpu_affinity": 1,
                   "device": "/dev/nvidia3",
                   "memory": 10989000000,
-                  "model": "GeForce RTX 2080 Ti",
+                  "model": "NVIDIA GeForce RTX 2080 Ti",
                   "power_default_limit": "250.00 W",
                   "vbios_version": "90.02.17.00.AC",
                   "vendor": "Nvidia"
-- 
GitLab