diff --git a/generators/wiki/disk_reservation.rb b/generators/wiki/disk_reservation.rb index 6110517af2889abc6e8944cd3ff397388a1653c8..bd24177e985b1d0ea8f582f13b0e1e96e1db7325 100644 --- a/generators/wiki/disk_reservation.rb +++ b/generators/wiki/disk_reservation.rb @@ -28,7 +28,7 @@ class DiskReservationGenerator < WikiGenerator disk_info.each { |num, reservable_disks| table_data << [ "[[#{site_uid.capitalize}:Hardware|#{site_uid.capitalize}]]", - "[https://api.grid5000.fr/stable/sites/#{site_uid}/clusters/#{cluster_uid}/nodes.json?pretty=1 #{cluster_uid}" + (disk_info.size== 1 ? '' : '-' + G5K.nodeset(num)) + "]", + "[https://public-api.grid5000.fr/stable/sites/#{site_uid}/clusters/#{cluster_uid}/nodes.json?pretty=1 #{cluster_uid}" + (disk_info.size== 1 ? '' : '-' + G5K.nodeset(num)) + "]", num.count, reservable_disks ] if reservable_disks > 0 diff --git a/generators/wiki/site_hardware.rb b/generators/wiki/site_hardware.rb index d2336615dc818a0623cb0eb6e624e724b92e975a..0865e5f0453e2acb9351ea8513976ae34429898d 100644 --- a/generators/wiki/site_hardware.rb +++ b/generators/wiki/site_hardware.rb @@ -91,7 +91,7 @@ class SiteHardwareGenerator < WikiGenerator 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}" + (queue_str == '' ? '' : " (#{queue_str})") + " ==\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://api.grid5000.fr/stable/sites/#{site}/clusters/#{cluster_uid}/nodes.json?pretty=1 json])"] + 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| if subclusters