From 555e2643e217f6f3b94c990d98ef778219ba0d82 Mon Sep 17 00:00:00 2001
From: Jonathan Pastor <jonathancmoa@gmail.com>
Date: Fri, 13 Dec 2019 15:46:40 +0100
Subject: [PATCH] remove OPA property
---
lib/refrepo/gen/oar-properties.rb | 1 -
spec/oar_properties_spec.rb | 29 ++++-------
.../dump_oar_api_configured_server.json | 36 +-------------
...red_server_duplicated_cpus_cores_gpus.json | 36 +-------------
...configured_server_misconfigured_cores.json | 38 ---------------
...i_configured_server_misconfigured_gpu.json | 36 +-------------
...rver_misconfigured_non_reservable_gpu.json | 36 +-------------
...pi_configured_server_missing_property.json | 36 +-------------
...r_api_configured_server_quirk_cluster.json | 38 ---------------
...ar_api_configured_server_to_test_diff.json | 36 +-------------
...p_oar_api_configured_server_with_disk.json | 48 ++-----------------
...igured_resources_properties_and_disks.json | 48 ++-----------------
...red_server_with_too_few_oar_resources.json | 35 +-------------
...ed_server_with_too_many_oar_resources.json | 37 +-------------
...oar_api_configured_server_without_gpu.json | 38 ---------------
...r_api_configured_server_wrong_vartype.json | 36 +-------------
16 files changed, 38 insertions(+), 526 deletions(-)
diff --git a/lib/refrepo/gen/oar-properties.rb b/lib/refrepo/gen/oar-properties.rb
index 0f303252ad2..52d01f99ad3 100644
--- a/lib/refrepo/gen/oar-properties.rb
+++ b/lib/refrepo/gen/oar-properties.rb
@@ -431,7 +431,6 @@ def get_ref_node_properties_internal(cluster_uid, cluster, node_uid, node)
h['opa_count'] = ni_mountable.length
h['opa_rate'] = ni_mountable.length > 0 ? ni_fastest['rate'] / 1_000_000_000 : 0
- h['opa'] = h['opa_count'] > 0
puts "#{node_uid}: Warning - no rate info for the opa interface" if h['opa_count'] > 0 && h['opa_rate'] == 0
diff --git a/spec/oar_properties_spec.rb b/spec/oar_properties_spec.rb
index 721863bcf48..db628c3b794 100644
--- a/spec/oar_properties_spec.rb
+++ b/spec/oar_properties_spec.rb
@@ -222,7 +222,7 @@ oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -p host='clustera-2.fakes
oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -p host='clustera-2.fakesite.grid5000.fr' -p cpu=4 -p core=32 -p cpuset=15 -p gpu=8 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
TXT
expected_clustera3_cmds = <<-TXT
-oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' and type='default'" -p ip='172.16.64.2' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw-fakesite' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p opa='NO' -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_count=4 -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
+oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' and type='default'" -p ip='172.16.64.2' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw-fakesite' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_count=4 -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
TXT
generator_output = capture do
@@ -282,7 +282,6 @@ TXT
["+", "myri_count", 0]
["+", "myri_rate", 0]
["+", "nodemodel", "Dell PowerEdge T640"]
- ["+", "opa", "NO"]
["+", "opa_count", 0]
["+", "opa_rate", 0]
["+", "production", "YES"]
@@ -320,7 +319,6 @@ TXT
["+", "myri_count", 0]
["+", "myri_rate", 0]
["+", "nodemodel", "Dell PowerEdge T640"]
- ["+", "opa", "NO"]
["+", "opa_count", 0]
["+", "opa_rate", 0]
["+", "production", "YES"]
@@ -445,7 +443,7 @@ oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' AND resource_id='21
TXT
expected_clustera3_cmds = <<-TXT
-oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' and type='default'" -p ip='172.16.64.2' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw-fakesite' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p opa='NO' -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_count=4 -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
+oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' and type='default'" -p ip='172.16.64.2' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw-fakesite' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_count=4 -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
TXT
generator_output = capture do
@@ -652,7 +650,7 @@ oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -p host='clustera-2.fakes
oarnodesetting -a -h 'clustera-2.fakesite.grid5000.fr' -p host='clustera-2.fakesite.grid5000.fr' -p cpu=4 -p core=32 -p cpuset=15 -p gpu=8 -p gpu_model='GeForce RTX 2080 Ti' -p gpudevice=3 # This GPU is mapped on /dev/nvidia3
TXT
expected_clustera3_cmds = <<-TXT
-oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' and type='default'" -p ip='172.16.64.2' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw-fakesite' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p opa='NO' -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_count=4 -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
+oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' and type='default'" -p ip='172.16.64.2' -p cluster='clustera' -p nodemodel='Dell PowerEdge T640' -p switch='gw-fakesite' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_count=4 -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=0
TXT
generator_output = capture do
@@ -712,7 +710,6 @@ oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' and type='default'"
["+", "myri_count", 0]
["+", "myri_rate", 0]
["+", "nodemodel", "Dell PowerEdge T640"]
- ["+", "opa", "NO"]
["+", "opa_count", 0]
["+", "opa_rate", 0]
["+", "production", "YES"]
@@ -750,7 +747,6 @@ oarnodesetting --sql "host='clustera-2.fakesite.grid5000.fr' and type='default'"
["+", "myri_count", 0]
["+", "myri_rate", 0]
["+", "nodemodel", "Dell PowerEdge T640"]
- ["+", "opa", "NO"]
["+", "opa_count", 0]
["+", "opa_rate", 0]
["+", "production", "YES"]
@@ -876,7 +872,7 @@ oarnodesetting -a -h 'clusterb-2.fakesite.grid5000.fr' -p host='clusterb-2.fakes
TXT
expected_clusterb3_cmds = <<-TXT
-oarnodesetting --sql "host='clusterb-2.fakesite.grid5000.fr' and type='default'" -p ip='172.16.64.2' -p cluster='clusterb' -p nodemodel='Dell PowerEdge T640' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p opa='NO' -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_count=4 -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=3
+oarnodesetting --sql "host='clusterb-2.fakesite.grid5000.fr' and type='default'" -p ip='172.16.64.2' -p cluster='clusterb' -p nodemodel='Dell PowerEdge T640' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_count=4 -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=3
TXT
expected_clusterb4_cmds = <<-TXT
@@ -947,7 +943,6 @@ TXT
["+", "myri_count", 0]
["+", "myri_rate", 0]
["+", "nodemodel", "Dell PowerEdge T640"]
- ["+", "opa", "NO"]
["+", "opa_count", 0]
["+", "opa_rate", 0]
["+", "production", "YES"]
@@ -985,7 +980,6 @@ TXT
["+", "myri_count", 0]
["+", "myri_rate", 0]
["+", "nodemodel", "Dell PowerEdge T640"]
- ["+", "opa", "NO"]
["+", "opa_count", 0]
["+", "opa_rate", 0]
["+", "production", "YES"]
@@ -1193,7 +1187,7 @@ oarnodesetting --sql "host='clusterb-2.fakesite.grid5000.fr' AND resource_id='35
TXT
expected_clusterb3_cmds = <<-TXT
-oarnodesetting --sql "host='clusterb-2.fakesite.grid5000.fr' and type='default'" -p ip='172.16.64.2' -p cluster='clusterb' -p nodemodel='Dell PowerEdge T640' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p opa='NO' -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_count=4 -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=3
+oarnodesetting --sql "host='clusterb-2.fakesite.grid5000.fr' and type='default'" -p ip='172.16.64.2' -p cluster='clusterb' -p nodemodel='Dell PowerEdge T640' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_count=4 -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=3
TXT
generator_output = capture do
@@ -1354,7 +1348,7 @@ oarnodesetting -a -h 'clusterc-2.fakesite.grid5000.fr' -p host='clusterc-2.fakes
oarnodesetting -a -h 'clusterc-2.fakesite.grid5000.fr' -p host='clusterc-2.fakesite.grid5000.fr' -p cpu=4 -p core=32 -p cpuset=15
TXT
expected_clusterc3_cmds = <<-TXT
-oarnodesetting --sql "host='clusterc-2.fakesite.grid5000.fr' and type='default'" -p ip='172.16.64.2' -p cluster='clusterc' -p nodemodel='Dell PowerEdge T640' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p opa='NO' -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_count=0 -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=3
+oarnodesetting --sql "host='clusterc-2.fakesite.grid5000.fr' and type='default'" -p ip='172.16.64.2' -p cluster='clusterc' -p nodemodel='Dell PowerEdge T640' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_count=0 -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=3
TXT
@@ -1415,7 +1409,6 @@ TXT
["+", "myri_count", 0]
["+", "myri_rate", 0]
["+", "nodemodel", "Dell PowerEdge T640"]
- ["+", "opa", "NO"]
["+", "opa_count", 0]
["+", "opa_rate", 0]
["+", "production", "YES"]
@@ -1453,7 +1446,6 @@ TXT
["+", "myri_count", 0]
["+", "myri_rate", 0]
["+", "nodemodel", "Dell PowerEdge T640"]
- ["+", "opa", "NO"]
["+", "opa_count", 0]
["+", "opa_rate", 0]
["+", "production", "YES"]
@@ -1571,7 +1563,7 @@ oarnodesetting --sql "host='clusterc-2.fakesite.grid5000.fr' AND resource_id='34
oarnodesetting --sql "host='clusterc-2.fakesite.grid5000.fr' AND resource_id='35' AND type='default'" -p cpu=4 -p core=32 -p cpuset=15
TXT
expected_clusterc3_cmds = <<-TXT
-oarnodesetting --sql "host='clusterc-2.fakesite.grid5000.fr' and type='default'" -p ip='172.16.64.2' -p cluster='clusterc' -p nodemodel='Dell PowerEdge T640' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p opa='NO' -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_count=0 -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=3
+oarnodesetting --sql "host='clusterc-2.fakesite.grid5000.fr' and type='default'" -p ip='172.16.64.2' -p cluster='clusterc' -p nodemodel='Dell PowerEdge T640' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_count=0 -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=3
TXT
generator_output = capture do
@@ -1726,7 +1718,7 @@ oarnodesetting --sql "host='clusterc-2.fakesite.grid5000.fr' AND resource_id='34
oarnodesetting --sql "host='clusterc-2.fakesite.grid5000.fr' AND resource_id='35' AND type='default'" -p cpu=4 -p core=32 -p cpuset=15
TXT
expected_clusterc3_cmds = <<-TXT
-oarnodesetting --sql "host='clusterc-2.fakesite.grid5000.fr' and type='default'" -p ip='172.16.64.2' -p cluster='clusterc' -p nodemodel='Dell PowerEdge T640' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p opa='NO' -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_count=0 -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=3
+oarnodesetting --sql "host='clusterc-2.fakesite.grid5000.fr' and type='default'" -p ip='172.16.64.2' -p cluster='clusterc' -p nodemodel='Dell PowerEdge T640' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_count=0 -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=3
TXT
generator_output = capture do
@@ -2141,7 +2133,6 @@ Properties that need to be created on the fakesite server: ib_rate
"ib": "NO",
"opa_count": 0,
"opa_rate": 0,
- "opa": "NO",
"myri_count": 0,
"myri_rate": 0,
"myri": "NO",
@@ -2396,11 +2387,11 @@ CORE has an unexpected number of resources (current:31 vs expected:32).
}
expected_output = <<-TXT
-oarnodesetting --sql "host='clusterb-2.fakesite.grid5000.fr' and type='default'" -p ip='172.16.64.2' -p cluster='clusterb' -p nodemodel='Dell PowerEdge T640' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p opa='NO' -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_count=4 -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=3
+oarnodesetting --sql "host='clusterb-2.fakesite.grid5000.fr' and type='default'" -p ip='172.16.64.2' -p cluster='clusterb' -p nodemodel='Dell PowerEdge T640' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_count=4 -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=3
TXT
expected_output2 = <<-TXT
-oarnodesetting --sql "host='clusterb-1.fakesite.grid5000.fr' and type='default'" -p ip='172.16.64.1' -p cluster='clusterb' -p nodemodel='Dell PowerEdge T640' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p opa='NO' -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_count=4 -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=3
+oarnodesetting --sql "host='clusterb-1.fakesite.grid5000.fr' and type='default'" -p ip='172.16.64.1' -p cluster='clusterb' -p nodemodel='Dell PowerEdge T640' -p besteffort='YES' -p deploy='YES' -p virtual='ivt' -p cpuarch='x86_64' -p cpucore=8 -p cputype='Intel Xeon Silver 4110' -p cpufreq='2.1' -p disktype='SATA' -p eth_count=1 -p eth_rate=10 -p ib_count=0 -p ib_rate=0 -p ib='NO' -p opa_count=0 -p opa_rate=0 -p myri_count=0 -p myri_rate=0 -p myri='NO' -p memcore=8192 -p memcpu=65536 -p memnode=131072 -p gpu_count=4 -p mic='NO' -p wattmeter='MULTIPLE' -p cluster_priority=201906 -p max_walltime=86400 -p production='YES' -p maintenance='NO' -p disk_reservation_count=3
TXT
expected_output3 = <<-TXT
diff --git a/spec/stub_oar_properties/dump_oar_api_configured_server.json b/spec/stub_oar_properties/dump_oar_api_configured_server.json
index fdc333946af..e4ee34e26bf 100644
--- a/spec/stub_oar_properties/dump_oar_api_configured_server.json
+++ b/spec/stub_oar_properties/dump_oar_api_configured_server.json
@@ -42,7 +42,6 @@
"opa_rate": 0,
"desktop_computing": "NO",
"memnode": 131072,
- "opa": "NO",
"eth_rate": 10,
"last_job_date": 0,
"wattmeter": "MULTIPLE",
@@ -81,7 +80,6 @@
{
"last_job_date": 0,
"eth_rate": 10,
- "opa": "NO",
"memnode": 131072,
"desktop_computing": "NO",
"opa_rate": 0,
@@ -192,7 +190,6 @@
"opa_rate": 0,
"last_job_date": 0,
"eth_rate": 10,
- "opa": "NO",
"cpuset": 2,
"links": [
{
@@ -292,7 +289,6 @@
"opa_rate": 0,
"last_job_date": 0,
"eth_rate": 10,
- "opa": "NO",
"last_available_upto": 0,
"finaud_decision": "NO",
"api_timestamp": 1568902577,
@@ -307,7 +303,6 @@
"state": "Alive"
},
{
- "opa": "NO",
"eth_rate": 10,
"last_job_date": 0,
"opa_rate": 0,
@@ -409,7 +404,6 @@
"besteffort": "YES",
"last_job_date": 0,
"eth_rate": 10,
- "opa": "NO",
"memnode": 131072,
"desktop_computing": "NO",
"opa_rate": 0,
@@ -475,7 +469,6 @@
"memnode": 131072,
"opa_rate": 0,
"last_job_date": 0,
- "opa": "NO",
"eth_rate": 10,
"available_upto": 2147483647,
"links": [
@@ -572,7 +565,6 @@
"besteffort": "YES",
"ib_rate": 0,
"last_job_date": 0,
- "opa": "NO",
"eth_rate": 10,
"desktop_computing": "NO",
"memnode": 131072,
@@ -650,7 +642,6 @@
"opa_rate": 0,
"desktop_computing": "NO",
"memnode": 131072,
- "opa": "NO",
"eth_rate": 10,
"last_job_date": 0,
"wattmeter": "MULTIPLE",
@@ -747,7 +738,6 @@
"desktop_computing": "NO",
"memnode": 131072,
"eth_rate": 10,
- "opa": "NO",
"last_job_date": 0,
"finaud_decision": "NO",
"last_available_upto": 0,
@@ -824,7 +814,6 @@
"opa_rate": 0,
"last_job_date": 0,
"eth_rate": 10,
- "opa": "NO",
"last_available_upto": 0,
"finaud_decision": "NO",
"api_timestamp": 1568902577,
@@ -907,7 +896,6 @@
}
],
"cpuset": 11,
- "opa": "NO",
"eth_rate": 10,
"last_job_date": 0,
"opa_rate": 0,
@@ -950,7 +938,6 @@
"opa_rate": 0,
"memnode": 131072,
"desktop_computing": "NO",
- "opa": "NO",
"eth_rate": 10,
"last_job_date": 0,
"ib_rate": 0,
@@ -1031,7 +1018,6 @@
"desktop_computing": "NO",
"memnode": 131072,
"eth_rate": 10,
- "opa": "NO",
"last_job_date": 0,
"wattmeter": "MULTIPLE",
"next_finaud_decision": "NO",
@@ -1124,7 +1110,6 @@
"besteffort": "YES",
"ib_rate": 0,
"last_job_date": 0,
- "opa": "NO",
"eth_rate": 10,
"desktop_computing": "NO",
"memnode": 131072,
@@ -1184,7 +1169,6 @@
"opa_rate": 0,
"last_job_date": 0,
"eth_rate": 10,
- "opa": "NO",
"gpudevice": 3,
"cpuarch": "x86_64",
"host": "clustera-1.fakesite.grid5000.fr",
@@ -1291,8 +1275,7 @@
"memnode": 131072,
"opa_rate": 0,
"last_job_date": 0,
- "eth_rate": 10,
- "opa": "NO"
+ "eth_rate": 10
},
{
"max_walltime": 86400,
@@ -1332,7 +1315,6 @@
"opa_rate": 0,
"last_job_date": 0,
"eth_rate": 10,
- "opa": "NO",
"available_upto": 2147483647,
"cpuset": 1,
"links": [
@@ -1372,7 +1354,6 @@
},
{
"eth_rate": 10,
- "opa": "NO",
"last_job_date": 0,
"opa_rate": 0,
"memnode": 131072,
@@ -1459,7 +1440,6 @@
"api_timestamp": 1568902577,
"finaud_decision": "NO",
"last_available_upto": 0,
- "opa": "NO",
"eth_rate": 10,
"last_job_date": 0,
"opa_rate": 0,
@@ -1592,7 +1572,6 @@
"ib_rate": 0,
"besteffort": "YES",
"last_job_date": 0,
- "opa": "NO",
"eth_rate": 10,
"memnode": 131072,
"desktop_computing": "NO",
@@ -1625,7 +1604,6 @@
"besteffort": "YES",
"last_job_date": 0,
"eth_rate": 10,
- "opa": "NO",
"memnode": 131072,
"desktop_computing": "NO",
"opa_rate": 0,
@@ -1747,8 +1725,7 @@
"desktop_computing": "NO",
"opa_rate": 0,
"last_job_date": 0,
- "eth_rate": 10,
- "opa": "NO"
+ "eth_rate": 10
},
{
"mic": "NO",
@@ -1799,7 +1776,6 @@
"memnode": 131072,
"opa_rate": 0,
"last_job_date": 0,
- "opa": "NO",
"eth_rate": 10,
"available_upto": 2147483647,
"links": [
@@ -1898,7 +1874,6 @@
"opa_rate": 0,
"memnode": 131072,
"desktop_computing": "NO",
- "opa": "NO",
"eth_rate": 10,
"last_job_date": 0
},
@@ -1929,7 +1904,6 @@
"besteffort": "YES",
"last_job_date": 0,
"eth_rate": 10,
- "opa": "NO",
"memnode": 131072,
"desktop_computing": "NO",
"opa_rate": 0,
@@ -1983,7 +1957,6 @@
"memnode": 131072,
"desktop_computing": "NO",
"eth_rate": 10,
- "opa": "NO",
"last_job_date": 0,
"ib_rate": 0,
"besteffort": "YES",
@@ -2124,7 +2097,6 @@
],
"cpuset": 11,
"eth_rate": 10,
- "opa": "NO",
"last_job_date": 0,
"opa_rate": 0,
"desktop_computing": "NO",
@@ -2191,7 +2163,6 @@
"desktop_computing": "NO",
"memnode": 131072,
"eth_rate": 10,
- "opa": "NO",
"last_job_date": 0,
"finaud_decision": "NO",
"last_available_upto": 0,
@@ -2220,7 +2191,6 @@
"last_available_upto": 0,
"finaud_decision": "NO",
"last_job_date": 0,
- "opa": "NO",
"eth_rate": 10,
"memnode": 131072,
"desktop_computing": "NO",
@@ -2343,7 +2313,6 @@
"memnode": 131072,
"desktop_computing": "NO",
"eth_rate": 10,
- "opa": "NO",
"last_job_date": 0,
"finaud_decision": "NO",
"last_available_upto": 0,
@@ -2403,7 +2372,6 @@
"myri_rate": 0,
"finaud_decision": "NO",
"last_available_upto": 0,
- "opa": "NO",
"eth_rate": 10,
"last_job_date": 0,
"opa_rate": 0,
diff --git a/spec/stub_oar_properties/dump_oar_api_configured_server_duplicated_cpus_cores_gpus.json b/spec/stub_oar_properties/dump_oar_api_configured_server_duplicated_cpus_cores_gpus.json
index 502cf530d83..88a66f1d46d 100644
--- a/spec/stub_oar_properties/dump_oar_api_configured_server_duplicated_cpus_cores_gpus.json
+++ b/spec/stub_oar_properties/dump_oar_api_configured_server_duplicated_cpus_cores_gpus.json
@@ -42,7 +42,6 @@
"opa_rate": 0,
"desktop_computing": "NO",
"memnode": 131072,
- "opa": "NO",
"eth_rate": 10,
"last_job_date": 0,
"wattmeter": "MULTIPLE",
@@ -81,7 +80,6 @@
{
"last_job_date": 0,
"eth_rate": 10,
- "opa": "NO",
"memnode": 131072,
"desktop_computing": "NO",
"opa_rate": 0,
@@ -192,7 +190,6 @@
"opa_rate": 0,
"last_job_date": 0,
"eth_rate": 10,
- "opa": "NO",
"cpuset": 2,
"links": [
{
@@ -292,7 +289,6 @@
"opa_rate": 0,
"last_job_date": 0,
"eth_rate": 10,
- "opa": "NO",
"last_available_upto": 0,
"finaud_decision": "NO",
"api_timestamp": 1568902577,
@@ -307,7 +303,6 @@
"state": "Alive"
},
{
- "opa": "NO",
"eth_rate": 10,
"last_job_date": 0,
"opa_rate": 0,
@@ -409,7 +404,6 @@
"besteffort": "YES",
"last_job_date": 0,
"eth_rate": 10,
- "opa": "NO",
"memnode": 131072,
"desktop_computing": "NO",
"opa_rate": 0,
@@ -475,7 +469,6 @@
"memnode": 131072,
"opa_rate": 0,
"last_job_date": 0,
- "opa": "NO",
"eth_rate": 10,
"available_upto": 2147483647,
"links": [
@@ -572,7 +565,6 @@
"besteffort": "YES",
"ib_rate": 0,
"last_job_date": 0,
- "opa": "NO",
"eth_rate": 10,
"desktop_computing": "NO",
"memnode": 131072,
@@ -650,7 +642,6 @@
"opa_rate": 0,
"desktop_computing": "NO",
"memnode": 131072,
- "opa": "NO",
"eth_rate": 10,
"last_job_date": 0,
"wattmeter": "MULTIPLE",
@@ -747,7 +738,6 @@
"desktop_computing": "NO",
"memnode": 131072,
"eth_rate": 10,
- "opa": "NO",
"last_job_date": 0,
"finaud_decision": "NO",
"last_available_upto": 0,
@@ -824,7 +814,6 @@
"opa_rate": 0,
"last_job_date": 0,
"eth_rate": 10,
- "opa": "NO",
"last_available_upto": 0,
"finaud_decision": "NO",
"api_timestamp": 1568902577,
@@ -907,7 +896,6 @@
}
],
"cpuset": 11,
- "opa": "NO",
"eth_rate": 10,
"last_job_date": 0,
"opa_rate": 0,
@@ -950,7 +938,6 @@
"opa_rate": 0,
"memnode": 131072,
"desktop_computing": "NO",
- "opa": "NO",
"eth_rate": 10,
"last_job_date": 0,
"ib_rate": 0,
@@ -1031,7 +1018,6 @@
"desktop_computing": "NO",
"memnode": 131072,
"eth_rate": 10,
- "opa": "NO",
"last_job_date": 0,
"wattmeter": "MULTIPLE",
"next_finaud_decision": "NO",
@@ -1124,7 +1110,6 @@
"besteffort": "YES",
"ib_rate": 0,
"last_job_date": 0,
- "opa": "NO",
"eth_rate": 10,
"desktop_computing": "NO",
"memnode": 131072,
@@ -1184,7 +1169,6 @@
"opa_rate": 0,
"last_job_date": 0,
"eth_rate": 10,
- "opa": "NO",
"gpudevice": 3,
"cpuarch": "x86_64",
"host": "clustera-1.fakesite.grid5000.fr",
@@ -1291,8 +1275,7 @@
"memnode": 131072,
"opa_rate": 0,
"last_job_date": 0,
- "eth_rate": 10,
- "opa": "NO"
+ "eth_rate": 10
},
{
"max_walltime": 86400,
@@ -1332,7 +1315,6 @@
"opa_rate": 0,
"last_job_date": 0,
"eth_rate": 10,
- "opa": "NO",
"available_upto": 2147483647,
"cpuset": 1,
"links": [
@@ -1372,7 +1354,6 @@
},
{
"eth_rate": 10,
- "opa": "NO",
"last_job_date": 0,
"opa_rate": 0,
"memnode": 131072,
@@ -1459,7 +1440,6 @@
"api_timestamp": 1568902577,
"finaud_decision": "NO",
"last_available_upto": 0,
- "opa": "NO",
"eth_rate": 10,
"last_job_date": 0,
"opa_rate": 0,
@@ -1592,7 +1572,6 @@
"ib_rate": 0,
"besteffort": "YES",
"last_job_date": 0,
- "opa": "NO",
"eth_rate": 10,
"memnode": 131072,
"desktop_computing": "NO",
@@ -1625,7 +1604,6 @@
"besteffort": "YES",
"last_job_date": 0,
"eth_rate": 10,
- "opa": "NO",
"memnode": 131072,
"desktop_computing": "NO",
"opa_rate": 0,
@@ -1747,8 +1725,7 @@
"desktop_computing": "NO",
"opa_rate": 0,
"last_job_date": 0,
- "eth_rate": 10,
- "opa": "NO"
+ "eth_rate": 10
},
{
"mic": "NO",
@@ -1799,7 +1776,6 @@
"memnode": 131072,
"opa_rate": 0,
"last_job_date": 0,
- "opa": "NO",
"eth_rate": 10,
"available_upto": 2147483647,
"links": [
@@ -1898,7 +1874,6 @@
"opa_rate": 0,
"memnode": 131072,
"desktop_computing": "NO",
- "opa": "NO",
"eth_rate": 10,
"last_job_date": 0
},
@@ -1929,7 +1904,6 @@
"besteffort": "YES",
"last_job_date": 0,
"eth_rate": 10,
- "opa": "NO",
"memnode": 131072,
"desktop_computing": "NO",
"opa_rate": 0,
@@ -1983,7 +1957,6 @@
"memnode": 131072,
"desktop_computing": "NO",
"eth_rate": 10,
- "opa": "NO",
"last_job_date": 0,
"ib_rate": 0,
"besteffort": "YES",
@@ -2124,7 +2097,6 @@
],
"cpuset": 11,
"eth_rate": 10,
- "opa": "NO",
"last_job_date": 0,
"opa_rate": 0,
"desktop_computing": "NO",
@@ -2191,7 +2163,6 @@
"desktop_computing": "NO",
"memnode": 131072,
"eth_rate": 10,
- "opa": "NO",
"last_job_date": 0,
"finaud_decision": "NO",
"last_available_upto": 0,
@@ -2220,7 +2191,6 @@
"last_available_upto": 0,
"finaud_decision": "NO",
"last_job_date": 0,
- "opa": "NO",
"eth_rate": 10,
"memnode": 131072,
"desktop_computing": "NO",
@@ -2343,7 +2313,6 @@
"memnode": 131072,
"desktop_computing": "NO",
"eth_rate": 10,
- "opa": "NO",
"last_job_date": 0,
"finaud_decision": "NO",
"last_available_upto": 0,
@@ -2403,7 +2372,6 @@
"myri_rate": 0,
"finaud_decision": "NO",
"last_available_upto": 0,
- "opa": "NO",
"eth_rate": 10,
"last_job_date": 0,
"opa_rate": 0,
diff --git a/spec/stub_oar_properties/dump_oar_api_configured_server_misconfigured_cores.json b/spec/stub_oar_properties/dump_oar_api_configured_server_misconfigured_cores.json
index f3fe880a923..e7678234c5a 100644
--- a/spec/stub_oar_properties/dump_oar_api_configured_server_misconfigured_cores.json
+++ b/spec/stub_oar_properties/dump_oar_api_configured_server_misconfigured_cores.json
@@ -9,7 +9,6 @@
"offset" : 0,
"items" : [
{
- "opa" : "NO",
"myri_count" : 0,
"cluster" : "clusterc",
"cputype" : "Intel Xeon Silver 4110",
@@ -110,7 +109,6 @@
"cluster" : "clusterc",
"cputype" : "Intel Xeon Silver 4110",
"myri_count" : 0,
- "opa" : "NO",
"api_timestamp" : 1569605253,
"maintenance" : "NO",
"gpu_model" : null,
@@ -218,7 +216,6 @@
"opa_rate" : 0,
"cputype" : "Intel Xeon Silver 4110",
"cluster" : "clusterc",
- "opa" : "NO",
"myri_count" : 0,
"api_timestamp" : 1569605253,
"state" : "Alive",
@@ -292,7 +289,6 @@
"api_timestamp" : 1569605253,
"cluster" : "clusterc",
"cputype" : "Intel Xeon Silver 4110",
- "opa" : "NO",
"myri_count" : 0,
"state_num" : 1,
"opa_rate" : 0,
@@ -350,7 +346,6 @@
"cluster" : "clusterc",
"cputype" : "Intel Xeon Silver 4110",
"myri_count" : 0,
- "opa" : "NO",
"eth_rate" : 10,
"cpuarch" : "x86_64",
"state" : "Alive",
@@ -414,7 +409,6 @@
"state" : "Alive",
"eth_rate" : 10,
"cpuarch" : "x86_64",
- "opa" : "NO",
"myri_count" : 0,
"cputype" : "Intel Xeon Silver 4110",
"cluster" : "clusterc",
@@ -545,7 +539,6 @@
"opa_rate" : 0,
"cputype" : "Intel Xeon Silver 4110",
"cluster" : "clusterc",
- "opa" : "NO",
"myri_count" : 0,
"api_timestamp" : 1569605253,
"ib_count" : 0,
@@ -558,7 +551,6 @@
"cputype" : "Intel Xeon Silver 4110",
"cluster" : "clusterc",
"myri_count" : 0,
- "opa" : "NO",
"api_timestamp" : 1569605253,
"state" : "Alive",
"ib_count" : 0,
@@ -706,7 +698,6 @@
"state" : "Alive",
"api_timestamp" : 1569605253,
"myri_count" : 0,
- "opa" : "NO",
"cputype" : "Intel Xeon Silver 4110",
"cluster" : "clusterc"
},
@@ -778,7 +769,6 @@
"opa_rate" : 0,
"state_num" : 1,
"myri_count" : 0,
- "opa" : "NO",
"cluster" : "clusterc",
"cputype" : "Intel Xeon Silver 4110",
"api_timestamp" : 1569605253,
@@ -809,7 +799,6 @@
"ib_count" : 0,
"eth_rate" : 10,
"cpuarch" : "x86_64",
- "opa" : "NO",
"myri_count" : 0,
"cluster" : "clusterc",
"cputype" : "Intel Xeon Silver 4110",
@@ -884,7 +873,6 @@
"last_available_upto" : 0,
"api_timestamp" : 1569605253,
"myri_count" : 0,
- "opa" : "NO",
"cluster" : "clusterc",
"cputype" : "Intel Xeon Silver 4110",
"cpuarch" : "x86_64",
@@ -976,7 +964,6 @@
"ib_count" : 0,
"state" : "Alive",
"api_timestamp" : 1569605253,
- "opa" : "NO",
"myri_count" : 0,
"cputype" : "Intel Xeon Silver 4110",
"cluster" : "clusterc",
@@ -1025,7 +1012,6 @@
{
"cluster" : "clusterc",
"cputype" : "Intel Xeon Silver 4110",
- "opa" : "NO",
"myri_count" : 0,
"api_timestamp" : 1569605253,
"state" : "Alive",
@@ -1117,7 +1103,6 @@
"cpuarch" : "x86_64",
"eth_rate" : 10,
"myri_count" : 0,
- "opa" : "NO",
"cputype" : "Intel Xeon Silver 4110",
"cluster" : "clusterc",
"api_timestamp" : 1569605253,
@@ -1250,7 +1235,6 @@
"state" : "Alive",
"cpuarch" : "x86_64",
"eth_rate" : 10,
- "opa" : "NO",
"myri_count" : 0,
"cluster" : "clusterc",
"cputype" : "Intel Xeon Silver 4110",
@@ -1327,7 +1311,6 @@
"cputype" : null,
"cluster" : "clusterc",
"myri_count" : null,
- "opa" : null,
"eth_rate" : null,
"cpuarch" : null,
"state" : "Alive",
@@ -1359,7 +1342,6 @@
"cluster" : "clusterc",
"cputype" : null,
"myri_count" : null,
- "opa" : null,
"state_num" : 1,
"opa_rate" : null,
"maintenance" : "NO",
@@ -1445,7 +1427,6 @@
"ib_count" : null,
"api_timestamp" : 1569605253,
"myri_count" : null,
- "opa" : null,
"cputype" : null,
"cluster" : "clusterc",
"ib" : null,
@@ -1518,7 +1499,6 @@
"gpu_model" : null,
"api_timestamp" : 1569605253,
"myri_count" : 0,
- "opa" : "NO",
"cputype" : "Intel Xeon Silver 4110",
"cluster" : "clusterc",
"eth_rate" : 10,
@@ -1633,7 +1613,6 @@
"cluster" : "clusterc",
"cputype" : "Intel Xeon Silver 4110",
"myri_count" : 0,
- "opa" : "NO",
"api_timestamp" : 1569605253,
"cpucore" : 8,
"maintenance" : "NO",
@@ -1706,7 +1685,6 @@
"api_timestamp" : 1569605253,
"cluster" : "clusterc",
"cputype" : "Intel Xeon Silver 4110",
- "opa" : "NO",
"myri_count" : 0,
"eth_rate" : 10,
"cpuarch" : "x86_64",
@@ -1789,7 +1767,6 @@
"api_timestamp" : 1569605253,
"cluster" : "clusterc",
"cputype" : "Intel Xeon Silver 4110",
- "opa" : "NO",
"myri_count" : 0,
"state_num" : 1,
"opa_rate" : 0,
@@ -1865,7 +1842,6 @@
"state" : "Alive",
"ib_count" : 0,
"api_timestamp" : 1569605253,
- "opa" : "NO",
"myri_count" : 0,
"cluster" : "clusterc",
"cputype" : "Intel Xeon Silver 4110",
@@ -1940,7 +1916,6 @@
"cputype" : "Intel Xeon Silver 4110",
"cluster" : "clusterc",
"myri_count" : 0,
- "opa" : "NO",
"api_timestamp" : 1569605253,
"ib_count" : 0,
"state" : "Alive",
@@ -2013,7 +1988,6 @@
"cluster" : "clusterc",
"cputype" : "Intel Xeon Silver 4110",
"myri_count" : 0,
- "opa" : "NO",
"api_timestamp" : 1569605253,
"ib_count" : 0,
"state" : "Alive",
@@ -2048,7 +2022,6 @@
"host" : "clusterc-2.fakesite.grid5000.fr",
"cpucore" : 8,
"api_timestamp" : 1569605253,
- "opa" : "NO",
"myri_count" : 0,
"cluster" : "clusterc",
"cputype" : "Intel Xeon Silver 4110",
@@ -2131,7 +2104,6 @@
"last_available_upto" : 0,
"expiry_date" : 0,
"myri_count" : 0,
- "opa" : "NO",
"cputype" : "Intel Xeon Silver 4110",
"cluster" : "clusterc",
"api_timestamp" : 1569605253,
@@ -2214,7 +2186,6 @@
"cpuarch" : "x86_64",
"eth_rate" : 10,
"myri_count" : 0,
- "opa" : "NO",
"cputype" : "Intel Xeon Silver 4110",
"cluster" : "clusterc",
"api_timestamp" : 1569605253,
@@ -2276,7 +2247,6 @@
"state" : "Alive",
"eth_rate" : 10,
"cpuarch" : "x86_64",
- "opa" : "NO",
"myri_count" : 0,
"cluster" : "clusterc",
"cputype" : "Intel Xeon Silver 4110",
@@ -2381,7 +2351,6 @@
"ib_count" : 0,
"api_timestamp" : 1569605253,
"myri_count" : 0,
- "opa" : "NO",
"cluster" : "clusterc",
"cputype" : "Intel Xeon Silver 4110",
"ib" : "NO",
@@ -2500,7 +2469,6 @@
"eth_rate" : 10,
"cputype" : "Intel Xeon Silver 4110",
"cluster" : "clusterc",
- "opa" : "NO",
"myri_count" : 0,
"api_timestamp" : 1569605253
},
@@ -2564,7 +2532,6 @@
"api_timestamp" : 1569605253,
"cputype" : "Intel Xeon Silver 4110",
"cluster" : "clusterc",
- "opa" : "NO",
"myri_count" : 0,
"eth_rate" : 10,
"cpuarch" : "x86_64",
@@ -2615,7 +2582,6 @@
"ib_count" : 0,
"api_timestamp" : 1569605253,
"myri_count" : 0,
- "opa" : "NO",
"cputype" : "Intel Xeon Silver 4110",
"cluster" : "clusterc",
"production" : "YES",
@@ -2661,7 +2627,6 @@
"ip" : "172.16.64.2"
},
{
- "opa" : "NO",
"myri_count" : 0,
"cluster" : "clusterc",
"cputype" : "Intel Xeon Silver 4110",
@@ -2756,7 +2721,6 @@
"state" : "Alive",
"api_timestamp" : 1569605253,
"myri_count" : null,
- "opa" : null,
"cluster" : "clusterc",
"cputype" : null,
"expiry_date" : 0,
@@ -2830,7 +2794,6 @@
"api_timestamp" : 1569605253,
"cluster" : "clusterc",
"cputype" : null,
- "opa" : null,
"myri_count" : null,
"eth_rate" : null,
"cpuarch" : null,
@@ -2898,7 +2861,6 @@
"cputype" : null,
"cluster" : "clusterc",
"myri_count" : null,
- "opa" : null,
"api_timestamp" : 1569605253,
"ib_count" : null,
"state" : "Alive",
diff --git a/spec/stub_oar_properties/dump_oar_api_configured_server_misconfigured_gpu.json b/spec/stub_oar_properties/dump_oar_api_configured_server_misconfigured_gpu.json
index 7bc0597f21e..889ae0b655b 100644
--- a/spec/stub_oar_properties/dump_oar_api_configured_server_misconfigured_gpu.json
+++ b/spec/stub_oar_properties/dump_oar_api_configured_server_misconfigured_gpu.json
@@ -42,7 +42,6 @@
"opa_rate": 0,
"desktop_computing": "NO",
"memnode": 131072,
- "opa": "NO",
"eth_rate": 10,
"last_job_date": 0,
"wattmeter": "MULTIPLE",
@@ -81,7 +80,6 @@
{
"last_job_date": 0,
"eth_rate": 10,
- "opa": "NO",
"memnode": 131072,
"desktop_computing": "NO",
"opa_rate": 0,
@@ -192,7 +190,6 @@
"opa_rate": 0,
"last_job_date": 0,
"eth_rate": 10,
- "opa": "NO",
"cpuset": 2,
"links": [
{
@@ -292,7 +289,6 @@
"opa_rate": 0,
"last_job_date": 0,
"eth_rate": 10,
- "opa": "NO",
"last_available_upto": 0,
"finaud_decision": "NO",
"api_timestamp": 1568902577,
@@ -307,7 +303,6 @@
"state": "Alive"
},
{
- "opa": "NO",
"eth_rate": 10,
"last_job_date": 0,
"opa_rate": 0,
@@ -409,7 +404,6 @@
"besteffort": "YES",
"last_job_date": 0,
"eth_rate": 10,
- "opa": "NO",
"memnode": 131072,
"desktop_computing": "NO",
"opa_rate": 0,
@@ -475,7 +469,6 @@
"memnode": 131072,
"opa_rate": 0,
"last_job_date": 0,
- "opa": "NO",
"eth_rate": 10,
"available_upto": 2147483647,
"links": [
@@ -572,7 +565,6 @@
"besteffort": "YES",
"ib_rate": 0,
"last_job_date": 0,
- "opa": "NO",
"eth_rate": 10,
"desktop_computing": "NO",
"memnode": 131072,
@@ -650,7 +642,6 @@
"opa_rate": 0,
"desktop_computing": "NO",
"memnode": 131072,
- "opa": "NO",
"eth_rate": 10,
"last_job_date": 0,
"wattmeter": "MULTIPLE",
@@ -747,7 +738,6 @@
"desktop_computing": "NO",
"memnode": 131072,
"eth_rate": 10,
- "opa": "NO",
"last_job_date": 0,
"finaud_decision": "NO",
"last_available_upto": 0,
@@ -824,7 +814,6 @@
"opa_rate": 0,
"last_job_date": 0,
"eth_rate": 10,
- "opa": "NO",
"last_available_upto": 0,
"finaud_decision": "NO",
"api_timestamp": 1568902577,
@@ -907,7 +896,6 @@
}
],
"cpuset": 11,
- "opa": "NO",
"eth_rate": 10,
"last_job_date": 0,
"opa_rate": 0,
@@ -950,7 +938,6 @@
"opa_rate": 0,
"memnode": 131072,
"desktop_computing": "NO",
- "opa": "NO",
"eth_rate": 10,
"last_job_date": 0,
"ib_rate": 0,
@@ -1031,7 +1018,6 @@
"desktop_computing": "NO",
"memnode": 131072,
"eth_rate": 10,
- "opa": "NO",
"last_job_date": 0,
"wattmeter": "MULTIPLE",
"next_finaud_decision": "NO",
@@ -1124,7 +1110,6 @@
"besteffort": "YES",
"ib_rate": 0,
"last_job_date": 0,
- "opa": "NO",
"eth_rate": 10,
"desktop_computing": "NO",
"memnode": 131072,
@@ -1184,7 +1169,6 @@
"opa_rate": 0,
"last_job_date": 0,
"eth_rate": 10,
- "opa": "NO",
"gpudevice": 3,
"cpuarch": "x86_64",
"host": "clustera-1.fakesite.grid5000.fr",
@@ -1291,8 +1275,7 @@
"memnode": 131072,
"opa_rate": 0,
"last_job_date": 0,
- "eth_rate": 10,
- "opa": "NO"
+ "eth_rate": 10
},
{
"max_walltime": 86400,
@@ -1332,7 +1315,6 @@
"opa_rate": 0,
"last_job_date": 0,
"eth_rate": 10,
- "opa": "NO",
"available_upto": 2147483647,
"cpuset": 1,
"links": [
@@ -1372,7 +1354,6 @@
},
{
"eth_rate": 10,
- "opa": "NO",
"last_job_date": 0,
"opa_rate": 0,
"memnode": 131072,
@@ -1459,7 +1440,6 @@
"api_timestamp": 1568902577,
"finaud_decision": "NO",
"last_available_upto": 0,
- "opa": "NO",
"eth_rate": 10,
"last_job_date": 0,
"opa_rate": 0,
@@ -1592,7 +1572,6 @@
"ib_rate": 0,
"besteffort": "YES",
"last_job_date": 0,
- "opa": "NO",
"eth_rate": 10,
"memnode": 131072,
"desktop_computing": "NO",
@@ -1625,7 +1604,6 @@
"besteffort": "YES",
"last_job_date": 0,
"eth_rate": 10,
- "opa": "NO",
"memnode": 131072,
"desktop_computing": "NO",
"opa_rate": 0,
@@ -1747,8 +1725,7 @@
"desktop_computing": "NO",
"opa_rate": 0,
"last_job_date": 0,
- "eth_rate": 10,
- "opa": "NO"
+ "eth_rate": 10
},
{
"mic": "NO",
@@ -1799,7 +1776,6 @@
"memnode": 131072,
"opa_rate": 0,
"last_job_date": 0,
- "opa": "NO",
"eth_rate": 10,
"available_upto": 2147483647,
"links": [
@@ -1898,7 +1874,6 @@
"opa_rate": 0,
"memnode": 131072,
"desktop_computing": "NO",
- "opa": "NO",
"eth_rate": 10,
"last_job_date": 0
},
@@ -1929,7 +1904,6 @@
"besteffort": "YES",
"last_job_date": 0,
"eth_rate": 10,
- "opa": "NO",
"memnode": 131072,
"desktop_computing": "NO",
"opa_rate": 0,
@@ -1983,7 +1957,6 @@
"memnode": 131072,
"desktop_computing": "NO",
"eth_rate": 10,
- "opa": "NO",
"last_job_date": 0,
"ib_rate": 0,
"besteffort": "YES",
@@ -2124,7 +2097,6 @@
],
"cpuset": 11,
"eth_rate": 10,
- "opa": "NO",
"last_job_date": 0,
"opa_rate": 0,
"desktop_computing": "NO",
@@ -2191,7 +2163,6 @@
"desktop_computing": "NO",
"memnode": 131072,
"eth_rate": 10,
- "opa": "NO",
"last_job_date": 0,
"finaud_decision": "NO",
"last_available_upto": 0,
@@ -2220,7 +2191,6 @@
"last_available_upto": 0,
"finaud_decision": "NO",
"last_job_date": 0,
- "opa": "NO",
"eth_rate": 10,
"memnode": 131072,
"desktop_computing": "NO",
@@ -2343,7 +2313,6 @@
"memnode": 131072,
"desktop_computing": "NO",
"eth_rate": 10,
- "opa": "NO",
"last_job_date": 0,
"finaud_decision": "NO",
"last_available_upto": 0,
@@ -2403,7 +2372,6 @@
"myri_rate": 0,
"finaud_decision": "NO",
"last_available_upto": 0,
- "opa": "NO",
"eth_rate": 10,
"last_job_date": 0,
"opa_rate": 0,
diff --git a/spec/stub_oar_properties/dump_oar_api_configured_server_misconfigured_non_reservable_gpu.json b/spec/stub_oar_properties/dump_oar_api_configured_server_misconfigured_non_reservable_gpu.json
index 7bc0597f21e..889ae0b655b 100644
--- a/spec/stub_oar_properties/dump_oar_api_configured_server_misconfigured_non_reservable_gpu.json
+++ b/spec/stub_oar_properties/dump_oar_api_configured_server_misconfigured_non_reservable_gpu.json
@@ -42,7 +42,6 @@
"opa_rate": 0,
"desktop_computing": "NO",
"memnode": 131072,
- "opa": "NO",
"eth_rate": 10,
"last_job_date": 0,
"wattmeter": "MULTIPLE",
@@ -81,7 +80,6 @@
{
"last_job_date": 0,
"eth_rate": 10,
- "opa": "NO",
"memnode": 131072,
"desktop_computing": "NO",
"opa_rate": 0,
@@ -192,7 +190,6 @@
"opa_rate": 0,
"last_job_date": 0,
"eth_rate": 10,
- "opa": "NO",
"cpuset": 2,
"links": [
{
@@ -292,7 +289,6 @@
"opa_rate": 0,
"last_job_date": 0,
"eth_rate": 10,
- "opa": "NO",
"last_available_upto": 0,
"finaud_decision": "NO",
"api_timestamp": 1568902577,
@@ -307,7 +303,6 @@
"state": "Alive"
},
{
- "opa": "NO",
"eth_rate": 10,
"last_job_date": 0,
"opa_rate": 0,
@@ -409,7 +404,6 @@
"besteffort": "YES",
"last_job_date": 0,
"eth_rate": 10,
- "opa": "NO",
"memnode": 131072,
"desktop_computing": "NO",
"opa_rate": 0,
@@ -475,7 +469,6 @@
"memnode": 131072,
"opa_rate": 0,
"last_job_date": 0,
- "opa": "NO",
"eth_rate": 10,
"available_upto": 2147483647,
"links": [
@@ -572,7 +565,6 @@
"besteffort": "YES",
"ib_rate": 0,
"last_job_date": 0,
- "opa": "NO",
"eth_rate": 10,
"desktop_computing": "NO",
"memnode": 131072,
@@ -650,7 +642,6 @@
"opa_rate": 0,
"desktop_computing": "NO",
"memnode": 131072,
- "opa": "NO",
"eth_rate": 10,
"last_job_date": 0,
"wattmeter": "MULTIPLE",
@@ -747,7 +738,6 @@
"desktop_computing": "NO",
"memnode": 131072,
"eth_rate": 10,
- "opa": "NO",
"last_job_date": 0,
"finaud_decision": "NO",
"last_available_upto": 0,
@@ -824,7 +814,6 @@
"opa_rate": 0,
"last_job_date": 0,
"eth_rate": 10,
- "opa": "NO",
"last_available_upto": 0,
"finaud_decision": "NO",
"api_timestamp": 1568902577,
@@ -907,7 +896,6 @@
}
],
"cpuset": 11,
- "opa": "NO",
"eth_rate": 10,
"last_job_date": 0,
"opa_rate": 0,
@@ -950,7 +938,6 @@
"opa_rate": 0,
"memnode": 131072,
"desktop_computing": "NO",
- "opa": "NO",
"eth_rate": 10,
"last_job_date": 0,
"ib_rate": 0,
@@ -1031,7 +1018,6 @@
"desktop_computing": "NO",
"memnode": 131072,
"eth_rate": 10,
- "opa": "NO",
"last_job_date": 0,
"wattmeter": "MULTIPLE",
"next_finaud_decision": "NO",
@@ -1124,7 +1110,6 @@
"besteffort": "YES",
"ib_rate": 0,
"last_job_date": 0,
- "opa": "NO",
"eth_rate": 10,
"desktop_computing": "NO",
"memnode": 131072,
@@ -1184,7 +1169,6 @@
"opa_rate": 0,
"last_job_date": 0,
"eth_rate": 10,
- "opa": "NO",
"gpudevice": 3,
"cpuarch": "x86_64",
"host": "clustera-1.fakesite.grid5000.fr",
@@ -1291,8 +1275,7 @@
"memnode": 131072,
"opa_rate": 0,
"last_job_date": 0,
- "eth_rate": 10,
- "opa": "NO"
+ "eth_rate": 10
},
{
"max_walltime": 86400,
@@ -1332,7 +1315,6 @@
"opa_rate": 0,
"last_job_date": 0,
"eth_rate": 10,
- "opa": "NO",
"available_upto": 2147483647,
"cpuset": 1,
"links": [
@@ -1372,7 +1354,6 @@
},
{
"eth_rate": 10,
- "opa": "NO",
"last_job_date": 0,
"opa_rate": 0,
"memnode": 131072,
@@ -1459,7 +1440,6 @@
"api_timestamp": 1568902577,
"finaud_decision": "NO",
"last_available_upto": 0,
- "opa": "NO",
"eth_rate": 10,
"last_job_date": 0,
"opa_rate": 0,
@@ -1592,7 +1572,6 @@
"ib_rate": 0,
"besteffort": "YES",
"last_job_date": 0,
- "opa": "NO",
"eth_rate": 10,
"memnode": 131072,
"desktop_computing": "NO",
@@ -1625,7 +1604,6 @@
"besteffort": "YES",
"last_job_date": 0,
"eth_rate": 10,
- "opa": "NO",
"memnode": 131072,
"desktop_computing": "NO",
"opa_rate": 0,
@@ -1747,8 +1725,7 @@
"desktop_computing": "NO",
"opa_rate": 0,
"last_job_date": 0,
- "eth_rate": 10,
- "opa": "NO"
+ "eth_rate": 10
},
{
"mic": "NO",
@@ -1799,7 +1776,6 @@
"memnode": 131072,
"opa_rate": 0,
"last_job_date": 0,
- "opa": "NO",
"eth_rate": 10,
"available_upto": 2147483647,
"links": [
@@ -1898,7 +1874,6 @@
"opa_rate": 0,
"memnode": 131072,
"desktop_computing": "NO",
- "opa": "NO",
"eth_rate": 10,
"last_job_date": 0
},
@@ -1929,7 +1904,6 @@
"besteffort": "YES",
"last_job_date": 0,
"eth_rate": 10,
- "opa": "NO",
"memnode": 131072,
"desktop_computing": "NO",
"opa_rate": 0,
@@ -1983,7 +1957,6 @@
"memnode": 131072,
"desktop_computing": "NO",
"eth_rate": 10,
- "opa": "NO",
"last_job_date": 0,
"ib_rate": 0,
"besteffort": "YES",
@@ -2124,7 +2097,6 @@
],
"cpuset": 11,
"eth_rate": 10,
- "opa": "NO",
"last_job_date": 0,
"opa_rate": 0,
"desktop_computing": "NO",
@@ -2191,7 +2163,6 @@
"desktop_computing": "NO",
"memnode": 131072,
"eth_rate": 10,
- "opa": "NO",
"last_job_date": 0,
"finaud_decision": "NO",
"last_available_upto": 0,
@@ -2220,7 +2191,6 @@
"last_available_upto": 0,
"finaud_decision": "NO",
"last_job_date": 0,
- "opa": "NO",
"eth_rate": 10,
"memnode": 131072,
"desktop_computing": "NO",
@@ -2343,7 +2313,6 @@
"memnode": 131072,
"desktop_computing": "NO",
"eth_rate": 10,
- "opa": "NO",
"last_job_date": 0,
"finaud_decision": "NO",
"last_available_upto": 0,
@@ -2403,7 +2372,6 @@
"myri_rate": 0,
"finaud_decision": "NO",
"last_available_upto": 0,
- "opa": "NO",
"eth_rate": 10,
"last_job_date": 0,
"opa_rate": 0,
diff --git a/spec/stub_oar_properties/dump_oar_api_configured_server_missing_property.json b/spec/stub_oar_properties/dump_oar_api_configured_server_missing_property.json
index 1c244f7a480..6cf0cb7e783 100644
--- a/spec/stub_oar_properties/dump_oar_api_configured_server_missing_property.json
+++ b/spec/stub_oar_properties/dump_oar_api_configured_server_missing_property.json
@@ -41,7 +41,6 @@
"opa_rate": 0,
"desktop_computing": "NO",
"memnode": 131072,
- "opa": "NO",
"eth_rate": 10,
"last_job_date": 0,
"wattmeter": "MULTIPLE",
@@ -80,7 +79,6 @@
{
"last_job_date": 0,
"eth_rate": 10,
- "opa": "NO",
"memnode": 131072,
"desktop_computing": "NO",
"opa_rate": 0,
@@ -190,7 +188,6 @@
"opa_rate": 0,
"last_job_date": 0,
"eth_rate": 10,
- "opa": "NO",
"cpuset": 2,
"links": [
{
@@ -288,7 +285,6 @@
"opa_rate": 0,
"last_job_date": 0,
"eth_rate": 10,
- "opa": "NO",
"last_available_upto": 0,
"finaud_decision": "NO",
"api_timestamp": 1568902577,
@@ -303,7 +299,6 @@
"state": "Alive"
},
{
- "opa": "NO",
"eth_rate": 10,
"last_job_date": 0,
"opa_rate": 0,
@@ -403,7 +398,6 @@
"besteffort": "YES",
"last_job_date": 0,
"eth_rate": 10,
- "opa": "NO",
"memnode": 131072,
"desktop_computing": "NO",
"opa_rate": 0,
@@ -469,7 +463,6 @@
"memnode": 131072,
"opa_rate": 0,
"last_job_date": 0,
- "opa": "NO",
"eth_rate": 10,
"available_upto": 2147483647,
"links": [
@@ -564,7 +557,6 @@
],
"besteffort": "YES",
"last_job_date": 0,
- "opa": "NO",
"eth_rate": 10,
"desktop_computing": "NO",
"memnode": 131072,
@@ -641,7 +633,6 @@
"opa_rate": 0,
"desktop_computing": "NO",
"memnode": 131072,
- "opa": "NO",
"eth_rate": 10,
"last_job_date": 0,
"wattmeter": "MULTIPLE",
@@ -737,7 +728,6 @@
"desktop_computing": "NO",
"memnode": 131072,
"eth_rate": 10,
- "opa": "NO",
"last_job_date": 0,
"finaud_decision": "NO",
"last_available_upto": 0,
@@ -813,7 +803,6 @@
"opa_rate": 0,
"last_job_date": 0,
"eth_rate": 10,
- "opa": "NO",
"last_available_upto": 0,
"finaud_decision": "NO",
"api_timestamp": 1568902577,
@@ -895,7 +884,6 @@
}
],
"cpuset": 11,
- "opa": "NO",
"eth_rate": 10,
"last_job_date": 0,
"opa_rate": 0,
@@ -938,7 +926,6 @@
"opa_rate": 0,
"memnode": 131072,
"desktop_computing": "NO",
- "opa": "NO",
"eth_rate": 10,
"last_job_date": 0,
@@ -1019,7 +1006,6 @@
"desktop_computing": "NO",
"memnode": 131072,
"eth_rate": 10,
- "opa": "NO",
"last_job_date": 0,
"wattmeter": "MULTIPLE",
"next_finaud_decision": "NO",
@@ -1112,7 +1098,6 @@
"besteffort": "YES",
"last_job_date": 0,
- "opa": "NO",
"eth_rate": 10,
"desktop_computing": "NO",
"memnode": 131072,
@@ -1172,7 +1157,6 @@
"opa_rate": 0,
"last_job_date": 0,
"eth_rate": 10,
- "opa": "NO",
"gpudevice": 3,
"cpuarch": "x86_64",
"host": "clustera-1.fakesite.grid5000.fr",
@@ -1279,8 +1263,7 @@
"memnode": 131072,
"opa_rate": 0,
"last_job_date": 0,
- "eth_rate": 10,
- "opa": "NO"
+ "eth_rate": 10
},
{
"max_walltime": 86400,
@@ -1320,7 +1303,6 @@
"opa_rate": 0,
"last_job_date": 0,
"eth_rate": 10,
- "opa": "NO",
"available_upto": 2147483647,
"cpuset": 1,
"links": [
@@ -1360,7 +1342,6 @@
},
{
"eth_rate": 10,
- "opa": "NO",
"last_job_date": 0,
"opa_rate": 0,
"memnode": 131072,
@@ -1447,7 +1428,6 @@
"api_timestamp": 1568902577,
"finaud_decision": "NO",
"last_available_upto": 0,
- "opa": "NO",
"eth_rate": 10,
"last_job_date": 0,
"opa_rate": 0,
@@ -1580,7 +1560,6 @@
"besteffort": "YES",
"last_job_date": 0,
- "opa": "NO",
"eth_rate": 10,
"memnode": 131072,
"desktop_computing": "NO",
@@ -1613,7 +1592,6 @@
"besteffort": "YES",
"last_job_date": 0,
"eth_rate": 10,
- "opa": "NO",
"memnode": 131072,
"desktop_computing": "NO",
"opa_rate": 0,
@@ -1735,8 +1713,7 @@
"desktop_computing": "NO",
"opa_rate": 0,
"last_job_date": 0,
- "eth_rate": 10,
- "opa": "NO"
+ "eth_rate": 10
},
{
"mic": "NO",
@@ -1787,7 +1764,6 @@
"memnode": 131072,
"opa_rate": 0,
"last_job_date": 0,
- "opa": "NO",
"eth_rate": 10,
"available_upto": 2147483647,
"links": [
@@ -1886,7 +1862,6 @@
"opa_rate": 0,
"memnode": 131072,
"desktop_computing": "NO",
- "opa": "NO",
"eth_rate": 10,
"last_job_date": 0
},
@@ -1917,7 +1892,6 @@
"besteffort": "YES",
"last_job_date": 0,
"eth_rate": 10,
- "opa": "NO",
"memnode": 131072,
"desktop_computing": "NO",
"opa_rate": 0,
@@ -1971,7 +1945,6 @@
"memnode": 131072,
"desktop_computing": "NO",
"eth_rate": 10,
- "opa": "NO",
"last_job_date": 0,
"besteffort": "YES",
@@ -2112,7 +2085,6 @@
],
"cpuset": 11,
"eth_rate": 10,
- "opa": "NO",
"last_job_date": 0,
"opa_rate": 0,
"desktop_computing": "NO",
@@ -2179,7 +2151,6 @@
"desktop_computing": "NO",
"memnode": 131072,
"eth_rate": 10,
- "opa": "NO",
"last_job_date": 0,
"finaud_decision": "NO",
"last_available_upto": 0,
@@ -2208,7 +2179,6 @@
"last_available_upto": 0,
"finaud_decision": "NO",
"last_job_date": 0,
- "opa": "NO",
"eth_rate": 10,
"memnode": 131072,
"desktop_computing": "NO",
@@ -2331,7 +2301,6 @@
"memnode": 131072,
"desktop_computing": "NO",
"eth_rate": 10,
- "opa": "NO",
"last_job_date": 0,
"finaud_decision": "NO",
"last_available_upto": 0,
@@ -2391,7 +2360,6 @@
"myri_rate": 0,
"finaud_decision": "NO",
"last_available_upto": 0,
- "opa": "NO",
"eth_rate": 10,
"last_job_date": 0,
"opa_rate": 0,
diff --git a/spec/stub_oar_properties/dump_oar_api_configured_server_quirk_cluster.json b/spec/stub_oar_properties/dump_oar_api_configured_server_quirk_cluster.json
index 496e660e438..0422d85a3fd 100644
--- a/spec/stub_oar_properties/dump_oar_api_configured_server_quirk_cluster.json
+++ b/spec/stub_oar_properties/dump_oar_api_configured_server_quirk_cluster.json
@@ -9,7 +9,6 @@
"offset" : 0,
"items" : [
{
- "opa" : "NO",
"myri_count" : 0,
"cluster" : "clusterc",
"cputype" : "Intel Xeon Silver 4110",
@@ -110,7 +109,6 @@
"cluster" : "clusterc",
"cputype" : "Intel Xeon Silver 4110",
"myri_count" : 0,
- "opa" : "NO",
"api_timestamp" : 1569605253,
"maintenance" : "NO",
"gpu_model" : null,
@@ -218,7 +216,6 @@
"opa_rate" : 0,
"cputype" : "Intel Xeon Silver 4110",
"cluster" : "clusterc",
- "opa" : "NO",
"myri_count" : 0,
"api_timestamp" : 1569605253,
"state" : "Alive",
@@ -292,7 +289,6 @@
"api_timestamp" : 1569605253,
"cluster" : "clusterc",
"cputype" : "Intel Xeon Silver 4110",
- "opa" : "NO",
"myri_count" : 0,
"state_num" : 1,
"opa_rate" : 0,
@@ -350,7 +346,6 @@
"cluster" : "clusterc",
"cputype" : "Intel Xeon Silver 4110",
"myri_count" : 0,
- "opa" : "NO",
"eth_rate" : 10,
"cpuarch" : "x86_64",
"state" : "Alive",
@@ -414,7 +409,6 @@
"state" : "Alive",
"eth_rate" : 10,
"cpuarch" : "x86_64",
- "opa" : "NO",
"myri_count" : 0,
"cputype" : "Intel Xeon Silver 4110",
"cluster" : "clusterc",
@@ -545,7 +539,6 @@
"opa_rate" : 0,
"cputype" : "Intel Xeon Silver 4110",
"cluster" : "clusterc",
- "opa" : "NO",
"myri_count" : 0,
"api_timestamp" : 1569605253,
"ib_count" : 0,
@@ -558,7 +551,6 @@
"cputype" : "Intel Xeon Silver 4110",
"cluster" : "clusterc",
"myri_count" : 0,
- "opa" : "NO",
"api_timestamp" : 1569605253,
"state" : "Alive",
"ib_count" : 0,
@@ -706,7 +698,6 @@
"state" : "Alive",
"api_timestamp" : 1569605253,
"myri_count" : 0,
- "opa" : "NO",
"cputype" : "Intel Xeon Silver 4110",
"cluster" : "clusterc"
},
@@ -778,7 +769,6 @@
"opa_rate" : 0,
"state_num" : 1,
"myri_count" : 0,
- "opa" : "NO",
"cluster" : "clusterc",
"cputype" : "Intel Xeon Silver 4110",
"api_timestamp" : 1569605253,
@@ -809,7 +799,6 @@
"ib_count" : 0,
"eth_rate" : 10,
"cpuarch" : "x86_64",
- "opa" : "NO",
"myri_count" : 0,
"cluster" : "clusterc",
"cputype" : "Intel Xeon Silver 4110",
@@ -884,7 +873,6 @@
"last_available_upto" : 0,
"api_timestamp" : 1569605253,
"myri_count" : 0,
- "opa" : "NO",
"cluster" : "clusterc",
"cputype" : "Intel Xeon Silver 4110",
"cpuarch" : "x86_64",
@@ -976,7 +964,6 @@
"ib_count" : 0,
"state" : "Alive",
"api_timestamp" : 1569605253,
- "opa" : "NO",
"myri_count" : 0,
"cputype" : "Intel Xeon Silver 4110",
"cluster" : "clusterc",
@@ -1025,7 +1012,6 @@
{
"cluster" : "clusterc",
"cputype" : "Intel Xeon Silver 4110",
- "opa" : "NO",
"myri_count" : 0,
"api_timestamp" : 1569605253,
"state" : "Alive",
@@ -1117,7 +1103,6 @@
"cpuarch" : "x86_64",
"eth_rate" : 10,
"myri_count" : 0,
- "opa" : "NO",
"cputype" : "Intel Xeon Silver 4110",
"cluster" : "clusterc",
"api_timestamp" : 1569605253,
@@ -1250,7 +1235,6 @@
"state" : "Alive",
"cpuarch" : "x86_64",
"eth_rate" : 10,
- "opa" : "NO",
"myri_count" : 0,
"cluster" : "clusterc",
"cputype" : "Intel Xeon Silver 4110",
@@ -1327,7 +1311,6 @@
"cputype" : null,
"cluster" : "clusterc",
"myri_count" : null,
- "opa" : null,
"eth_rate" : null,
"cpuarch" : null,
"state" : "Alive",
@@ -1359,7 +1342,6 @@
"cluster" : "clusterc",
"cputype" : null,
"myri_count" : null,
- "opa" : null,
"state_num" : 1,
"opa_rate" : null,
"maintenance" : "NO",
@@ -1445,7 +1427,6 @@
"ib_count" : null,
"api_timestamp" : 1569605253,
"myri_count" : null,
- "opa" : null,
"cputype" : null,
"cluster" : "clusterc",
"ib" : null,
@@ -1518,7 +1499,6 @@
"gpu_model" : null,
"api_timestamp" : 1569605253,
"myri_count" : 0,
- "opa" : "NO",
"cputype" : "Intel Xeon Silver 4110",
"cluster" : "clusterc",
"eth_rate" : 10,
@@ -1633,7 +1613,6 @@
"cluster" : "clusterc",
"cputype" : "Intel Xeon Silver 4110",
"myri_count" : 0,
- "opa" : "NO",
"api_timestamp" : 1569605253,
"cpucore" : 8,
"maintenance" : "NO",
@@ -1706,7 +1685,6 @@
"api_timestamp" : 1569605253,
"cluster" : "clusterc",
"cputype" : "Intel Xeon Silver 4110",
- "opa" : "NO",
"myri_count" : 0,
"eth_rate" : 10,
"cpuarch" : "x86_64",
@@ -1789,7 +1767,6 @@
"api_timestamp" : 1569605253,
"cluster" : "clusterc",
"cputype" : "Intel Xeon Silver 4110",
- "opa" : "NO",
"myri_count" : 0,
"state_num" : 1,
"opa_rate" : 0,
@@ -1865,7 +1842,6 @@
"state" : "Alive",
"ib_count" : 0,
"api_timestamp" : 1569605253,
- "opa" : "NO",
"myri_count" : 0,
"cluster" : "clusterc",
"cputype" : "Intel Xeon Silver 4110",
@@ -1940,7 +1916,6 @@
"cputype" : "Intel Xeon Silver 4110",
"cluster" : "clusterc",
"myri_count" : 0,
- "opa" : "NO",
"api_timestamp" : 1569605253,
"ib_count" : 0,
"state" : "Alive",
@@ -2013,7 +1988,6 @@
"cluster" : "clusterc",
"cputype" : "Intel Xeon Silver 4110",
"myri_count" : 0,
- "opa" : "NO",
"api_timestamp" : 1569605253,
"ib_count" : 0,
"state" : "Alive",
@@ -2048,7 +2022,6 @@
"host" : "clusterc-2.fakesite.grid5000.fr",
"cpucore" : 8,
"api_timestamp" : 1569605253,
- "opa" : "NO",
"myri_count" : 0,
"cluster" : "clusterc",
"cputype" : "Intel Xeon Silver 4110",
@@ -2131,7 +2104,6 @@
"last_available_upto" : 0,
"expiry_date" : 0,
"myri_count" : 0,
- "opa" : "NO",
"cputype" : "Intel Xeon Silver 4110",
"cluster" : "clusterc",
"api_timestamp" : 1569605253,
@@ -2214,7 +2186,6 @@
"cpuarch" : "x86_64",
"eth_rate" : 10,
"myri_count" : 0,
- "opa" : "NO",
"cputype" : "Intel Xeon Silver 4110",
"cluster" : "clusterc",
"api_timestamp" : 1569605253,
@@ -2276,7 +2247,6 @@
"state" : "Alive",
"eth_rate" : 10,
"cpuarch" : "x86_64",
- "opa" : "NO",
"myri_count" : 0,
"cluster" : "clusterc",
"cputype" : "Intel Xeon Silver 4110",
@@ -2381,7 +2351,6 @@
"ib_count" : 0,
"api_timestamp" : 1569605253,
"myri_count" : 0,
- "opa" : "NO",
"cluster" : "clusterc",
"cputype" : "Intel Xeon Silver 4110",
"ib" : "NO",
@@ -2500,7 +2469,6 @@
"eth_rate" : 10,
"cputype" : "Intel Xeon Silver 4110",
"cluster" : "clusterc",
- "opa" : "NO",
"myri_count" : 0,
"api_timestamp" : 1569605253
},
@@ -2564,7 +2532,6 @@
"api_timestamp" : 1569605253,
"cputype" : "Intel Xeon Silver 4110",
"cluster" : "clusterc",
- "opa" : "NO",
"myri_count" : 0,
"eth_rate" : 10,
"cpuarch" : "x86_64",
@@ -2615,7 +2582,6 @@
"ib_count" : 0,
"api_timestamp" : 1569605253,
"myri_count" : 0,
- "opa" : "NO",
"cputype" : "Intel Xeon Silver 4110",
"cluster" : "clusterc",
"production" : "YES",
@@ -2661,7 +2627,6 @@
"ip" : "172.16.64.2"
},
{
- "opa" : "NO",
"myri_count" : 0,
"cluster" : "clusterc",
"cputype" : "Intel Xeon Silver 4110",
@@ -2756,7 +2721,6 @@
"state" : "Alive",
"api_timestamp" : 1569605253,
"myri_count" : null,
- "opa" : null,
"cluster" : "clusterc",
"cputype" : null,
"expiry_date" : 0,
@@ -2830,7 +2794,6 @@
"api_timestamp" : 1569605253,
"cluster" : "clusterc",
"cputype" : null,
- "opa" : null,
"myri_count" : null,
"eth_rate" : null,
"cpuarch" : null,
@@ -2898,7 +2861,6 @@
"cputype" : null,
"cluster" : "clusterc",
"myri_count" : null,
- "opa" : null,
"api_timestamp" : 1569605253,
"ib_count" : null,
"state" : "Alive",
diff --git a/spec/stub_oar_properties/dump_oar_api_configured_server_to_test_diff.json b/spec/stub_oar_properties/dump_oar_api_configured_server_to_test_diff.json
index 838f500cdc7..7089289c2a2 100644
--- a/spec/stub_oar_properties/dump_oar_api_configured_server_to_test_diff.json
+++ b/spec/stub_oar_properties/dump_oar_api_configured_server_to_test_diff.json
@@ -42,7 +42,6 @@
"opa_rate": 0,
"desktop_computing": "NO",
"memnode": 131072,
- "opa": "NO",
"eth_rate": 10,
"last_job_date": 0,
"wattmeter": "MULTIPLE",
@@ -81,7 +80,6 @@
{
"last_job_date": 0,
"eth_rate": 10,
- "opa": "NO",
"memnode": 131072,
"desktop_computing": "NO",
"opa_rate": 0,
@@ -192,7 +190,6 @@
"opa_rate": 0,
"last_job_date": 0,
"eth_rate": 10,
- "opa": "NO",
"cpuset": 2,
"links": [
{
@@ -292,7 +289,6 @@
"opa_rate": 0,
"last_job_date": 0,
"eth_rate": 10,
- "opa": "NO",
"last_available_upto": 0,
"finaud_decision": "NO",
"api_timestamp": 1568902577,
@@ -307,7 +303,6 @@
"state": "Alive"
},
{
- "opa": "NO",
"eth_rate": 10,
"last_job_date": 0,
"opa_rate": 0,
@@ -409,7 +404,6 @@
"besteffort": "YES",
"last_job_date": 0,
"eth_rate": 10,
- "opa": "NO",
"memnode": 131072,
"desktop_computing": "NO",
"opa_rate": 0,
@@ -475,7 +469,6 @@
"memnode": 131072,
"opa_rate": 0,
"last_job_date": 0,
- "opa": "NO",
"eth_rate": 10,
"available_upto": 2147483647,
"links": [
@@ -572,7 +565,6 @@
"besteffort": "YES",
"ib_rate": 0,
"last_job_date": 0,
- "opa": "NO",
"eth_rate": 10,
"desktop_computing": "NO",
"memnode": 131072,
@@ -650,7 +642,6 @@
"opa_rate": 0,
"desktop_computing": "NO",
"memnode": 131072,
- "opa": "NO",
"eth_rate": 10,
"last_job_date": 0,
"wattmeter": "MULTIPLE",
@@ -747,7 +738,6 @@
"desktop_computing": "NO",
"memnode": 131072,
"eth_rate": 10,
- "opa": "NO",
"last_job_date": 0,
"finaud_decision": "NO",
"last_available_upto": 0,
@@ -824,7 +814,6 @@
"opa_rate": 0,
"last_job_date": 0,
"eth_rate": 10,
- "opa": "NO",
"last_available_upto": 0,
"finaud_decision": "NO",
"api_timestamp": 1568902577,
@@ -907,7 +896,6 @@
}
],
"cpuset": 11,
- "opa": "NO",
"eth_rate": 10,
"last_job_date": 0,
"opa_rate": 0,
@@ -950,7 +938,6 @@
"opa_rate": 0,
"memnode": 131072,
"desktop_computing": "NO",
- "opa": "NO",
"eth_rate": 10,
"last_job_date": 0,
"ib_rate": 0,
@@ -1031,7 +1018,6 @@
"desktop_computing": "NO",
"memnode": 131072,
"eth_rate": 10,
- "opa": "NO",
"last_job_date": 0,
"wattmeter": "MULTIPLE",
"next_finaud_decision": "NO",
@@ -1124,7 +1110,6 @@
"besteffort": "YES",
"ib_rate": 0,
"last_job_date": 0,
- "opa": "NO",
"eth_rate": 10,
"desktop_computing": "NO",
"memnode": 131072,
@@ -1184,7 +1169,6 @@
"opa_rate": 0,
"last_job_date": 0,
"eth_rate": 10,
- "opa": "NO",
"gpudevice": 3,
"cpuarch": "x86_64",
"host": "clustera-1.fakesite.grid5000.fr",
@@ -1291,8 +1275,7 @@
"memnode": 131072,
"opa_rate": 0,
"last_job_date": 0,
- "eth_rate": 10,
- "opa": "NO"
+ "eth_rate": 10
},
{
"max_walltime": 86400,
@@ -1332,7 +1315,6 @@
"opa_rate": 0,
"last_job_date": 0,
"eth_rate": 10,
- "opa": "NO",
"available_upto": 2147483647,
"cpuset": 1,
"links": [
@@ -1372,7 +1354,6 @@
},
{
"eth_rate": 10,
- "opa": "NO",
"last_job_date": 0,
"opa_rate": 0,
"memnode": 131072,
@@ -1459,7 +1440,6 @@
"api_timestamp": 1568902577,
"finaud_decision": "NO",
"last_available_upto": 0,
- "opa": "NO",
"eth_rate": 10,
"last_job_date": 0,
"opa_rate": 0,
@@ -1592,7 +1572,6 @@
"ib_rate": 0,
"besteffort": "YES",
"last_job_date": 0,
- "opa": "NO",
"eth_rate": 10,
"memnode": 131072,
"desktop_computing": "NO",
@@ -1625,7 +1604,6 @@
"besteffort": "YES",
"last_job_date": 0,
"eth_rate": 10,
- "opa": "NO",
"memnode": 131072,
"desktop_computing": "NO",
"opa_rate": 0,
@@ -1747,8 +1725,7 @@
"desktop_computing": "NO",
"opa_rate": 0,
"last_job_date": 0,
- "eth_rate": 10,
- "opa": "NO"
+ "eth_rate": 10
},
{
"mic": "NO",
@@ -1799,7 +1776,6 @@
"memnode": 131072,
"opa_rate": 0,
"last_job_date": 0,
- "opa": "NO",
"eth_rate": 10,
"available_upto": 2147483647,
"links": [
@@ -1898,7 +1874,6 @@
"opa_rate": 0,
"memnode": 131072,
"desktop_computing": "NO",
- "opa": "NO",
"eth_rate": 10,
"last_job_date": 0
},
@@ -1929,7 +1904,6 @@
"besteffort": "YES",
"last_job_date": 0,
"eth_rate": 10,
- "opa": "NO",
"memnode": 131072,
"desktop_computing": "NO",
"opa_rate": 0,
@@ -1983,7 +1957,6 @@
"memnode": 131072,
"desktop_computing": "NO",
"eth_rate": 10,
- "opa": "NO",
"last_job_date": 0,
"ib_rate": 0,
"besteffort": "YES",
@@ -2124,7 +2097,6 @@
],
"cpuset": 11,
"eth_rate": 10,
- "opa": "NO",
"last_job_date": 0,
"opa_rate": 0,
"desktop_computing": "NO",
@@ -2191,7 +2163,6 @@
"desktop_computing": "NO",
"memnode": 131072,
"eth_rate": 10,
- "opa": "NO",
"last_job_date": 0,
"finaud_decision": "NO",
"last_available_upto": 0,
@@ -2220,7 +2191,6 @@
"last_available_upto": 0,
"finaud_decision": "NO",
"last_job_date": 0,
- "opa": "NO",
"eth_rate": 10,
"memnode": 131072,
"desktop_computing": "NO",
@@ -2343,7 +2313,6 @@
"memnode": 131072,
"desktop_computing": "NO",
"eth_rate": 10,
- "opa": "NO",
"last_job_date": 0,
"finaud_decision": "NO",
"last_available_upto": 0,
@@ -2403,7 +2372,6 @@
"myri_rate": 0,
"finaud_decision": "NO",
"last_available_upto": 0,
- "opa": "NO",
"eth_rate": 100,
"last_job_date": 0,
"opa_rate": 0,
diff --git a/spec/stub_oar_properties/dump_oar_api_configured_server_with_disk.json b/spec/stub_oar_properties/dump_oar_api_configured_server_with_disk.json
index 224837f20ef..ad67c3bb8ff 100644
--- a/spec/stub_oar_properties/dump_oar_api_configured_server_with_disk.json
+++ b/spec/stub_oar_properties/dump_oar_api_configured_server_with_disk.json
@@ -78,8 +78,7 @@
"memcore" : 8192,
"besteffort" : "YES",
"core" : 1,
- "myri" : "NO",
- "opa" : "NO"
+ "myri" : "NO"
},
{
"last_available_upto" : 0,
@@ -133,7 +132,6 @@
"myri" : "NO",
"core" : 2,
"besteffort" : "YES",
- "opa" : "NO",
"ib_count" : 0,
"expiry_date" : 0,
"cpufreq" : "2.1",
@@ -184,7 +182,6 @@
"cpu" : 1,
"last_job_date" : 0,
"opa_count" : 0,
- "opa" : "NO",
"besteffort" : "YES",
"core" : 3,
"myri" : "NO",
@@ -286,7 +283,6 @@
"mic" : "NO",
"scheduler_priority" : 0,
"state" : "Alive",
- "opa" : "NO",
"myri" : "NO",
"core" : 4,
"besteffort" : "YES",
@@ -364,7 +360,6 @@
"disk_reservation_count" : 3,
"diskpath" : null,
"switch" : null,
- "opa" : "NO",
"besteffort" : "YES",
"core" : 5,
"myri" : "NO",
@@ -466,7 +461,6 @@
"cpu" : 1,
"deploy": "YES",
"last_job_date" : 0,
- "opa" : "NO",
"besteffort" : "YES",
"core" : 6,
"myri" : "NO"
@@ -496,7 +490,6 @@
"last_job_date" : 0,
"expiry_date" : 0,
"ib_count" : 0,
- "opa" : "NO",
"besteffort" : "YES",
"myri" : "NO",
"core" : 7,
@@ -622,7 +615,6 @@
"suspended_jobs" : "NO",
"cpuset" : 7,
"network_address" : "clusterb-1.fakesite.grid5000.fr",
- "opa" : "NO",
"core" : 8,
"myri" : "NO",
"besteffort" : "YES"
@@ -631,7 +623,6 @@
"besteffort" : "YES",
"myri" : "NO",
"core" : 9,
- "opa" : "NO",
"drain" : "NO",
"eth_rate" : 10,
"suspended_jobs" : "NO",
@@ -754,7 +745,6 @@
"disk_reservation_count" : 3,
"diskpath" : null,
"switch" : null,
- "opa" : "NO",
"besteffort" : "YES",
"myri" : "NO",
"core" : 10,
@@ -858,8 +848,7 @@
"opa_rate" : 0,
"myri" : "NO",
"core" : 11,
- "besteffort" : "YES",
- "opa" : "NO"
+ "besteffort" : "YES"
},
{
"mic" : "NO",
@@ -936,8 +925,7 @@
"id" : 12,
"besteffort" : "YES",
"core" : 12,
- "myri" : "NO",
- "opa" : "NO"
+ "myri" : "NO"
},
{
"state_num" : 1,
@@ -1012,7 +1000,6 @@
"drain" : "NO",
"suspended_jobs" : "NO",
"network_address" : "clusterb-1.fakesite.grid5000.fr",
- "opa" : "NO",
"myri" : "NO",
"core" : 13,
"besteffort" : "YES"
@@ -1066,7 +1053,6 @@
"state" : "Alive",
"disktype" : "SATA",
"mic" : "NO",
- "opa" : "NO",
"core" : 14,
"myri" : "NO",
"besteffort" : "YES",
@@ -1099,7 +1085,6 @@
"core" : 15,
"myri" : "NO",
"besteffort" : "YES",
- "opa" : "NO",
"opa_count" : 0,
"ib_count" : 0,
"expiry_date" : 0,
@@ -1174,7 +1159,6 @@
"eth_count" : 1
},
{
- "opa" : "NO",
"myri" : "NO",
"core" : 16,
"besteffort" : "YES",
@@ -1255,7 +1239,6 @@
"core" : null,
"myri" : null,
"besteffort" : "YES",
- "opa" : null,
"myri_count" : null,
"cpu" : null,
"cpufreq" : null,
@@ -1378,7 +1361,6 @@
"production" : "YES",
"switch" : null,
"diskpath" : "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:2:0",
- "opa" : null,
"besteffort" : "YES",
"myri" : null,
"core" : null,
@@ -1435,7 +1417,6 @@
"besteffort" : "YES",
"myri" : null,
"core" : null,
- "opa" : null,
"disktype" : null,
"mic" : null,
"scheduler_priority" : 0,
@@ -1489,7 +1470,6 @@
"besteffort" : "YES",
"core" : 17,
"myri" : "NO",
- "opa" : "NO",
"eth_rate" : 10,
"drain" : "NO",
"suspended_jobs" : "NO",
@@ -1567,7 +1547,6 @@
"besteffort" : "YES",
"core" : 18,
"myri" : "NO",
- "opa" : "NO",
"suspended_jobs" : "NO",
"eth_rate" : 10,
"drain" : "NO",
@@ -1642,7 +1621,6 @@
"ib" : "NO"
},
{
- "opa" : "NO",
"myri" : "NO",
"core" : 19,
"besteffort" : "YES",
@@ -1794,8 +1772,7 @@
"opa_rate" : 0,
"core" : 20,
"myri" : "NO",
- "besteffort" : "YES",
- "opa" : "NO"
+ "besteffort" : "YES"
},
{
"wattmeter" : "MULTIPLE",
@@ -1849,7 +1826,6 @@
"core" : 21,
"myri" : "NO",
"besteffort" : "YES",
- "opa" : "NO",
"last_job_date" : 0,
"myri_count" : 0,
"cpufreq" : "2.1",
@@ -1948,13 +1924,11 @@
"expiry_date" : 0,
"ib_count" : 0,
"opa_count" : 0,
- "opa" : "NO",
"besteffort" : "YES",
"core" : 22,
"myri" : "NO"
},
{
- "opa" : "NO",
"besteffort" : "YES",
"core" : 23,
"myri" : "NO",
@@ -2080,7 +2054,6 @@
"state" : "Alive",
"disktype" : "SATA",
"mic" : "NO",
- "opa" : "NO",
"myri" : "NO",
"core" : 24,
"besteffort" : "YES",
@@ -2158,7 +2131,6 @@
"disk_reservation_count" : 3,
"max_walltime" : 86400,
"production" : "YES",
- "opa" : "NO",
"besteffort" : "YES",
"myri" : "NO",
"core" : 25,
@@ -2188,7 +2160,6 @@
"opa_count" : 0
},
{
- "opa" : "NO",
"besteffort" : "YES",
"myri" : "NO",
"core" : 26,
@@ -2314,7 +2285,6 @@
"scheduler_priority" : 0,
"mic" : "NO",
"disktype" : "SATA",
- "opa" : "NO",
"core" : 27,
"myri" : "NO",
"besteffort" : "YES",
@@ -2395,7 +2365,6 @@
"core" : 28,
"myri" : "NO",
"besteffort" : "YES",
- "opa" : "NO",
"opa_count" : 0,
"cpufreq" : "2.1",
"myri_count" : 0,
@@ -2496,8 +2465,7 @@
"memnode" : 131072,
"core" : 29,
"myri" : "NO",
- "besteffort" : "YES",
- "opa" : "NO"
+ "besteffort" : "YES"
},
{
"finaud_decision" : "NO",
@@ -2548,7 +2516,6 @@
"state" : "Alive",
"disktype" : "SATA",
"mic" : "NO",
- "opa" : "NO",
"myri" : "NO",
"core" : 30,
"besteffort" : "YES",
@@ -2602,7 +2569,6 @@
"deploy": "YES",
"ib_count" : 0,
"expiry_date" : 0,
- "opa" : "NO",
"besteffort" : "YES",
"myri" : "NO",
"core" : 31,
@@ -2656,7 +2622,6 @@
"last_available_upto" : 0
},
{
- "opa" : "NO",
"besteffort" : "YES",
"core" : 32,
"myri" : "NO",
@@ -2806,7 +2771,6 @@
"drain" : "NO",
"network_address" : "",
"cpuset" : -1,
- "opa" : null,
"myri" : null,
"core" : null,
"besteffort" : "YES"
@@ -2815,7 +2779,6 @@
"besteffort" : "YES",
"core" : null,
"myri" : null,
- "opa" : null,
"eth_rate" : null,
"network_address" : "",
"drain" : "NO",
@@ -2938,7 +2901,6 @@
"max_walltime" : null,
"switch" : null,
"diskpath" : "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:3:0",
- "opa" : null,
"besteffort" : "YES",
"core" : null,
"myri" : null,
diff --git a/spec/stub_oar_properties/dump_oar_api_configured_server_with_disk_misconfigured_resources_properties_and_disks.json b/spec/stub_oar_properties/dump_oar_api_configured_server_with_disk_misconfigured_resources_properties_and_disks.json
index a89a018b30a..2cf0c97bc0d 100644
--- a/spec/stub_oar_properties/dump_oar_api_configured_server_with_disk_misconfigured_resources_properties_and_disks.json
+++ b/spec/stub_oar_properties/dump_oar_api_configured_server_with_disk_misconfigured_resources_properties_and_disks.json
@@ -78,8 +78,7 @@
"memcore" : 8192,
"besteffort" : "YES",
"core" : 1,
- "myri" : "NO",
- "opa" : "NO"
+ "myri" : "NO"
},
{
"last_available_upto" : 0,
@@ -133,7 +132,6 @@
"myri" : "NO",
"core" : 2,
"besteffort" : "YES",
- "opa" : "NO",
"ib_count" : 0,
"expiry_date" : 0,
"cpufreq" : "2.1",
@@ -184,7 +182,6 @@
"cpu" : 1,
"last_job_date" : 0,
"opa_count" : 0,
- "opa" : "NO",
"besteffort" : "YES",
"core" : 3,
"myri" : "NO",
@@ -286,7 +283,6 @@
"mic" : "NO",
"scheduler_priority" : 0,
"state" : "Alive",
- "opa" : "NO",
"myri" : "NO",
"core" : 4,
"besteffort" : "YES",
@@ -364,7 +360,6 @@
"disk_reservation_count" : 3,
"diskpath" : null,
"switch" : null,
- "opa" : "NO",
"besteffort" : "YES",
"core" : 5,
"myri" : "NO",
@@ -466,7 +461,6 @@
"cpu" : 1,
"deploy" : "NO",
"last_job_date" : 0,
- "opa" : "NO",
"besteffort" : "YES",
"core" : 6,
"myri" : "NO"
@@ -496,7 +490,6 @@
"last_job_date" : 0,
"expiry_date" : 0,
"ib_count" : 0,
- "opa" : "NO",
"besteffort" : "YES",
"myri" : "NO",
"core" : 7,
@@ -622,7 +615,6 @@
"suspended_jobs" : "NO",
"cpuset" : 7,
"network_address" : "clusterb-1.fakesite.grid5000.fr",
- "opa" : "NO",
"core" : 8,
"myri" : "NO",
"besteffort" : "YES"
@@ -631,7 +623,6 @@
"besteffort" : "YES",
"myri" : "NO",
"core" : 9,
- "opa" : "NO",
"drain" : "NO",
"eth_rate" : 10,
"suspended_jobs" : "NO",
@@ -754,7 +745,6 @@
"disk_reservation_count" : 3,
"diskpath" : null,
"switch" : null,
- "opa" : "NO",
"besteffort" : "YES",
"myri" : "NO",
"core" : 10,
@@ -858,8 +848,7 @@
"opa_rate" : 0,
"myri" : "NO",
"core" : 11,
- "besteffort" : "YES",
- "opa" : "NO"
+ "besteffort" : "YES"
},
{
"mic" : "NO",
@@ -936,8 +925,7 @@
"id" : 12,
"besteffort" : "YES",
"core" : 12,
- "myri" : "NO",
- "opa" : "NO"
+ "myri" : "NO"
},
{
"state_num" : 1,
@@ -1012,7 +1000,6 @@
"drain" : "NO",
"suspended_jobs" : "NO",
"network_address" : "clusterb-1.fakesite.grid5000.fr",
- "opa" : "NO",
"myri" : "NO",
"core" : 13,
"besteffort" : "YES"
@@ -1066,7 +1053,6 @@
"state" : "Alive",
"disktype" : "SATAA",
"mic" : "NO",
- "opa" : "NO",
"core" : 14,
"myri" : "NO",
"besteffort" : "YES",
@@ -1099,7 +1085,6 @@
"core" : 15,
"myri" : "NO",
"besteffort" : "YES",
- "opa" : "NO",
"opa_count" : 0,
"ib_count" : 0,
"expiry_date" : 0,
@@ -1174,7 +1159,6 @@
"eth_count" : 1
},
{
- "opa" : "NO",
"myri" : "NO",
"core" : 16,
"besteffort" : "YES",
@@ -1255,7 +1239,6 @@
"core" : null,
"myri" : null,
"besteffort" : "YES",
- "opa" : null,
"myri_count" : null,
"cpu" : null,
"cpufreq" : null,
@@ -1378,7 +1361,6 @@
"production" : "YES",
"switch" : null,
"diskpath" : "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:2:0",
- "opa" : null,
"besteffort" : "YES",
"myri" : null,
"core" : null,
@@ -1435,7 +1417,6 @@
"besteffort" : "YES",
"myri" : null,
"core" : null,
- "opa" : null,
"disktype" : null,
"mic" : null,
"scheduler_priority" : 0,
@@ -1489,7 +1470,6 @@
"besteffort" : "YES",
"core" : 17,
"myri" : "NO",
- "opa" : "NO",
"eth_rate" : 10,
"drain" : "NO",
"suspended_jobs" : "NO",
@@ -1567,7 +1547,6 @@
"besteffort" : "YES",
"core" : 18,
"myri" : "NO",
- "opa" : "NO",
"suspended_jobs" : "NO",
"eth_rate" : 10,
"drain" : "NO",
@@ -1642,7 +1621,6 @@
"ib" : "NO"
},
{
- "opa" : "NO",
"myri" : "NO",
"core" : 19,
"besteffort" : "YES",
@@ -1794,8 +1772,7 @@
"opa_rate" : 0,
"core" : 20,
"myri" : "NO",
- "besteffort" : "YES",
- "opa" : "NO"
+ "besteffort" : "YES"
},
{
"wattmeter" : "MULTIPLE",
@@ -1849,7 +1826,6 @@
"core" : 21,
"myri" : "NO",
"besteffort" : "YES",
- "opa" : "NO",
"last_job_date" : 0,
"myri_count" : 0,
"cpufreq" : "2.1",
@@ -1948,13 +1924,11 @@
"expiry_date" : 0,
"ib_count" : 0,
"opa_count" : 0,
- "opa" : "NO",
"besteffort" : "YES",
"core" : 22,
"myri" : "NO"
},
{
- "opa" : "NO",
"besteffort" : "YES",
"core" : 23,
"myri" : "NO",
@@ -2080,7 +2054,6 @@
"state" : "Alive",
"disktype" : "SATAA",
"mic" : "NO",
- "opa" : "NO",
"myri" : "NO",
"core" : 24,
"besteffort" : "YES",
@@ -2158,7 +2131,6 @@
"disk_reservation_count" : 3,
"max_walltime" : 86400,
"production" : "YES",
- "opa" : "NO",
"besteffort" : "YES",
"myri" : "NO",
"core" : 25,
@@ -2188,7 +2160,6 @@
"opa_count" : 0
},
{
- "opa" : "NO",
"besteffort" : "YES",
"myri" : "NO",
"core" : 26,
@@ -2314,7 +2285,6 @@
"scheduler_priority" : 0,
"mic" : "NO",
"disktype" : "SATAA",
- "opa" : "NO",
"core" : 27,
"myri" : "NO",
"besteffort" : "YES",
@@ -2395,7 +2365,6 @@
"core" : 28,
"myri" : "NO",
"besteffort" : "YES",
- "opa" : "NO",
"opa_count" : 0,
"cpufreq" : "2.1",
"myri_count" : 0,
@@ -2496,8 +2465,7 @@
"memnode" : 131072,
"core" : 29,
"myri" : "NO",
- "besteffort" : "YES",
- "opa" : "NO"
+ "besteffort" : "YES"
},
{
"finaud_decision" : "NO",
@@ -2548,7 +2516,6 @@
"state" : "Alive",
"disktype" : "SATAA",
"mic" : "NO",
- "opa" : "NO",
"myri" : "NO",
"core" : 30,
"besteffort" : "YES",
@@ -2602,7 +2569,6 @@
"deploy" : "NO",
"ib_count" : 0,
"expiry_date" : 0,
- "opa" : "NO",
"besteffort" : "YES",
"myri" : "NO",
"core" : 31,
@@ -2656,7 +2622,6 @@
"last_available_upto" : 0
},
{
- "opa" : "NO",
"besteffort" : "YES",
"core" : 32,
"myri" : "NO",
@@ -2806,7 +2771,6 @@
"drain" : "NO",
"network_address" : "",
"cpuset" : -1,
- "opa" : null,
"myri" : null,
"core" : null,
"besteffort" : "YES"
@@ -2815,7 +2779,6 @@
"besteffort" : "YES",
"core" : null,
"myri" : null,
- "opa" : null,
"eth_rate" : null,
"network_address" : "",
"drain" : "NO",
@@ -2938,7 +2901,6 @@
"max_walltime" : null,
"switch" : null,
"diskpath" : "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:3:0",
- "opa" : null,
"besteffort" : "YES",
"core" : null,
"myri" : null,
diff --git a/spec/stub_oar_properties/dump_oar_api_configured_server_with_too_few_oar_resources.json b/spec/stub_oar_properties/dump_oar_api_configured_server_with_too_few_oar_resources.json
index d2e9da1ce73..9022e52b432 100644
--- a/spec/stub_oar_properties/dump_oar_api_configured_server_with_too_few_oar_resources.json
+++ b/spec/stub_oar_properties/dump_oar_api_configured_server_with_too_few_oar_resources.json
@@ -42,7 +42,6 @@
"opa_rate": 0,
"desktop_computing": "NO",
"memnode": 131072,
- "opa": "NO",
"eth_rate": 10,
"last_job_date": 0,
"wattmeter": "MULTIPLE",
@@ -81,7 +80,6 @@
{
"last_job_date": 0,
"eth_rate": 10,
- "opa": "NO",
"memnode": 131072,
"desktop_computing": "NO",
"opa_rate": 0,
@@ -192,7 +190,6 @@
"opa_rate": 0,
"last_job_date": 0,
"eth_rate": 10,
- "opa": "NO",
"cpuset": 2,
"links": [
{
@@ -292,7 +289,6 @@
"opa_rate": 0,
"last_job_date": 0,
"eth_rate": 10,
- "opa": "NO",
"last_available_upto": 0,
"finaud_decision": "NO",
"api_timestamp": 1568902577,
@@ -307,7 +303,6 @@
"state": "Alive"
},
{
- "opa": "NO",
"eth_rate": 10,
"last_job_date": 0,
"opa_rate": 0,
@@ -409,7 +404,6 @@
"besteffort": "YES",
"last_job_date": 0,
"eth_rate": 10,
- "opa": "NO",
"memnode": 131072,
"desktop_computing": "NO",
"opa_rate": 0,
@@ -475,7 +469,6 @@
"memnode": 131072,
"opa_rate": 0,
"last_job_date": 0,
- "opa": "NO",
"eth_rate": 10,
"available_upto": 2147483647,
"links": [
@@ -572,7 +565,6 @@
"besteffort": "YES",
"ib_rate": 0,
"last_job_date": 0,
- "opa": "NO",
"eth_rate": 10,
"desktop_computing": "NO",
"memnode": 131072,
@@ -650,7 +642,6 @@
"opa_rate": 0,
"desktop_computing": "NO",
"memnode": 131072,
- "opa": "NO",
"eth_rate": 10,
"last_job_date": 0,
"wattmeter": "MULTIPLE",
@@ -747,7 +738,6 @@
"desktop_computing": "NO",
"memnode": 131072,
"eth_rate": 10,
- "opa": "NO",
"last_job_date": 0,
"finaud_decision": "NO",
"last_available_upto": 0,
@@ -824,7 +814,6 @@
"opa_rate": 0,
"last_job_date": 0,
"eth_rate": 10,
- "opa": "NO",
"last_available_upto": 0,
"finaud_decision": "NO",
"api_timestamp": 1568902577,
@@ -907,7 +896,6 @@
}
],
"cpuset": 11,
- "opa": "NO",
"eth_rate": 10,
"last_job_date": 0,
"opa_rate": 0,
@@ -950,7 +938,6 @@
"opa_rate": 0,
"memnode": 131072,
"desktop_computing": "NO",
- "opa": "NO",
"eth_rate": 10,
"last_job_date": 0,
"ib_rate": 0,
@@ -1031,7 +1018,6 @@
"desktop_computing": "NO",
"memnode": 131072,
"eth_rate": 10,
- "opa": "NO",
"last_job_date": 0,
"wattmeter": "MULTIPLE",
"next_finaud_decision": "NO",
@@ -1124,7 +1110,6 @@
"besteffort": "YES",
"ib_rate": 0,
"last_job_date": 0,
- "opa": "NO",
"eth_rate": 10,
"desktop_computing": "NO",
"memnode": 131072,
@@ -1184,7 +1169,6 @@
"opa_rate": 0,
"last_job_date": 0,
"eth_rate": 10,
- "opa": "NO",
"gpudevice": 3,
"cpuarch": "x86_64",
"host": "clustera-1.fakesite.grid5000.fr",
@@ -1291,8 +1275,7 @@
"memnode": 131072,
"opa_rate": 0,
"last_job_date": 0,
- "eth_rate": 10,
- "opa": "NO"
+ "eth_rate": 10
},
{
"max_walltime": 86400,
@@ -1332,7 +1315,6 @@
"opa_rate": 0,
"last_job_date": 0,
"eth_rate": 10,
- "opa": "NO",
"available_upto": 2147483647,
"cpuset": 1,
"links": [
@@ -1372,7 +1354,6 @@
},
{
"eth_rate": 10,
- "opa": "NO",
"last_job_date": 0,
"opa_rate": 0,
"memnode": 131072,
@@ -1459,7 +1440,6 @@
"api_timestamp": 1568902577,
"finaud_decision": "NO",
"last_available_upto": 0,
- "opa": "NO",
"eth_rate": 10,
"last_job_date": 0,
"opa_rate": 0,
@@ -1592,7 +1572,6 @@
"ib_rate": 0,
"besteffort": "YES",
"last_job_date": 0,
- "opa": "NO",
"eth_rate": 10,
"memnode": 131072,
"desktop_computing": "NO",
@@ -1625,7 +1604,6 @@
"besteffort": "YES",
"last_job_date": 0,
"eth_rate": 10,
- "opa": "NO",
"memnode": 131072,
"desktop_computing": "NO",
"opa_rate": 0,
@@ -1747,8 +1725,7 @@
"desktop_computing": "NO",
"opa_rate": 0,
"last_job_date": 0,
- "eth_rate": 10,
- "opa": "NO"
+ "eth_rate": 10
},
{
"mic": "NO",
@@ -1799,7 +1776,6 @@
"memnode": 131072,
"opa_rate": 0,
"last_job_date": 0,
- "opa": "NO",
"eth_rate": 10,
"available_upto": 2147483647,
"links": [
@@ -1898,7 +1874,6 @@
"opa_rate": 0,
"memnode": 131072,
"desktop_computing": "NO",
- "opa": "NO",
"eth_rate": 10,
"last_job_date": 0
},
@@ -1929,7 +1904,6 @@
"besteffort": "YES",
"last_job_date": 0,
"eth_rate": 10,
- "opa": "NO",
"memnode": 131072,
"desktop_computing": "NO",
"opa_rate": 0,
@@ -1983,7 +1957,6 @@
"memnode": 131072,
"desktop_computing": "NO",
"eth_rate": 10,
- "opa": "NO",
"last_job_date": 0,
"ib_rate": 0,
"besteffort": "YES",
@@ -2124,7 +2097,6 @@
],
"cpuset": 11,
"eth_rate": 10,
- "opa": "NO",
"last_job_date": 0,
"opa_rate": 0,
"desktop_computing": "NO",
@@ -2191,7 +2163,6 @@
"desktop_computing": "NO",
"memnode": 131072,
"eth_rate": 10,
- "opa": "NO",
"last_job_date": 0,
"finaud_decision": "NO",
"last_available_upto": 0,
@@ -2220,7 +2191,6 @@
"last_available_upto": 0,
"finaud_decision": "NO",
"last_job_date": 0,
- "opa": "NO",
"eth_rate": 10,
"memnode": 131072,
"desktop_computing": "NO",
@@ -2343,7 +2313,6 @@
"memnode": 131072,
"desktop_computing": "NO",
"eth_rate": 10,
- "opa": "NO",
"last_job_date": 0,
"finaud_decision": "NO",
"last_available_upto": 0,
diff --git a/spec/stub_oar_properties/dump_oar_api_configured_server_with_too_many_oar_resources.json b/spec/stub_oar_properties/dump_oar_api_configured_server_with_too_many_oar_resources.json
index 247174d7c3b..6d9cb756ba4 100644
--- a/spec/stub_oar_properties/dump_oar_api_configured_server_with_too_many_oar_resources.json
+++ b/spec/stub_oar_properties/dump_oar_api_configured_server_with_too_many_oar_resources.json
@@ -42,7 +42,6 @@
"opa_rate": 0,
"desktop_computing": "NO",
"memnode": 131072,
- "opa": "NO",
"eth_rate": 10,
"last_job_date": 0,
"wattmeter": "MULTIPLE",
@@ -81,7 +80,6 @@
{
"last_job_date": 0,
"eth_rate": 10,
- "opa": "NO",
"memnode": 131072,
"desktop_computing": "NO",
"opa_rate": 0,
@@ -192,7 +190,6 @@
"opa_rate": 0,
"last_job_date": 0,
"eth_rate": 10,
- "opa": "NO",
"cpuset": 2,
"links": [
{
@@ -292,7 +289,6 @@
"opa_rate": 0,
"last_job_date": 0,
"eth_rate": 10,
- "opa": "NO",
"last_available_upto": 0,
"finaud_decision": "NO",
"api_timestamp": 1568902577,
@@ -307,7 +303,6 @@
"state": "Alive"
},
{
- "opa": "NO",
"eth_rate": 10,
"last_job_date": 0,
"opa_rate": 0,
@@ -409,7 +404,6 @@
"besteffort": "YES",
"last_job_date": 0,
"eth_rate": 10,
- "opa": "NO",
"memnode": 131072,
"desktop_computing": "NO",
"opa_rate": 0,
@@ -475,7 +469,6 @@
"memnode": 131072,
"opa_rate": 0,
"last_job_date": 0,
- "opa": "NO",
"eth_rate": 10,
"available_upto": 2147483647,
"links": [
@@ -572,7 +565,6 @@
"besteffort": "YES",
"ib_rate": 0,
"last_job_date": 0,
- "opa": "NO",
"eth_rate": 10,
"desktop_computing": "NO",
"memnode": 131072,
@@ -650,7 +642,6 @@
"opa_rate": 0,
"desktop_computing": "NO",
"memnode": 131072,
- "opa": "NO",
"eth_rate": 10,
"last_job_date": 0,
"wattmeter": "MULTIPLE",
@@ -747,7 +738,6 @@
"desktop_computing": "NO",
"memnode": 131072,
"eth_rate": 10,
- "opa": "NO",
"last_job_date": 0,
"finaud_decision": "NO",
"last_available_upto": 0,
@@ -824,7 +814,6 @@
"opa_rate": 0,
"last_job_date": 0,
"eth_rate": 10,
- "opa": "NO",
"last_available_upto": 0,
"finaud_decision": "NO",
"api_timestamp": 1568902577,
@@ -907,7 +896,6 @@
}
],
"cpuset": 11,
- "opa": "NO",
"eth_rate": 10,
"last_job_date": 0,
"opa_rate": 0,
@@ -950,7 +938,6 @@
"opa_rate": 0,
"memnode": 131072,
"desktop_computing": "NO",
- "opa": "NO",
"eth_rate": 10,
"last_job_date": 0,
"ib_rate": 0,
@@ -1031,7 +1018,6 @@
"desktop_computing": "NO",
"memnode": 131072,
"eth_rate": 10,
- "opa": "NO",
"last_job_date": 0,
"wattmeter": "MULTIPLE",
"next_finaud_decision": "NO",
@@ -1124,7 +1110,6 @@
"besteffort": "YES",
"ib_rate": 0,
"last_job_date": 0,
- "opa": "NO",
"eth_rate": 10,
"desktop_computing": "NO",
"memnode": 131072,
@@ -1184,7 +1169,6 @@
"opa_rate": 0,
"last_job_date": 0,
"eth_rate": 10,
- "opa": "NO",
"gpudevice": 3,
"cpuarch": "x86_64",
"host": "clustera-1.fakesite.grid5000.fr",
@@ -1291,8 +1275,7 @@
"memnode": 131072,
"opa_rate": 0,
"last_job_date": 0,
- "eth_rate": 10,
- "opa": "NO"
+ "eth_rate": 10
},
{
"max_walltime": 86400,
@@ -1332,7 +1315,6 @@
"opa_rate": 0,
"last_job_date": 0,
"eth_rate": 10,
- "opa": "NO",
"available_upto": 2147483647,
"cpuset": 1,
"links": [
@@ -1372,7 +1354,6 @@
},
{
"eth_rate": 10,
- "opa": "NO",
"last_job_date": 0,
"opa_rate": 0,
"memnode": 131072,
@@ -1459,7 +1440,6 @@
"api_timestamp": 1568902577,
"finaud_decision": "NO",
"last_available_upto": 0,
- "opa": "NO",
"eth_rate": 10,
"last_job_date": 0,
"opa_rate": 0,
@@ -1592,7 +1572,6 @@
"ib_rate": 0,
"besteffort": "YES",
"last_job_date": 0,
- "opa": "NO",
"eth_rate": 10,
"memnode": 131072,
"desktop_computing": "NO",
@@ -1625,7 +1604,6 @@
"besteffort": "YES",
"last_job_date": 0,
"eth_rate": 10,
- "opa": "NO",
"memnode": 131072,
"desktop_computing": "NO",
"opa_rate": 0,
@@ -1747,8 +1725,7 @@
"desktop_computing": "NO",
"opa_rate": 0,
"last_job_date": 0,
- "eth_rate": 10,
- "opa": "NO"
+ "eth_rate": 10
},
{
"mic": "NO",
@@ -1799,7 +1776,6 @@
"memnode": 131072,
"opa_rate": 0,
"last_job_date": 0,
- "opa": "NO",
"eth_rate": 10,
"available_upto": 2147483647,
"links": [
@@ -1898,7 +1874,6 @@
"opa_rate": 0,
"memnode": 131072,
"desktop_computing": "NO",
- "opa": "NO",
"eth_rate": 10,
"last_job_date": 0
},
@@ -1929,7 +1904,6 @@
"besteffort": "YES",
"last_job_date": 0,
"eth_rate": 10,
- "opa": "NO",
"memnode": 131072,
"desktop_computing": "NO",
"opa_rate": 0,
@@ -1983,7 +1957,6 @@
"memnode": 131072,
"desktop_computing": "NO",
"eth_rate": 10,
- "opa": "NO",
"last_job_date": 0,
"ib_rate": 0,
"besteffort": "YES",
@@ -2124,7 +2097,6 @@
],
"cpuset": 11,
"eth_rate": 10,
- "opa": "NO",
"last_job_date": 0,
"opa_rate": 0,
"desktop_computing": "NO",
@@ -2191,7 +2163,6 @@
"desktop_computing": "NO",
"memnode": 131072,
"eth_rate": 10,
- "opa": "NO",
"last_job_date": 0,
"finaud_decision": "NO",
"last_available_upto": 0,
@@ -2220,7 +2191,6 @@
"last_available_upto": 0,
"finaud_decision": "NO",
"last_job_date": 0,
- "opa": "NO",
"eth_rate": 10,
"memnode": 131072,
"desktop_computing": "NO",
@@ -2343,7 +2313,6 @@
"memnode": 131072,
"desktop_computing": "NO",
"eth_rate": 10,
- "opa": "NO",
"last_job_date": 0,
"finaud_decision": "NO",
"last_available_upto": 0,
@@ -2403,7 +2372,6 @@
"myri_rate": 0,
"finaud_decision": "NO",
"last_available_upto": 0,
- "opa": "NO",
"eth_rate": 10,
"last_job_date": 0,
"opa_rate": 0,
@@ -2479,7 +2447,6 @@
"myri_rate": 0,
"finaud_decision": "NO",
"last_available_upto": 0,
- "opa": "NO",
"eth_rate": 10,
"last_job_date": 0,
"opa_rate": 0,
diff --git a/spec/stub_oar_properties/dump_oar_api_configured_server_without_gpu.json b/spec/stub_oar_properties/dump_oar_api_configured_server_without_gpu.json
index 757019d3347..c92d9709bcb 100644
--- a/spec/stub_oar_properties/dump_oar_api_configured_server_without_gpu.json
+++ b/spec/stub_oar_properties/dump_oar_api_configured_server_without_gpu.json
@@ -9,7 +9,6 @@
"offset" : 0,
"items" : [
{
- "opa" : "NO",
"myri_count" : 0,
"cluster" : "clusterc",
"cputype" : "Intel Xeon Silver 4110",
@@ -110,7 +109,6 @@
"cluster" : "clusterc",
"cputype" : "Intel Xeon Silver 4110",
"myri_count" : 0,
- "opa" : "NO",
"api_timestamp" : 1569605253,
"maintenance" : "NO",
"gpu_model" : null,
@@ -218,7 +216,6 @@
"opa_rate" : 0,
"cputype" : "Intel Xeon Silver 4110",
"cluster" : "clusterc",
- "opa" : "NO",
"myri_count" : 0,
"api_timestamp" : 1569605253,
"state" : "Alive",
@@ -292,7 +289,6 @@
"api_timestamp" : 1569605253,
"cluster" : "clusterc",
"cputype" : "Intel Xeon Silver 4110",
- "opa" : "NO",
"myri_count" : 0,
"state_num" : 1,
"opa_rate" : 0,
@@ -350,7 +346,6 @@
"cluster" : "clusterc",
"cputype" : "Intel Xeon Silver 4110",
"myri_count" : 0,
- "opa" : "NO",
"eth_rate" : 10,
"cpuarch" : "x86_64",
"state" : "Alive",
@@ -414,7 +409,6 @@
"state" : "Alive",
"eth_rate" : 10,
"cpuarch" : "x86_64",
- "opa" : "NO",
"myri_count" : 0,
"cputype" : "Intel Xeon Silver 4110",
"cluster" : "clusterc",
@@ -545,7 +539,6 @@
"opa_rate" : 0,
"cputype" : "Intel Xeon Silver 4110",
"cluster" : "clusterc",
- "opa" : "NO",
"myri_count" : 0,
"api_timestamp" : 1569605253,
"ib_count" : 0,
@@ -558,7 +551,6 @@
"cputype" : "Intel Xeon Silver 4110",
"cluster" : "clusterc",
"myri_count" : 0,
- "opa" : "NO",
"api_timestamp" : 1569605253,
"state" : "Alive",
"ib_count" : 0,
@@ -706,7 +698,6 @@
"state" : "Alive",
"api_timestamp" : 1569605253,
"myri_count" : 0,
- "opa" : "NO",
"cputype" : "Intel Xeon Silver 4110",
"cluster" : "clusterc"
},
@@ -778,7 +769,6 @@
"opa_rate" : 0,
"state_num" : 1,
"myri_count" : 0,
- "opa" : "NO",
"cluster" : "clusterc",
"cputype" : "Intel Xeon Silver 4110",
"api_timestamp" : 1569605253,
@@ -809,7 +799,6 @@
"ib_count" : 0,
"eth_rate" : 10,
"cpuarch" : "x86_64",
- "opa" : "NO",
"myri_count" : 0,
"cluster" : "clusterc",
"cputype" : "Intel Xeon Silver 4110",
@@ -884,7 +873,6 @@
"last_available_upto" : 0,
"api_timestamp" : 1569605253,
"myri_count" : 0,
- "opa" : "NO",
"cluster" : "clusterc",
"cputype" : "Intel Xeon Silver 4110",
"cpuarch" : "x86_64",
@@ -976,7 +964,6 @@
"ib_count" : 0,
"state" : "Alive",
"api_timestamp" : 1569605253,
- "opa" : "NO",
"myri_count" : 0,
"cputype" : "Intel Xeon Silver 4110",
"cluster" : "clusterc",
@@ -1025,7 +1012,6 @@
{
"cluster" : "clusterc",
"cputype" : "Intel Xeon Silver 4110",
- "opa" : "NO",
"myri_count" : 0,
"api_timestamp" : 1569605253,
"state" : "Alive",
@@ -1117,7 +1103,6 @@
"cpuarch" : "x86_64",
"eth_rate" : 10,
"myri_count" : 0,
- "opa" : "NO",
"cputype" : "Intel Xeon Silver 4110",
"cluster" : "clusterc",
"api_timestamp" : 1569605253,
@@ -1250,7 +1235,6 @@
"state" : "Alive",
"cpuarch" : "x86_64",
"eth_rate" : 10,
- "opa" : "NO",
"myri_count" : 0,
"cluster" : "clusterc",
"cputype" : "Intel Xeon Silver 4110",
@@ -1327,7 +1311,6 @@
"cputype" : null,
"cluster" : "clusterc",
"myri_count" : null,
- "opa" : null,
"eth_rate" : null,
"cpuarch" : null,
"state" : "Alive",
@@ -1359,7 +1342,6 @@
"cluster" : "clusterc",
"cputype" : null,
"myri_count" : null,
- "opa" : null,
"state_num" : 1,
"opa_rate" : null,
"maintenance" : "NO",
@@ -1445,7 +1427,6 @@
"ib_count" : null,
"api_timestamp" : 1569605253,
"myri_count" : null,
- "opa" : null,
"cputype" : null,
"cluster" : "clusterc",
"ib" : null,
@@ -1518,7 +1499,6 @@
"gpu_model" : null,
"api_timestamp" : 1569605253,
"myri_count" : 0,
- "opa" : "NO",
"cputype" : "Intel Xeon Silver 4110",
"cluster" : "clusterc",
"eth_rate" : 10,
@@ -1633,7 +1613,6 @@
"cluster" : "clusterc",
"cputype" : "Intel Xeon Silver 4110",
"myri_count" : 0,
- "opa" : "NO",
"api_timestamp" : 1569605253,
"cpucore" : 8,
"maintenance" : "NO",
@@ -1706,7 +1685,6 @@
"api_timestamp" : 1569605253,
"cluster" : "clusterc",
"cputype" : "Intel Xeon Silver 4110",
- "opa" : "NO",
"myri_count" : 0,
"eth_rate" : 10,
"cpuarch" : "x86_64",
@@ -1789,7 +1767,6 @@
"api_timestamp" : 1569605253,
"cluster" : "clusterc",
"cputype" : "Intel Xeon Silver 4110",
- "opa" : "NO",
"myri_count" : 0,
"state_num" : 1,
"opa_rate" : 0,
@@ -1865,7 +1842,6 @@
"state" : "Alive",
"ib_count" : 0,
"api_timestamp" : 1569605253,
- "opa" : "NO",
"myri_count" : 0,
"cluster" : "clusterc",
"cputype" : "Intel Xeon Silver 4110",
@@ -1940,7 +1916,6 @@
"cputype" : "Intel Xeon Silver 4110",
"cluster" : "clusterc",
"myri_count" : 0,
- "opa" : "NO",
"api_timestamp" : 1569605253,
"ib_count" : 0,
"state" : "Alive",
@@ -2013,7 +1988,6 @@
"cluster" : "clusterc",
"cputype" : "Intel Xeon Silver 4110",
"myri_count" : 0,
- "opa" : "NO",
"api_timestamp" : 1569605253,
"ib_count" : 0,
"state" : "Alive",
@@ -2048,7 +2022,6 @@
"host" : "clusterc-2.fakesite.grid5000.fr",
"cpucore" : 8,
"api_timestamp" : 1569605253,
- "opa" : "NO",
"myri_count" : 0,
"cluster" : "clusterc",
"cputype" : "Intel Xeon Silver 4110",
@@ -2131,7 +2104,6 @@
"last_available_upto" : 0,
"expiry_date" : 0,
"myri_count" : 0,
- "opa" : "NO",
"cputype" : "Intel Xeon Silver 4110",
"cluster" : "clusterc",
"api_timestamp" : 1569605253,
@@ -2214,7 +2186,6 @@
"cpuarch" : "x86_64",
"eth_rate" : 10,
"myri_count" : 0,
- "opa" : "NO",
"cputype" : "Intel Xeon Silver 4110",
"cluster" : "clusterc",
"api_timestamp" : 1569605253,
@@ -2276,7 +2247,6 @@
"state" : "Alive",
"eth_rate" : 10,
"cpuarch" : "x86_64",
- "opa" : "NO",
"myri_count" : 0,
"cluster" : "clusterc",
"cputype" : "Intel Xeon Silver 4110",
@@ -2381,7 +2351,6 @@
"ib_count" : 0,
"api_timestamp" : 1569605253,
"myri_count" : 0,
- "opa" : "NO",
"cluster" : "clusterc",
"cputype" : "Intel Xeon Silver 4110",
"ib" : "NO",
@@ -2500,7 +2469,6 @@
"eth_rate" : 10,
"cputype" : "Intel Xeon Silver 4110",
"cluster" : "clusterc",
- "opa" : "NO",
"myri_count" : 0,
"api_timestamp" : 1569605253
},
@@ -2564,7 +2532,6 @@
"api_timestamp" : 1569605253,
"cputype" : "Intel Xeon Silver 4110",
"cluster" : "clusterc",
- "opa" : "NO",
"myri_count" : 0,
"eth_rate" : 10,
"cpuarch" : "x86_64",
@@ -2615,7 +2582,6 @@
"ib_count" : 0,
"api_timestamp" : 1569605253,
"myri_count" : 0,
- "opa" : "NO",
"cputype" : "Intel Xeon Silver 4110",
"cluster" : "clusterc",
"production" : "YES",
@@ -2661,7 +2627,6 @@
"ip" : "172.16.64.2"
},
{
- "opa" : "NO",
"myri_count" : 0,
"cluster" : "clusterc",
"cputype" : "Intel Xeon Silver 4110",
@@ -2756,7 +2721,6 @@
"state" : "Alive",
"api_timestamp" : 1569605253,
"myri_count" : null,
- "opa" : null,
"cluster" : "clusterc",
"cputype" : null,
"expiry_date" : 0,
@@ -2830,7 +2794,6 @@
"api_timestamp" : 1569605253,
"cluster" : "clusterc",
"cputype" : null,
- "opa" : null,
"myri_count" : null,
"eth_rate" : null,
"cpuarch" : null,
@@ -2898,7 +2861,6 @@
"cputype" : null,
"cluster" : "clusterc",
"myri_count" : null,
- "opa" : null,
"api_timestamp" : 1569605253,
"ib_count" : null,
"state" : "Alive",
diff --git a/spec/stub_oar_properties/dump_oar_api_configured_server_wrong_vartype.json b/spec/stub_oar_properties/dump_oar_api_configured_server_wrong_vartype.json
index 8f095a5a68f..3a490c57730 100644
--- a/spec/stub_oar_properties/dump_oar_api_configured_server_wrong_vartype.json
+++ b/spec/stub_oar_properties/dump_oar_api_configured_server_wrong_vartype.json
@@ -42,7 +42,6 @@
"opa_rate": 0,
"desktop_computing": "NO",
"memnode": 131072,
- "opa": "NO",
"eth_rate": "10",
"last_job_date": 0,
"wattmeter": "MULTIPLE",
@@ -81,7 +80,6 @@
{
"last_job_date": 0,
"eth_rate": "10",
- "opa": "NO",
"memnode": 131072,
"desktop_computing": "NO",
"opa_rate": 0,
@@ -192,7 +190,6 @@
"opa_rate": 0,
"last_job_date": 0,
"eth_rate": "10",
- "opa": "NO",
"cpuset": 2,
"links": [
{
@@ -292,7 +289,6 @@
"opa_rate": 0,
"last_job_date": 0,
"eth_rate": "10",
- "opa": "NO",
"last_available_upto": 0,
"finaud_decision": "NO",
"api_timestamp": 1568902577,
@@ -307,7 +303,6 @@
"state": "Alive"
},
{
- "opa": "NO",
"eth_rate": "10",
"last_job_date": 0,
"opa_rate": 0,
@@ -409,7 +404,6 @@
"besteffort": "YES",
"last_job_date": 0,
"eth_rate": "10",
- "opa": "NO",
"memnode": 131072,
"desktop_computing": "NO",
"opa_rate": 0,
@@ -475,7 +469,6 @@
"memnode": 131072,
"opa_rate": 0,
"last_job_date": 0,
- "opa": "NO",
"eth_rate": "10",
"available_upto": 2147483647,
"links": [
@@ -572,7 +565,6 @@
"besteffort": "YES",
"ib_rate": 0,
"last_job_date": 0,
- "opa": "NO",
"eth_rate": "10",
"desktop_computing": "NO",
"memnode": 131072,
@@ -650,7 +642,6 @@
"opa_rate": 0,
"desktop_computing": "NO",
"memnode": 131072,
- "opa": "NO",
"eth_rate": "10",
"last_job_date": 0,
"wattmeter": "MULTIPLE",
@@ -747,7 +738,6 @@
"desktop_computing": "NO",
"memnode": 131072,
"eth_rate": "10",
- "opa": "NO",
"last_job_date": 0,
"finaud_decision": "NO",
"last_available_upto": 0,
@@ -824,7 +814,6 @@
"opa_rate": 0,
"last_job_date": 0,
"eth_rate": "10",
- "opa": "NO",
"last_available_upto": 0,
"finaud_decision": "NO",
"api_timestamp": 1568902577,
@@ -907,7 +896,6 @@
}
],
"cpuset": 11,
- "opa": "NO",
"eth_rate": "10",
"last_job_date": 0,
"opa_rate": 0,
@@ -950,7 +938,6 @@
"opa_rate": 0,
"memnode": 131072,
"desktop_computing": "NO",
- "opa": "NO",
"eth_rate": "10",
"last_job_date": 0,
"ib_rate": 0,
@@ -1031,7 +1018,6 @@
"desktop_computing": "NO",
"memnode": 131072,
"eth_rate": "10",
- "opa": "NO",
"last_job_date": 0,
"wattmeter": "MULTIPLE",
"next_finaud_decision": "NO",
@@ -1124,7 +1110,6 @@
"besteffort": "YES",
"ib_rate": 0,
"last_job_date": 0,
- "opa": "NO",
"eth_rate": "10",
"desktop_computing": "NO",
"memnode": 131072,
@@ -1184,7 +1169,6 @@
"opa_rate": 0,
"last_job_date": 0,
"eth_rate": "10",
- "opa": "NO",
"gpudevice": 3,
"cpuarch": "x86_64",
"host": "clustera-1.fakesite.grid5000.fr",
@@ -1291,8 +1275,7 @@
"memnode": 131072,
"opa_rate": 0,
"last_job_date": 0,
- "eth_rate": "10",
- "opa": "NO"
+ "eth_rate": "10"
},
{
"max_walltime": 86400,
@@ -1332,7 +1315,6 @@
"opa_rate": 0,
"last_job_date": 0,
"eth_rate": "10",
- "opa": "NO",
"available_upto": 2147483647,
"cpuset": 1,
"links": [
@@ -1372,7 +1354,6 @@
},
{
"eth_rate": "10",
- "opa": "NO",
"last_job_date": 0,
"opa_rate": 0,
"memnode": 131072,
@@ -1459,7 +1440,6 @@
"api_timestamp": 1568902577,
"finaud_decision": "NO",
"last_available_upto": 0,
- "opa": "NO",
"eth_rate": "10",
"last_job_date": 0,
"opa_rate": 0,
@@ -1592,7 +1572,6 @@
"ib_rate": 0,
"besteffort": "YES",
"last_job_date": 0,
- "opa": "NO",
"eth_rate": "10",
"memnode": 131072,
"desktop_computing": "NO",
@@ -1625,7 +1604,6 @@
"besteffort": "YES",
"last_job_date": 0,
"eth_rate": "10",
- "opa": "NO",
"memnode": 131072,
"desktop_computing": "NO",
"opa_rate": 0,
@@ -1747,8 +1725,7 @@
"desktop_computing": "NO",
"opa_rate": 0,
"last_job_date": 0,
- "eth_rate": "10",
- "opa": "NO"
+ "eth_rate": "10"
},
{
"mic": "NO",
@@ -1799,7 +1776,6 @@
"memnode": 131072,
"opa_rate": 0,
"last_job_date": 0,
- "opa": "NO",
"eth_rate": "10",
"available_upto": 2147483647,
"links": [
@@ -1898,7 +1874,6 @@
"opa_rate": 0,
"memnode": 131072,
"desktop_computing": "NO",
- "opa": "NO",
"eth_rate": "10",
"last_job_date": 0
},
@@ -1929,7 +1904,6 @@
"besteffort": "YES",
"last_job_date": 0,
"eth_rate": "10",
- "opa": "NO",
"memnode": 131072,
"desktop_computing": "NO",
"opa_rate": 0,
@@ -1983,7 +1957,6 @@
"memnode": 131072,
"desktop_computing": "NO",
"eth_rate": "10",
- "opa": "NO",
"last_job_date": 0,
"ib_rate": 0,
"besteffort": "YES",
@@ -2124,7 +2097,6 @@
],
"cpuset": 11,
"eth_rate": "10",
- "opa": "NO",
"last_job_date": 0,
"opa_rate": 0,
"desktop_computing": "NO",
@@ -2191,7 +2163,6 @@
"desktop_computing": "NO",
"memnode": 131072,
"eth_rate": "10",
- "opa": "NO",
"last_job_date": 0,
"finaud_decision": "NO",
"last_available_upto": 0,
@@ -2220,7 +2191,6 @@
"last_available_upto": 0,
"finaud_decision": "NO",
"last_job_date": 0,
- "opa": "NO",
"eth_rate": "10",
"memnode": 131072,
"desktop_computing": "NO",
@@ -2343,7 +2313,6 @@
"memnode": 131072,
"desktop_computing": "NO",
"eth_rate": "10",
- "opa": "NO",
"last_job_date": 0,
"finaud_decision": "NO",
"last_available_upto": 0,
@@ -2403,7 +2372,6 @@
"myri_rate": 0,
"finaud_decision": "NO",
"last_available_upto": 0,
- "opa": "NO",
"eth_rate": "10",
"last_job_date": 0,
"opa_rate": 0,
--
GitLab