Une nouvelle version du portail de gestion des comptes externes sera mise en production lundi 09 août. Elle permettra d'allonger la validité d'un compte externe jusqu'à 3 ans. Pour plus de détails sur cette version consulter : https://doc-si.inria.fr/x/FCeS

Commit 52d5a6d6 authored by COURBET Adrien's avatar COURBET Adrien Committed by Pierre Neyron
Browse files

Rename OAR property gpu to gpu_model to oar-properties generators (oar...

Rename OAR property gpu to gpu_model to oar-properties generators (oar properties and wiki) (see #10143)
parent 83bcd1d6
Pipeline #82362 passed with stages
in 1 minute and 35 seconds
......@@ -13,7 +13,7 @@ This directory contains the input files and scripts needed for generating:
- The OAR properties ie. the node information that is registered in OAR databases and
allows user to select resources matching their experiment requirements.
Ex: $ oarsub -p "wattmeter=’YES’ and gpu=’YES’ and eth10g=’Y’"
Ex: $ oarsub -p "wattmeter=’YES’ and eth10g=’Y’"
- The configuration files of the following puppet modules: bindg5kb, conmang5k, dhcpg5k, kadeployg5k and lanpowerg5k.
......
......@@ -126,10 +126,10 @@ def get_ref_node_properties_internal(cluster_uid, cluster, node_uid, node)
h['memnode'] = node['main_memory']['ram_size'] / MiB
if node.key?('gpu') && node['gpu']['gpu'] == true
h['gpu'] = node['gpu']['gpu_model']
h['gpu_model'] = node['gpu']['gpu_model']
h['gpu_count'] = node['gpu']['gpu_count']
else
h['gpu'] = false
h['gpu_model'] = false
h['gpu_count'] = 0
end
......
......@@ -123,12 +123,16 @@ class OarPropertiesGenerator < WikiGenerator
"memnode" => {
"description" => "The total amount of memory in MB of the node"
},
"gpu" => {
"gpu_model" => {
"description" => "The type of GPU available"
},
"gpu_count" => {
"description" => "The number of GPU cards available"
},
"gpu" => {
"description" => "The ID of the GPU the resource is part of. The unique scope is the OAR server. ",
"possible_values" => "1, 2, 3, ..."
},
"wattmeter" => {
"description" => "The type of wattmeter available"
},
......@@ -142,7 +146,7 @@ class OarPropertiesGenerator < WikiGenerator
@@categories = {
"Job-related properties" => ["besteffort", "deploy", "production", "cluster_priority", "max_walltime"],
"Hierarchy" => ["cluster", "cpu", "core", "host", "network_address", "ip", "switch"],
"Hardware" => ["gpu", "gpu_count", "memnode", "memcore", "memcpu", "disktype", "disk_reservation_count", "myri_rate", "myri_count", "myri", "ib_rate", "ib_count", "ib", "opa", "opa_rate", "opa_count", "eth_rate", "eth_count", "cpufreq", "cputype", "cpucore", "cpuarch", "virtual", "mic"],
"Hardware" => ["gpu_model", "gpu_count", "memnode", "memcore", "memcpu", "disktype", "disk_reservation_count", "myri_rate", "myri_count", "myri", "ib_rate", "ib_count", "ib", "opa", "opa_rate", "opa_count", "eth_rate", "eth_count", "cpufreq", "cputype", "cpucore", "cpuarch", "virtual", "mic"],
"Miscellaneous" => ["wattmeter", "nodemodel"]
}
......
......@@ -7,7 +7,7 @@ require 'hashdiff'
IGNORED_PROPERTIES=%w{}
# Propriétés qui devraient être présentes
G5K_PROPERTIES=%w{api_timestamp available_upto besteffort chassis chunks cluster cluster_priority comment core cpu cpuarch cpucore cpufreq cpuset cputype deploy desktop_computing disk disk_reservation_count diskpath disktype drain eth_count eth_rate expiry_date finaud_decision gpu gpu_count grub host ib ib_count ib_rate id ip last_available_upto last_job_date links maintenance max_walltime memcore memcpu memnode mic myri myri_count myri_rate network_address next_finaud_decision next_state nodemodel production rconsole scheduler_priority slash_16 slash_17 slash_18 slash_19 slash_20 slash_21 slash_22 state state_num subnet_address subnet_prefix suspended_jobs switch type virtual vlan wattmeter opa opa_count opa_rate}.sort - IGNORED_PROPERTIES
G5K_PROPERTIES=%w{api_timestamp available_upto besteffort chassis chunks cluster cluster_priority comment core cpu cpuarch cpucore cpufreq cpuset cputype deploy desktop_computing disk disk_reservation_count diskpath disktype drain eth_count eth_rate expiry_date finaud_decision gpu_model gpu_count gpu grub host ib ib_count ib_rate id ip last_available_upto last_job_date links maintenance max_walltime memcore memcpu memnode mic myri myri_count myri_rate network_address next_finaud_decision next_state nodemodel production rconsole scheduler_priority slash_16 slash_17 slash_18 slash_19 slash_20 slash_21 slash_22 state state_num subnet_address subnet_prefix suspended_jobs switch type virtual vlan wattmeter opa opa_count opa_rate}.sort - IGNORED_PROPERTIES
module RefRepo::Valid::OarProperties
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment