From ce9f7961d4c01b84fcaf19648c29c0af41f489a4 Mon Sep 17 00:00:00 2001 From: Noah Mandler <noah.mandler@inria.fr> Date: Wed, 12 Feb 2025 11:26:47 +0100 Subject: [PATCH] [rennes][abacus28] Remove IB interface after disabling PCI slot --- lib/refrepo/g5kchecks_importer.rb | 2 +- lib/refrepo/gen/reference-api.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/refrepo/g5kchecks_importer.rb b/lib/refrepo/g5kchecks_importer.rb index d368c0846e0..bbab7b10a2c 100644 --- a/lib/refrepo/g5kchecks_importer.rb +++ b/lib/refrepo/g5kchecks_importer.rb @@ -1,6 +1,6 @@ require 'refrepo/hash/hash' -INTERFACE_ORDER = %w(eth0 eth1 eth2 eth3 eth4 eth5 eth6 ib0 ib1 ib2 ib3 ib4 ib5 ib6 ib7 ibs1 ibs4 ibp94s0 bmc eno1 eno2 eno1np0 eno2np1 ens4f0 ens4f1 ens5f0 ens5f1 ens10f0np0 ens10f1np1 ib0.8100) +INTERFACE_ORDER = %w(eth0 eth1 eth2 eth3 eth4 eth5 eth6 ib0 ib1 ib2 ib3 ib4 ib5 ib6 ib7 ibs1 ibs4 bmc eno1 eno2 eno1np0 eno2np1 ens4f0 ens4f1 ens5f0 ens5f1 ens10f0np0 ens10f1np1 ib0.8100) def g5kchecks_importer(sourcedir) puts "Importing source files from #{sourcedir} into input directory..." diff --git a/lib/refrepo/gen/reference-api.rb b/lib/refrepo/gen/reference-api.rb index d8f44c1d3ab..f68c8f86b6d 100644 --- a/lib/refrepo/gen/reference-api.rb +++ b/lib/refrepo/gen/reference-api.rb @@ -154,7 +154,7 @@ def generate_reference_api node["storage_devices"] = node["storage_devices"].sort_by{ |_sd, v| v['id'] }.map { |a| a[1] } node["network_adapters"].each { |key, _hash| node["network_adapters"][key]["device"] = key; } # Add "device: ethX" within the hash - node["network_adapters"] = node["network_adapters"].sort_by_array(["eth0", "eth1", "eth2", "eth3", "eth4", "eth5", "eth6", "ib0.8100", "ib0", "ib1", "ib2", "ib3", "ib4", "ib5", "ib6", "ib7", "ibs1","ibs3","ibs4", "ibp94s0","bmc", "eno1", "eno2", "eno1np0", "eno2np1", "ens4f0", "ens4f1", "ens5f0", "ens5f1", "ens10f0np0", "ens10f1np1", "fpga0", "fpga1"]).values + node["network_adapters"] = node["network_adapters"].sort_by_array(["eth0", "eth1", "eth2", "eth3", "eth4", "eth5", "eth6", "ib0.8100", "ib0", "ib1", "ib2", "ib3", "ib4", "ib5", "ib6", "ib7", "ibs1","ibs3","ibs4", "bmc", "eno1", "eno2", "eno1np0", "eno2np1", "ens4f0", "ens4f1", "ens5f0", "ens5f1", "ens10f0np0", "ens10f1np1", "fpga0", "fpga1"]).values node["memory_devices"].each { |key, _hash| node["memory_devices"][key]["device"] = key; } # Add "device: dimm_a1" within the hash node["memory_devices"] = node["memory_devices"].sort_by { |d, _| [d.gsub(/dimm_(\d+)/, '\1').to_i, -- GitLab