From: pmikus <peter.mikus@protonmail.ch>
Date: Tue, 12 Sep 2023 07:04:31 +0000 (+0000)
Subject: fix(core): 1n_spr
X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=commitdiff_plain;h=23f41c5aaa6bb089c2b2ceda0f6265700ea0f1ca

fix(core): 1n_spr

Signed-off-by: pmikus <peter.mikus@protonmail.ch>
Change-Id: Ia8067fb1683295fb711bbba81a35b0e6d18b084f
---

diff --git a/fdio.infra.ansible/roles/docker_images/files/csit-sut/Dockerfile b/fdio.infra.ansible/roles/docker_images/files/csit-sut/Dockerfile
index 26463db449..85537bc32f 100644
--- a/fdio.infra.ansible/roles/docker_images/files/csit-sut/Dockerfile
+++ b/fdio.infra.ansible/roles/docker_images/files/csit-sut/Dockerfile
@@ -1,5 +1,7 @@
 FROM base-ubuntu2204:local
 
+EXPOSE 2222
+
 COPY supervisord.conf /etc/supervisor/supervisord.conf
 
 CMD ["sh", "-c", "rm -f /dev/shm/db /dev/shm/global_vm /dev/shm/vpe-api; /usr/bin/supervisord -c /etc/supervisor/supervisord.conf; /usr/sbin/sshd -D -p 2222"]
\ No newline at end of file
diff --git a/fdio.infra.ansible/roles/vpp_device/files/csit-initialize-vfs-spr.sh b/fdio.infra.ansible/roles/vpp_device/files/csit-initialize-vfs-spr.sh
index 7be48380e7..524807842f 100644
--- a/fdio.infra.ansible/roles/vpp_device/files/csit-initialize-vfs-spr.sh
+++ b/fdio.infra.ansible/roles/vpp_device/files/csit-initialize-vfs-spr.sh
@@ -23,4 +23,6 @@ PCI_WHITELIST+=($(lspci -Dmmd ':1592:0200' | cut -f1 -d' '))
 declare -A PF_INDICES
 # Intel NICs
 PF_INDICES["0000:2a:00.0"]=0
+PF_INDICES["0000:2c:00.0"]=1
 PF_INDICES["0000:3d:00.0"]=0
+PF_INDICES["0000:3f:00.0"]=1
diff --git a/fdio.infra.ansible/roles/vpp_device/tasks/thunderx2.yaml b/fdio.infra.ansible/roles/vpp_device/tasks/thunderx2.yaml
index 438095fc00..618a65ad7f 100644
--- a/fdio.infra.ansible/roles/vpp_device/tasks/thunderx2.yaml
+++ b/fdio.infra.ansible/roles/vpp_device/tasks/thunderx2.yaml
@@ -1,5 +1,5 @@
 ---
-# file: roles/vpp_device/tasks/thunderx2.yaml
+# file: tasks/thunderx2.yaml
 
 - name: Load Kernel Modules On Startup (vfio-pci)
   ansible.builtin.lineinfile:
diff --git a/resources/libraries/bash/function/device.sh b/resources/libraries/bash/function/device.sh
index 92dca0653b..93bc2ca82b 100644
--- a/resources/libraries/bash/function/device.sh
+++ b/resources/libraries/bash/function/device.sh
@@ -324,9 +324,9 @@ function get_available_interfaces () {
             # 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=(enp61s0 enp63s0)
+            ports_per_nic=1
             ;;
        "1n_vbox")
             # Add Intel Corporation 82545EM Gigabit Ethernet Controller to the