diff --git a/lib/refrepo/gen/wiki/generators/site_hardware.rb b/lib/refrepo/gen/wiki/generators/site_hardware.rb index dcc667edcefb7656649212b1930cd24017835099..2ce9183ed31d282506686d8aff96bf56624203c2 100644 --- a/lib/refrepo/gen/wiki/generators/site_hardware.rb +++ b/lib/refrepo/gen/wiki/generators/site_hardware.rb @@ -68,14 +68,14 @@ class SiteHardwareGenerator < WikiGenerator cluster_nodes = cluster_hash.keys.flatten.count queue = cluster_hash.map { |k, v| v['queue']}.first queue_str = cluster_hash.map { |k, v| v['queue_str']}.first - restrictions = [] - restrictions << "<b>#{queue}</b> queue" if queue != '' - restrictions << '<b>exotic</b> job type' if cluster_hash.map { |k, v| v['exotic']}.first - table_columns = (with_sites == true ? ['Site'] : []) + ['Cluster', 'Restrictions', 'Date of arrival', { attributes: 'data-sort-type="number"', text: 'Nodes' }, 'CPU', { attributes: 'data-sort-type="number"', text: 'Cores' }, { attributes: 'data-sort-type="number"', text: 'Memory' }, { attributes: 'data-sort-type="number"', text: 'Storage' }, { attributes: 'data-sort-type="number"', text: 'Network' }] + ((site_accelerators.zero? && with_sites == false) ? [] : ['Accelerators']) + access_conditions = [] + access_conditions << "<b>#{queue}</b> queue" if queue != '' + access_conditions << '<b>exotic</b> job type' if cluster_hash.map { |k, v| v['exotic']}.first + table_columns = (with_sites == true ? ['Site'] : []) + ['Cluster', 'Access Condition', 'Date of arrival', { attributes: 'data-sort-type="number"', text: 'Nodes' }, 'CPU', { attributes: 'data-sort-type="number"', text: 'Cores' }, { attributes: 'data-sort-type="number"', text: 'Memory' }, { attributes: 'data-sort-type="number"', text: 'Storage' }, { attributes: 'data-sort-type="number"', text: 'Network' }] + ((site_accelerators.zero? && with_sites == false) ? [] : ['Accelerators']) data = partition(cluster_hash) table_data << (with_sites == true ? ["[[#{site.capitalize}:Hardware|#{site.capitalize}]]"] : []) + [ (with_sites == true ? "[[#{site.capitalize}:Hardware##{cluster_uid}" + (queue_str == '' ? '' : "_.28#{queue_str.gsub(' ', '_')}.29") + "|#{cluster_uid}]]" : "[[##{cluster_uid}" + (queue_str == '' ? '' : "_.28#{queue_str.gsub(' ', '_')}.29") + "|#{cluster_uid}]]"), - restrictions.join(",<br/>"), + access_conditions.join(",<br/>"), cell_data(data, 'date'), cluster_nodes, cell_data(data, 'num_processor_model'), @@ -105,12 +105,12 @@ class SiteHardwareGenerator < WikiGenerator cluster_cpus = cluster_hash.map { |k, v| k.count * v['cpus_per_node'] }.reduce(:+) cluster_cores = cluster_hash.map { |k, v| k.count * v['cpus_per_node'] * v['cores_per_cpu'] }.reduce(:+) queue_str = cluster_hash.map { |k, v| v['queue_str']}.first - restrictions = [] - restrictions << queue_str if queue_str != '' - restrictions << "exotic job type" if cluster_hash.map { |k, v| v['exotic']}.first + access_conditions = [] + access_conditions << queue_str if queue_str != '' + access_conditions << "exotic job type" if cluster_hash.map { |k, v| v['exotic']}.first table_columns = ['Cluster', 'Queue', 'Date of arrival', { attributes: 'data-sort-type="number"', text: 'Nodes' }, 'CPU', { attributes: 'data-sort-type="number"', text: 'Cores' }, { attributes: 'data-sort-type="number"', text: 'Memory' }, { attributes: 'data-sort-type="number"', text: 'Storage' }, { attributes: 'data-sort-type="number"', text: 'Network' }] + (site_accelerators.zero? ? [] : ['Accelerators']) - text_data << ["\n== #{cluster_uid}" + (restrictions.empty? ? '' : " (#{restrictions.join(", ")})") + " ==\n"] + text_data << ["\n== #{cluster_uid}" + (access_conditions.empty? ? '' : " (#{access_conditions.join(", ")})") + " ==\n"] text_data << ["'''#{cluster_nodes} #{G5K.pluralize(cluster_nodes, 'node')}, #{cluster_cpus} #{G5K.pluralize(cluster_cpus, 'cpu')}, #{cluster_cores} #{G5K.pluralize(cluster_cores, 'core')}" + (subclusters == true ? ",''' split as follows due to differences between nodes " : "''' ") + "([https://public-api.grid5000.fr/stable/sites/#{site}/clusters/#{cluster_uid}/nodes.json?pretty=1 json])"] cluster_hash.sort.to_h.each_with_index { |(num, h), i|