Commit fb74eb3b authored by BERARD Benjamin's avatar BERARD Benjamin
Browse files

[fpga/wiki] Fix wiki:gen for servan

parent ef812ae6
Pipeline #513724 passed with stages
in 6 minutes and 6 seconds
......@@ -277,7 +277,7 @@
{
"device": "fpga0",
"enabled": true,
"interface": "Ethernet",
"interface": "Ethernet-fpga",
"ip": "172.16.23.11",
"ip6": "2001:660:4406:100:8:1:0:1",
"kavlan": true,
......@@ -287,13 +287,15 @@
"mounted": false,
"network_address": "servan-1-fpga0.grenoble.grid5000.fr",
"rate": 100000000000,
"sriov": false,
"sriov_totalvfs": 0,
"switch": "gw",
"switch_port": "ethernet1/1/97"
},
{
"device": "fpga1",
"enabled": true,
"interface": "Ethernet",
"interface": "Ethernet-fpga",
"ip": "172.16.23.21",
"ip6": "2001:660:4406:100:8:2:0:1",
"kavlan": true,
......@@ -303,6 +305,8 @@
"mounted": false,
"network_address": "servan-1-fpga1.grenoble.grid5000.fr",
"rate": 100000000000,
"sriov": false,
"sriov_totalvfs": 0,
"switch": "gw",
"switch_port": "ethernet1/1/98"
}
......@@ -315,6 +319,13 @@
"pstate_governor": "performance",
"turboboost_enabled": true
},
"other_devices": {
"fpga0": {
"model": "Alveo U200",
"type": "fpga",
"vendor": "Xilinx"
}
},
"performance": {
"core_flops": 36800000000,
"node_flops": 1766400000000
......
......@@ -277,7 +277,7 @@
{
"device": "fpga0",
"enabled": true,
"interface": "Ethernet",
"interface": "Ethernet-fpga",
"ip": "172.16.23.12",
"ip6": "2001:660:4406:100:8:1:0:2",
"kavlan": true,
......@@ -287,13 +287,15 @@
"mounted": false,
"network_address": "servan-2-fpga0.grenoble.grid5000.fr",
"rate": 100000000000,
"sriov": false,
"sriov_totalvfs": 0,
"switch": "gw",
"switch_port": "ethernet1/1/99"
},
{
"device": "fpga1",
"enabled": true,
"interface": "Ethernet",
"interface": "Ethernet-fpga",
"ip": "172.16.23.22",
"ip6": "2001:660:4406:100:8:2:0:2",
"kavlan": true,
......@@ -303,6 +305,8 @@
"mounted": false,
"network_address": "servan-2-fpga1.grenoble.grid5000.fr",
"rate": 100000000000,
"sriov": false,
"sriov_totalvfs": 0,
"switch": "gw",
"switch_port": "ethernet1/1/100"
}
......@@ -315,6 +319,13 @@
"pstate_governor": "performance",
"turboboost_enabled": true
},
"other_devices": {
"fpga0": {
"model": "Alveo U200",
"type": "fpga",
"vendor": "Xilinx"
}
},
"performance": {
"core_flops": 36800000000,
"node_flops": 1766400000000
......
......@@ -336,182 +336,6 @@
"source": {
"protocol": "network_equipment"
}
},
{
"description": "Input byte counter for the network device port",
"labels": {
"interface": "fpga0"
},
"name": "network_ifacein_bytes_total",
"period": 15000,
"source": {
"protocol": "network_equipment"
}
},
{
"description": "Output byte counter for the network device port",
"labels": {
"interface": "fpga0"
},
"name": "network_ifaceout_bytes_total",
"period": 15000,
"source": {
"protocol": "network_equipment"
}
},
{
"description": "Input packet counter for the network device port",
"labels": {
"interface": "fpga0"
},
"name": "network_ifacein_packets_total",
"period": 15000,
"source": {
"protocol": "network_equipment"
}
},
{
"description": "Output packet counter for the network device port",
"labels": {
"interface": "fpga0"
},
"name": "network_ifaceout_packets_total",
"period": 15000,
"source": {
"protocol": "network_equipment"
}
},
{
"description": "Input counter of discarded packets for the network device port",
"labels": {
"interface": "fpga0"
},
"name": "network_ifacein_packets_discard_total",
"period": 15000,
"source": {
"protocol": "network_equipment"
}
},
{
"description": "Output counter of discarded packets for the network device port",
"labels": {
"interface": "fpga0"
},
"name": "network_ifaceout_packets_discard_total",
"period": 15000,
"source": {
"protocol": "network_equipment"
}
},
{
"description": "Input counter of packet errors for the network device port",
"labels": {
"interface": "fpga0"
},
"name": "network_ifacein_packets_error_total",
"period": 15000,
"source": {
"protocol": "network_equipment"
}
},
{
"description": "Output counter of packet errors for the network device port",
"labels": {
"interface": "fpga0"
},
"name": "network_ifaceout_packets_error_total",
"period": 15000,
"source": {
"protocol": "network_equipment"
}
},
{
"description": "Input byte counter for the network device port",
"labels": {
"interface": "fpga1"
},
"name": "network_ifacein_bytes_total",
"period": 15000,
"source": {
"protocol": "network_equipment"
}
},
{
"description": "Output byte counter for the network device port",
"labels": {
"interface": "fpga1"
},
"name": "network_ifaceout_bytes_total",
"period": 15000,
"source": {
"protocol": "network_equipment"
}
},
{
"description": "Input packet counter for the network device port",
"labels": {
"interface": "fpga1"
},
"name": "network_ifacein_packets_total",
"period": 15000,
"source": {
"protocol": "network_equipment"
}
},
{
"description": "Output packet counter for the network device port",
"labels": {
"interface": "fpga1"
},
"name": "network_ifaceout_packets_total",
"period": 15000,
"source": {
"protocol": "network_equipment"
}
},
{
"description": "Input counter of discarded packets for the network device port",
"labels": {
"interface": "fpga1"
},
"name": "network_ifacein_packets_discard_total",
"period": 15000,
"source": {
"protocol": "network_equipment"
}
},
{
"description": "Output counter of discarded packets for the network device port",
"labels": {
"interface": "fpga1"
},
"name": "network_ifaceout_packets_discard_total",
"period": 15000,
"source": {
"protocol": "network_equipment"
}
},
{
"description": "Input counter of packet errors for the network device port",
"labels": {
"interface": "fpga1"
},
"name": "network_ifacein_packets_error_total",
"period": 15000,
"source": {
"protocol": "network_equipment"
}
},
{
"description": "Output counter of packet errors for the network device port",
"labels": {
"interface": "fpga1"
},
"name": "network_ifaceout_packets_error_total",
"period": 15000,
"source": {
"protocol": "network_equipment"
}
}
],
"model": "Dell PowerEdge R7525",
......
......@@ -101,6 +101,11 @@ servan-1:
pstate_driver: acpi-cpufreq
pstate_governor: performance
turboboost_enabled: true
other_devices:
fpga0:
model: Alveo U200
type: fpga
vendor: Xilinx
processor:
cache_l1d: 32768
cache_l1i: 32768
......
......@@ -101,6 +101,11 @@ servan-2:
pstate_driver: acpi-cpufreq
pstate_governor: performance
turboboost_enabled: true
other_devices:
fpga0:
model: Alveo U200
type: fpga
vendor: Xilinx
processor:
cache_l1d: 32768
cache_l1i: 32768
......
......@@ -40,21 +40,25 @@ nodes:
mountable: false
mounted: false
fpga0:
interface: Ethernet
interface: Ethernet-fpga
enabled: true
management: false
mountable: true
mounted: false
kavlan: true
rate: 100000000000
sriov: false
sriov_totalvfs: 0
fpga1:
interface: Ethernet
interface: Ethernet-fpga
management: false
enabled: true
mountable: true
mounted: false
kavlan: true
rate: 100000000000
sriov: false
sriov_totalvfs: 0
storage_devices:
pci-0000:c3:00.0-nvme-1:
interface: NVME
......
......@@ -379,7 +379,7 @@ def add_switch_port(h)
hc['nodes'].each_pair do |node_uid, hn|
next if hn['status'] == 'retired'
hn['network_adapters'].each_pair do |iface_uid, iface|
if (iface['mounted'] or iface['mountable']) and not iface['management'] and iface['interface'] == 'Ethernet'
if (iface['mounted'] or iface['mountable']) and not iface['management'] and iface['interface'] =~ /(fpga|Ethernet)/
switch, swport = net_switch_port_lookup(site, node_uid, iface_uid) || net_switch_port_lookup(site, node_uid)
if used_ports[[switch, swport]]
raise "Duplicate port assigned for #{node_uid} #{iface_uid}. Already assigned to #{used_ports[[switch, swport]]} Aborting."
......@@ -421,7 +421,7 @@ def add_kavlan_ips(h)
raise "Old kavlan data in input/ for #{node_uid}" if hn.has_key?('kavlan')
node_id = node_uid.split('-')[1].to_i
hn['kavlan'] = {}
hn['network_adapters'].to_a.select { |i| i[1]['mountable'] and (i[1]['kavlan'] or not i[1].has_key?('kavlan')) and i[1]['interface'] == 'Ethernet' }.map { |e| e[0] }.each do |iface|
hn['network_adapters'].to_a.select { |i| i[1]['mountable'] and (i[1]['kavlan'] or not i[1].has_key?('kavlan')) and i[1]['interface'] =~ /(Ethernet-fpga|Ethernet)/ }.map { |e| e[0] }.each do |iface|
hn['kavlan'][iface] = {}
vlan_base.each do |vlan, v|
type = v['type']
......@@ -454,7 +454,7 @@ def add_ipv4(h)
node_id = node_uid.split('-')[1].to_i
hn['network_adapters'].each_pair do |iface, v|
# only allocate mountable ethernet interfaces
next if not (v['mountable'] and v['interface'] == 'Ethernet')
next if not (v['mountable'] and ['Ethernet','Ethernet-fpga'].include?(v['interface']))
k = [site_uid, cluster_uid, iface]
if not iface_offsets.has_key?(k)
raise "Missing IPv4 information for #{k}"
......@@ -476,7 +476,7 @@ def add_ipv6(h)
site_prefix = IPAddress hs['ipv6']['prefix']
hs['clusters'].each_pair do |_cluster_uid, hc|
hc['nodes'].each_pair do |node_uid, hn|
ipv6_adapters = hn['network_adapters'].select { |_k,v| v['mountable'] and v['interface'] == 'Ethernet' }
ipv6_adapters = hn['network_adapters'].select { |_k,v| v['mountable'] and ['Ethernet','Ethernet-fpga'].include?(v['interface']) }
if ipv6_adapters.length > 0
if not ipv6_adapters.values[0]['mounted']
raise "#{node_uid}: inconsistency: this code assumes first mountable ethernet adapter should be mounted: #{hn}"
......@@ -542,7 +542,7 @@ def add_kavlan_ipv6s(h)
hs['clusters'].each_pair do |_cluster_uid, hc|
next if !hc['kavlan'] # skip clusters where kavlan is globally set to false (used for initial cluster installation)
hc['nodes'].each_pair do |node_uid, hn|
kvl_adapters = hn['network_adapters'].select { |_k,v| v['mountable'] and (v['kavlan'] or not v.has_key?('kavlan')) and v['interface'] == 'Ethernet' }
kvl_adapters = hn['network_adapters'].select { |_k,v| v['mountable'] and (v['kavlan'] or not v.has_key?('kavlan')) and ['Ethernet','Ethernet-fpga'].include?(v['interface']) }
if kvl_adapters.length > 0
if kvl_adapters.length != hn['kavlan'].length
raise "#{node_uid}: inconsistency: num kvl_adapters = #{kvl_adapters.length}, num kavlan entries = #{hn['kavlan'].length}"
......
......@@ -111,6 +111,7 @@ software:
postinstall-version: string
forced-deployment-timestamp: integer
status: optional_string
other_devices: optional
storage_devices:
<multi>:
id: string
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment