From 62e16fe66048bcef786c983f7080a88c7afa960c Mon Sep 17 00:00:00 2001
From: Florent Didier <florent.didier@inria.fr>
Date: Tue, 17 Apr 2018 11:31:55 +0200
Subject: [PATCH] [dev] disk_reservation.rb, site_hardware.rb: use public-api
instead of api url
---
generators/wiki/disk_reservation.rb | 2 +-
generators/wiki/site_hardware.rb | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/generators/wiki/disk_reservation.rb b/generators/wiki/disk_reservation.rb
index 6110517af28..bd24177e985 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 d2336615dc8..0865e5f0453 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
--
GitLab