Merge branch 'bugs/#12760' into 'master'

[oar-properties] add storage (SSD or HDD) to disktype property

See merge request grid5000/reference-repository!191

Author: snoir

lib/refrepo/gen/oar-properties.rb

@@ -405,7 +405,7 @@ def get_ref_node_properties_internal(cluster_uid, cluster, node_uid, node)
   h['cpucore'] = node['architecture']['nb_cores'] / node['architecture']['nb_procs']
   h['cputype'] = [node['processor']['model'], node['processor']['version']].join(' ')
   h['cpufreq'] = node['processor']['clock_speed'] / 1_000_000_000.0
-  h['disktype'] = (node['storage_devices'].first || {})['interface']
+  h['disktype'] = [node['storage_devices'].first['interface'], node['storage_devices'].first['storage']].join('/')
   h['chassis'] = [node['chassis']['manufacturer'], node['chassis']['name'], node['chassis']['serial']].join(' ')
 
   # ETH

lib/refrepo/gen/wiki/generators/oar_properties.rb

@@ -172,7 +172,7 @@ def initialize(page_name)
       "description" => "The rate of the connected Myrinet interface in Gbps"
     },
     "disktype" => {
-      "description" => "What disk's interface family node's disk is member of ?"
+      "description" => "The node's primary disk interface and storage type (like SATA/SSD)"
     },
     "disk_reservation_count" => {
       "description" => "The number of reservable disks"