Mentions légales du service

Skip to content
Snippets Groups Projects
Commit a0fc5848 authored by Baptiste Jonglez's avatar Baptiste Jonglez Committed by JONGLEZ Baptiste
Browse files

[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.
parent 79a9cd24
No related branches found
No related tags found
1 merge request!269[wiki] Add SR-IOV information and improve network tables
Pipeline #276515 passed
...@@ -465,7 +465,7 @@ class G5KHardwareGenerator < WikiGenerator ...@@ -465,7 +465,7 @@ class G5KHardwareGenerator < WikiGenerator
interfaces['25g_count'] = node_interfaces.select { |v| v['rate'] == 25_000_000_000 }.count 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['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['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'] queues = cluster_hash['queues'] - ['admin', 'default', 'testing']
interfaces['queues'] = (queues.nil? || (queues.empty? ? '' : queues[0] + G5K.pluralize(queues.count, ' queue'))) 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 interface_add(network_interfaces, node_uid, interfaces) if node_interfaces.count > 1
...@@ -512,7 +512,7 @@ class G5KHardwareGenerator < WikiGenerator ...@@ -512,7 +512,7 @@ class G5KHardwareGenerator < WikiGenerator
} }
interfaces = {} 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 interfaces['vfs_sum'] = node_interfaces.map{ |v| v['sriov_totalvfs'] }.sum
interface_add(network_interfaces, node_uid, interfaces) if node_interfaces.count > 0 interface_add(network_interfaces, node_uid, interfaces) if node_interfaces.count > 0
end end
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment