X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=resources%2Flibraries%2Fbash%2Ffunction%2Fdevice.sh;h=ee0ebdfd16a0978f20fcc51d7d375ea5fead7914;hb=caff461d7ef136f744cc4084fe5be13f49fb27dd;hp=92dca0653be06379a16903cd44e5d75bfc42bd87;hpb=604c94f5437d77c5e324b5960cf553bb29fe1644;p=csit.git diff --git a/resources/libraries/bash/function/device.sh b/resources/libraries/bash/function/device.sh index 92dca0653b..ee0ebdfd16 100644 --- a/resources/libraries/bash/function/device.sh +++ b/resources/libraries/bash/function/device.sh @@ -1,4 +1,4 @@ -# Copyright (c) 2023 Cisco and/or its affiliates. +# Copyright (c) 2024 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: @@ -312,21 +312,21 @@ function get_available_interfaces () { dut1_netdev=(ens5 enp175) ports_per_nic=2 ;; - "1n_tx2") + "1n_alt") # Add Intel Corporation XL710/X710 Virtual Function to the # whitelist. pci_id="0x154c" - tg_netdev=(enp5) - dut1_netdev=(enp145) + tg_netdev=(enp1s0f0 enp1s0f1) + dut1_netdev=(enP3p2s0f0 enP3p2s0f1) ports_per_nic=2 ;; "1n_spr") # Add Intel Corporation E810 Virtual Function to the # whitelist. pci_id="0x1889" - tg_netdev=(ens2) - dut1_netdev=(ens4) - ports_per_nic=2 + tg_netdev=(enp42s0 enp44s0) + dut1_netdev=(enp63s0 enp61s0) + ports_per_nic=1 ;; "1n_vbox") # Add Intel Corporation 82545EM Gigabit Ethernet Controller to the @@ -705,7 +705,7 @@ function set_env_variables () { 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!" @@ -713,7 +713,7 @@ function set_env_variables () { 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!"