From a0fc584888e860b80503ebb222c7e16bb664de8b Mon Sep 17 00:00:00 2001
From: Baptiste Jonglez <baptiste.jonglez@imag.fr>
Date: Fri, 30 Jul 2021 18:48:48 +0200
Subject: [PATCH] [gen] [wiki] [hardware] Remove old interface names in network
tables
Having both names (e.g. "eth1/enp98s0f1") makes the table hard to read.
Debian 10 defaults to the new interface names, so it should be fine to
only display this one.
---
lib/refrepo/gen/wiki/generators/hardware.rb | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/lib/refrepo/gen/wiki/generators/hardware.rb b/lib/refrepo/gen/wiki/generators/hardware.rb
index bfaa870847d..7774619f9d2 100644
--- a/lib/refrepo/gen/wiki/generators/hardware.rb
+++ b/lib/refrepo/gen/wiki/generators/hardware.rb
@@ -465,7 +465,7 @@ class G5KHardwareGenerator < WikiGenerator
interfaces['25g_count'] = node_interfaces.select { |v| v['rate'] == 25_000_000_000 }.count
interfaces['10g_count'] = node_interfaces.select { |v| v['rate'] == 10_000_000_000 }.count
interfaces['1g_count'] = node_interfaces.select { |v| v['rate'] == 1_000_000_000 }.count
- interfaces['details'] = node_interfaces.map{ |v| v['device'] + (v['name'].nil? ? '' : '/' + v['name']) + ' (' + G5K.get_rate(v['rate']) + ')' }.sort.join(', ')
+ interfaces['details'] = node_interfaces.map{ |v| v['name'] + ' (' + G5K.get_rate(v['rate']) + ')' }.sort.join(', ')
queues = cluster_hash['queues'] - ['admin', 'default', 'testing']
interfaces['queues'] = (queues.nil? || (queues.empty? ? '' : queues[0] + G5K.pluralize(queues.count, ' queue')))
interface_add(network_interfaces, node_uid, interfaces) if node_interfaces.count > 1
@@ -512,7 +512,7 @@ class G5KHardwareGenerator < WikiGenerator
}
interfaces = {}
- interfaces['details'] = node_interfaces.map{ |v| v['device'] + (v['name'].nil? ? '' : '/' + v['name']) + " (#{v['sriov_totalvfs']} VFs)" }.sort.join(', ')
+ interfaces['details'] = node_interfaces.map{ |v| v['name'] + " (#{v['sriov_totalvfs']} VFs)" }.sort.join(', ')
interfaces['vfs_sum'] = node_interfaces.map{ |v| v['sriov_totalvfs'] }.sum
interface_add(network_interfaces, node_uid, interfaces) if node_interfaces.count > 0
end
--
GitLab