X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=resources%2Flibraries%2Fbash%2Ffunction%2Fdevice.sh;h=0b1a090fd6e88afcf347601ae7001cd01a678d8e;hb=cc0c2870a18fb74a56410eca2d1870bddc945397;hp=7d175a9ac323d018584dcf8e30c93cd9d6699f83;hpb=26637ca4fdb026cea585df4c9e6c0fc2c07492ba;p=csit.git diff --git a/resources/libraries/bash/function/device.sh b/resources/libraries/bash/function/device.sh index 7d175a9ac3..0b1a090fd6 100644 --- a/resources/libraries/bash/function/device.sh +++ b/resources/libraries/bash/function/device.sh @@ -257,8 +257,8 @@ function get_available_interfaces () { # Add Intel Corporation 82545EM Gigabit Ethernet Controller to the # whitelist. pci_id="0x100f" - tg_netdev=(eth1 eth2) - dut1_netdev=(eth3 eth4) + tg_netdev=(enpTGa enpTGb) + dut1_netdev=(enpSUTa enpSUTb) ;; *) die "Unknown specification: ${case_text}!" @@ -298,12 +298,26 @@ function get_available_interfaces () { fi done - for netdev in "${tg_side[@]::2}"; do - TG_NETDEVS+=(${netdev}) - done - for netdev in "${dut1_side[@]::2}"; do - DUT1_NETDEVS+=(${netdev}) - done + case "${case_text}" in + "1n_skx") + # Pick up first two DUT1 interfaces binded to i40evf. + for netdev in "${dut1_side[@]::2}"; do + DUT1_NETDEVS+=(${netdev}) + done + # Corresponding TG interfaces will be same ID.SUB_ID, but on + # opposite linked device. + for netdev in "${DUT1_NETDEVS[@]}"; do + TG_NETDEVS+=(${netdev/$dut1_netdev/$tg_netdev}) + done + ;; + *) + for netdev in "${tg_side[@]::2}"; do + TG_NETDEVS+=(${netdev}) + done + for netdev in "${dut1_side[@]::2}"; do + DUT1_NETDEVS+=(${netdev}) + done + esac for NETDEV in "${TG_NETDEVS[@]}"; do get_pci_addr