Code Review
/
csit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Add 2048B file size cps rps tests in job specs for http-ldpreload-nginx-1_21_5.
[csit.git]
/
resources
/
libraries
/
bash
/
function
/
device.sh
diff --git
a/resources/libraries/bash/function/device.sh
b/resources/libraries/bash/function/device.sh
index
92dca06
..
4d39cd2
100644
(file)
--- a/
resources/libraries/bash/function/device.sh
+++ b/
resources/libraries/bash/function/device.sh
@@
-1,4
+1,4
@@
-# Copyright (c) 202
3
Cisco and/or its affiliates.
+# Copyright (c) 202
4
Cisco and/or its affiliates.
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at:
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at:
@@
-173,13
+173,17
@@
function clean_environment () {
}
# Rebind interfaces back to kernel drivers.
}
# Rebind interfaces back to kernel drivers.
+ i=0
for ADDR in ${TG_PCIDEVS[@]}; do
for ADDR in ${TG_PCIDEVS[@]}; do
- DRIVER="${TG_DRIVERS[
0
]}"
+ DRIVER="${TG_DRIVERS[
${i}
]}"
bind_interfaces_to_driver || die
bind_interfaces_to_driver || die
+ ((i++))
done
done
+ i=0
for ADDR in ${DUT1_PCIDEVS[@]}; do
for ADDR in ${DUT1_PCIDEVS[@]}; do
- DRIVER="${DUT1_DRIVERS[
0
]}"
+ DRIVER="${DUT1_DRIVERS[
${i}
]}"
bind_interfaces_to_driver || die
bind_interfaces_to_driver || die
+ ((i++))
done
}
done
}
@@
-312,21
+316,23
@@
function get_available_interfaces () {
dut1_netdev=(ens5 enp175)
ports_per_nic=2
;;
dut1_netdev=(ens5 enp175)
ports_per_nic=2
;;
- "1n_
tx2
")
+ "1n_
alt
")
# Add Intel Corporation XL710/X710 Virtual Function to the
# whitelist.
# Add Intel Corporation XL710/X710 Virtual Function to the
# whitelist.
- pci_id="0x154c"
- tg_netdev=(enp5)
- dut1_netdev=(enp145)
+ # Add MT2892 Family [ConnectX-6 Dx] Virtual Function to the
+ # whitelist.
+ pci_id="0x154c\|0x101e"
+ tg_netdev=(enp1s0f0 enp1s0f1 enP1p1s0f0)
+ dut1_netdev=(enP3p2s0f0 enP3p2s0f1 enP1p1s0f1)
ports_per_nic=2
;;
"1n_spr")
# Add Intel Corporation E810 Virtual Function to the
# whitelist.
pci_id="0x1889"
ports_per_nic=2
;;
"1n_spr")
# Add Intel Corporation E810 Virtual Function to the
# whitelist.
pci_id="0x1889"
- tg_netdev=(en
s2
)
- dut1_netdev=(en
s4
)
- ports_per_nic=
2
+ tg_netdev=(en
p42s0 enp44s0
)
+ dut1_netdev=(en
p63s0 enp61s0
)
+ ports_per_nic=
1
;;
"1n_vbox")
# Add Intel Corporation 82545EM Gigabit Ethernet Controller to the
;;
"1n_vbox")
# Add Intel Corporation 82545EM Gigabit Ethernet Controller to the
@@
-503,6
+509,9
@@
function get_csit_model () {
"0x1572"|"0x154c")
MODEL="Intel-X710"
;;
"0x1572"|"0x154c")
MODEL="Intel-X710"
;;
+ "0x101e")
+ MODEL="Mellanox-CX6DX"
+ ;;
*)
MODEL="virtual"
esac
*)
MODEL="virtual"
esac
@@
-705,7
+714,7
@@
function set_env_variables () {
CSIT_TG_HOST="$(hostname --all-ip-addresses | awk '{print $1}')" || {
die "Reading hostname IP address failed!"
}
CSIT_TG_HOST="$(hostname --all-ip-addresses | awk '{print $1}')" || {
die "Reading hostname IP address failed!"
}
- CSIT_TG_PORT="${DCR_PORTS[tg]#*:}"
+ CSIT_TG_PORT="${DCR_PORTS[tg]#
#
*:}"
CSIT_TG_UUID="${DCR_UUIDS[tg]}"
CSIT_TG_ARCH="$(uname -i)" || {
die "Reading machine architecture failed!"
CSIT_TG_UUID="${DCR_UUIDS[tg]}"
CSIT_TG_ARCH="$(uname -i)" || {
die "Reading machine architecture failed!"
@@
-713,7
+722,7
@@
function set_env_variables () {
CSIT_DUT1_HOST="$(hostname --all-ip-addresses | awk '{print $1}')" || {
die "Reading hostname IP address failed!"
}
CSIT_DUT1_HOST="$(hostname --all-ip-addresses | awk '{print $1}')" || {
die "Reading hostname IP address failed!"
}
- CSIT_DUT1_PORT="${DCR_PORTS[dut1]#*:}"
+ CSIT_DUT1_PORT="${DCR_PORTS[dut1]#
#
*:}"
CSIT_DUT1_UUID="${DCR_UUIDS[dut1]}"
CSIT_DUT1_ARCH="$(uname -i)" || {
die "Reading machine architecture failed!"
CSIT_DUT1_UUID="${DCR_UUIDS[dut1]}"
CSIT_DUT1_ARCH="$(uname -i)" || {
die "Reading machine architecture failed!"