aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--docs/content/infrastructure/fdio_dc_testbed_specifications.md128
-rw-r--r--docs/content/infrastructure/fdio_dc_vexxhost_inventory.md6
-rw-r--r--fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.70.yaml20
-rw-r--r--fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.71.yaml18
-rw-r--r--fdio.infra.ansible/roles/vpp_device/defaults/main.yaml6
-rw-r--r--fdio.infra.ansible/roles/vpp_device/files/csit-initialize-vfs-alt.sh34
-rw-r--r--fdio.infra.ansible/roles/vpp_device/tasks/main.yaml7
-rw-r--r--fdio.infra.ansible/roles/vpp_device/tasks/thunderx2.yaml23
-rw-r--r--resources/job_specs/vpp_device/vpp-1n-alt.md (renamed from resources/job_specs/vpp_device/vpp-1n-tx2.md)2
9 files changed, 125 insertions, 119 deletions
diff --git a/docs/content/infrastructure/fdio_dc_testbed_specifications.md b/docs/content/infrastructure/fdio_dc_testbed_specifications.md
index 63a1d7c0c1..2ef663cab6 100644
--- a/docs/content/infrastructure/fdio_dc_testbed_specifications.md
+++ b/docs/content/infrastructure/fdio_dc_testbed_specifications.md
@@ -42,7 +42,7 @@ To access these hosts, VPN connection is required.
#. Type Purpose SUT TG #TB #SUT #TG #skx #ps1 #rng #tx2 #tsh #alt #clx #zn2 #icx #snr #spr #icxd
1. 1-Node-Skylake nomad skx na 5 5 0 5 0 0 0 0 0 0 0 0 0 0 0
2. 1-Node-Cascadelake nomad clx na 4 4 0 0 0 0 0 0 0 4 0 0 0 0 0
- 3. 1-Node-AmpereAltra nomad alt na 2 2 0 0 0 0 0 0 2 0 0 0 0 0 0
+ 3. 1-Node-AmpereAltra nomad alt na 4 4 0 0 0 0 0 0 4 0 0 0 0 0 0
4. 2-Node-IxiaPS1L47 tcp skx ps1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 0
5. 2-Node-Cascadelake perf clx clx 3 3 3 0 0 0 0 0 0 6 0 0 0 0 0
6. 2-Node-ThunderX2 perf tx2 skx 1 1 .5 .5 0 0 1 0 0 0 0 0 0 0 0
@@ -55,8 +55,8 @@ To access these hosts, VPN connection is required.
13. 3-Node-SnowRidge perf snr icx 1 2 .5 0 0 0 0 0 0 0 0 .5 2 0 0
14. 2-Node-SapphireRapids perf spr spr 4 4 4 0 0 0 0 0 0 0 0 0 0 8 0
15. 1-Node-SapphireRapids nomad spr na 4 4 0 0 0 0 0 0 0 0 0 0 0 4 0
-16. 3-Node-IcelakeD perf icxd icx 2 4 1 0 0 0 0 0 0 0 0 1 0 0 4
- Totals: 37 46 19.5 7 1 2 1 2 4 10 2 16.5 2 12 4
+16. 3-Node-IcelakeD perf icxd icx 4 6 1 0 0 0 0 0 0 0 0 1 0 0 4
+ Totals: 39 48 19.5 7 1 2 1 2 6 10 2 16.5 2 12 4
```
### 1-Node-Skylake Xeon Intel (1n-skx)
@@ -65,9 +65,9 @@ Each 1-Node-Skylake testbed includes one SUT (Server-Type-B2) with NIC
ports connected back-to-back ([Server Types](#server-types)).
Used for FD.io VPP_Device functional driver tests.
-### 1-Node-ThunderX2 Arm Marvell (1n-tx2)
+### 1-Node-Altra Arm Ampere (1n-alt)
-Each 1-Node-ThunderX2 testbed includes one SUT (Server-Type-E11) with NIC
+Each 1-Node-Altra testbed includes one SUT (Server-Type-E25) with NIC
ports connected back-to-back ([Server Types](#server-types)).
Used for FD.io VPP_Device functional driver tests.
@@ -362,26 +362,7 @@ FD.io CSIT lab contains following server types:
- PCIe Slot2 41:00.xx: x710-4p10GE Intel.
- PCIe Slot3 81:00.xx: xxv710-da2 2p25GE Intel.
-10. **Server-Type-E11**: Purpose - ThunderX2 Arm Marvell SUT for FD.io VPP_Device functional tests.
- - Quantity: 2.
- - Physical connectivity:
- - IPMI and host management ports.
- - NIC ports connected into 1-node topologies.
- - Main HW configuration:
- - Chassis: GIGABYTE Rack Mount
- - Motherboard: MT91-FS4-00
- - Processors: 2 * ThunderX2 ARMv8 CN9980 2.20 GHz
- - RAM Memory: 16 * 16GB DIMM
- - Disks: 2 * 480GB 6G SATA SSD SAMSUNG MZ7LH480
- - NICs configuration:
- - Numa0:
- - PCIe Slot4 05:00.xx: XL710-QDA2-2p40GE Intel.
- - PCIe Slot8 0b:00.xx: ConnectX5-2p10/25GE Mellanox.
- - Numa1:
- - PCIe Slot14 91:00.xx: XL710-QDA2-2p40GE Intel.
- - PCIe Slot26 9a:00.xx: ConnectX5-2p10/25GE Mellanox.
-
-11. **Server-Type-E21**: Purpose - TaiShan Arm Huawei SUT for FD.io performance testing.
+10. **Server-Type-E21**: Purpose - TaiShan Arm Huawei SUT for FD.io performance testing.
- Quantity: 2.
- Physical connectivity:
- IPMI(?) and host management ports.
@@ -395,7 +376,7 @@ FD.io CSIT lab contains following server types:
- PCIe Slot4 e9:00.xx: connectx4-2p25GE Mellanox.
- PCIe Slot6 11:00.xx: x520-2p10GE Intel.
-12. **Server-Type-E22**: Purpose - ThunderX2 Arm Marvell SUT for FD.io performance testing.
+11. **Server-Type-E22**: Purpose - ThunderX2 Arm Marvell SUT for FD.io performance testing.
- Quantity: 1.
- Physical connectivity:
- IPMI and host management ports.
@@ -412,7 +393,7 @@ FD.io CSIT lab contains following server types:
- Numa1:
- PCIe Slot18 91:00.xx: XL710-QDA2-2p40GE Intel.
-13. **Server-Type-E23**: Purpose - Altra Arm Ampere SUT for FD.io performance testing.
+12. **Server-Type-E23**: Purpose - Altra Arm Ampere SUT for FD.io performance testing.
- Quantity: 2.
- Physical connectivity:
- IPMI and host management ports.
@@ -431,7 +412,7 @@ FD.io CSIT lab contains following server types:
- Numa1:
- no cards.
-14. **Server-Type-E24**: Purpose - Altra Arm Ampere for FD.io build.
+13. **Server-Type-E24**: Purpose - Altra Arm Ampere for FD.io build.
- Quantity: 2.
- Physical connectivity:
- IPMI and host management ports.
@@ -443,6 +424,26 @@ FD.io CSIT lab contains following server types:
- RAM Memory: 12* 16GB DDR4-3200MT/s
- Disks: 1* 960GB SSD Samsung M.2 NVMe PM983
+14. **Server-Type-E25**: Purpose - Altra Arm Ampere SUT for FD.io VPP_Device functional tests.
+ - Quantity: 2.
+ - Physical connectivity:
+ - IPMI and host management ports.
+ - NIC ports connected into 1-node topologies.
+ - Main HW configuration:
+ - Chassis: Gigabyte R152-P30-00 1U
+ - Motherboard: MP32-AR1-00
+ - Processors: 1* Ampere(R) Altra(R) Q80-30 Processor (Neoverse N1)
+ - Processor Signature: Implementor 0x0a, Variant 0x1, Architecture 6, Part 0x000, Revision 1
+ - RAM Memory: 32* 16GB DDR4-3200MT/s
+ - Disks: 1* 960GB SSD Samsung M.2 NVMe PM9A3
+ - NICs configuration:
+ - Numa0:
+ - PCIe Slot4 05:00.xx: XL710-QDA2-2p40GE Intel.
+ - PCIe Slot8 0b:00.xx: ConnectX5-2p10/25GE Mellanox.
+ - Numa1:
+ - PCIe Slot14 91:00.xx: XL710-QDA2-2p40GE Intel.
+ - PCIe Slot26 9a:00.xx: ConnectX5-2p10/25GE Mellanox.
+
15. **Server-Type-E31**: Purpose - Skylake Xeon Shared TG for FD.io performance testing.
- Quantity: 1.
- Physical connectivity:
@@ -810,37 +811,37 @@ FD.io CSIT lab contains following server types:
- s2-t12-sut1-c8/p2 - 100GE-port2 e810-2p100GE.
```
-### 1-Node-ThunderX2 (1n-tx2)
+### 1-Node-Altra (1n-alt)
```
-- SUT [Server-Type-E11]:
+- SUT [Server-Type-E25]:
- testbedname: testbed13
- - hostname: s55-t13-sut1
+ - hostname: s70-t13-sut1
- IPMI IP: 10.30.50.70
- Host IP: 10.30.51.70
- portnames:
- - s55-t13-sut1-c4/p1 - 40GE-port1 XL710-QDA2-2p40GE.
- - s55-t13-sut1-c4/p2 - 40GE-port2 XL710-QDA2-2p40GE.
- - s55-t13-sut1-c8/p1 - 40GE-port1 ConnectX5-2p10/25GE Mellanox.
- - s55-t13-sut1-c8/p2 - 40GE-port2 ConnectX5-2p10/25GE Mellanox.
- - s55-t13-sut1-c14/p1 - 40GE-port1 XL710-QDA2-2p40GE.
- - s55-t13-sut1-c14/p2 - 40GE-port2 XL710-QDA2-2p40GE.
- - s55-t13-sut1-c26/p1 - 40GE-port1 ConnectX5-2p10/25GE Mellanox.
- - s55-t13-sut1-c26/p2 - 40GE-port2 ConnectX5-2p10/25GE Mellanox.
-- SUT [Server-Type-E11]:
+ - s70-t13-sut1-c4/p1 - 40GE-port1 XL710-QDA2-2p40GE.
+ - s70-t13-sut1-c4/p2 - 40GE-port2 XL710-QDA2-2p40GE.
+ - s70-t13-sut1-c8/p1 - 40GE-port1 ConnectX5-2p10/25GE Mellanox.
+ - s70-t13-sut1-c8/p2 - 40GE-port2 ConnectX5-2p10/25GE Mellanox.
+ - s70-t13-sut1-c14/p1 - 40GE-port1 XL710-QDA2-2p40GE.
+ - s70-t13-sut1-c14/p2 - 40GE-port2 XL710-QDA2-2p40GE.
+ - s70-t13-sut1-c26/p1 - 40GE-port1 ConnectX5-2p10/25GE Mellanox.
+ - s70-t13-sut1-c26/p2 - 40GE-port2 ConnectX5-2p10/25GE Mellanox.
+- SUT [Server-Type-E25]:
- testbedname: testbed14
- - hostname: s56-t14-sut1
+ - hostname: s71-t14-sut1
- IPMI IP: 10.30.50.71
- Host IP: 10.30.51.71
- portnames:
- - s56-t14-sut1-c4/p1 - 40GE-port1 XL710-QDA2-2p40GE.
- - s56-t14-sut1-c4/p2 - 40GE-port2 XL710-QDA2-2p40GE.
- - s56-t14-sut1-c8/p1 - 40GE-port1 ConnectX5-2p10/25GE Mellanox.
- - s56-t14-sut1-c8/p2 - 40GE-port2 ConnectX5-2p10/25GE Mellanox.
- - s56-t14-sut1-c14/p1 - 40GE-port1 XL710-QDA2-2p40GE.
- - s56-t14-sut1-c14/p2 - 40GE-port2 XL710-QDA2-2p40GE.
- - s56-t14-sut1-c26/p1 - 40GE-port1 ConnectX5-2p10/25GE Mellanox.
- - s56-t14-sut1-c26/p2 - 40GE-port2 ConnectX5-2p10/25GE Mellanox.
+ - s71-t14-sut1-c4/p1 - 40GE-port1 XL710-QDA2-2p40GE.
+ - s71-t14-sut1-c4/p2 - 40GE-port2 XL710-QDA2-2p40GE.
+ - s71-t14-sut1-c8/p1 - 40GE-port1 ConnectX5-2p10/25GE Mellanox.
+ - s71-t14-sut1-c8/p2 - 40GE-port2 ConnectX5-2p10/25GE Mellanox.
+ - s71-t14-sut1-c14/p1 - 40GE-port1 XL710-QDA2-2p40GE.
+ - s71-t14-sut1-c14/p2 - 40GE-port2 XL710-QDA2-2p40GE.
+ - s71-t14-sut1-c26/p1 - 40GE-port1 ConnectX5-2p10/25GE Mellanox.
+ - s71-t14-sut1-c26/p2 - 40GE-port2 ConnectX5-2p10/25GE Mellanox.
```
### 1-Node-SapphireRapids (1n-spr)
@@ -1660,28 +1661,36 @@ FD.io CSIT lab contains following server types:
- s2-t12-sut1-c5/p2 to s2-t12-sut1-c6/p2.
```
-### 1-Node-ThunderX2 (1n-tx2)
+### 1-Node-Altra (1n-alt)
```
- testbed13:
- ring1 40GE-ports XL710-QDA2-2p40GE on SUTs:
- - s55-t13-sut1-c4/p1 - s55-t13-sut1-c14/p1.
+ - s70-t13-sut1-c1/p1 - s70-t13-sut1-c2/p1.
- ring2 40GE-ports XL710-QDA2-2p40GE on SUTs:
- - s55-t13-sut1-c4/p2 - s55-t13-sut1-c14/p2.
+ - s70-t13-sut1-c1/p2 - s70-t13-sut1-c2/p2.
- ring3 10/25GE-ports ConnectX5-2p10/25GE on SUTs:
- - s55-t13-sut1-c8/p1 - s55-t13-sut1-c26/p1.
+ - s70-t13-sut1-c3/p1 - s70-t13-sut1-c4/p1.
- ring4 10/25GE-ports ConnectX5-2p10/25GE on SUTs:
- - s55-t13-sut1-c8/p2 - s55-t13-sut1-c26/p2.
+ - s70-t13-sut1-c3/p2 - s70-t13-sut1-c4/p2.
+ - ring5 100GE-ports ConnectX6-2p100GE on SUTs:
+ - s70-t13-sut1-c5/p1 - s70-t13-sut1-c6/p1.
+ - ring6 100GE-ports ConnectX6-2p100GE on SUTs:
+ - s70-t13-sut1-c5/p2 - s70-t13-sut1-c6/p2.
- testbed14:
- ring1 40GE-ports XL710-QDA2-2p40GE on SUTs:
- - s56-t14-sut1-c4/p1 - s56-t14-sut1-c14/p1.
+ - s71-t14-sut1-c1/p1 - s71-t14-sut1-c2/p1.
- ring2 40GE-ports XL710-QDA2-2p40GE on SUTs:
- - s56-t14-sut1-c4/p2 - s56-t14-sut1-c14/p2.
+ - s71-t14-sut1-c1/p2 - s71-t14-sut1-c2/p2.
- ring3 10/25GE-ports ConnectX5-2p10/25GE on SUTs:
- - s56-t14-sut1-c8/p1 - s56-t14-sut1-c26/p1.
+ - s71-t14-sut1-c3/p1 - s71-t14-sut1-c4/p1.
- ring4 10/25GE-ports ConnectX5-2p10/25GE on SUTs:
- - s56-t14-sut1-c8/p2 - s56-t14-sut1-c26/p2.
+ - s71-t14-sut1-c3/p2 - s71-t14-sut1-c4/p2.
+ - ring5 100GE-ports ConnectX6-2p100GE on SUTs:
+ - s71-t14-sut1-c5/p1 - s71-t14-sut1-c6/p1.
+ - ring6 100GE-ports ConnectX6-2p100GE on SUTs:
+ - s71-t14-sut1-c5/p2 - s71-t14-sut1-c6/p2.
```
### 1-Node-SapphireRapids (1n-spr)
@@ -2040,5 +2049,4 @@ To be completed.
- s90-t31t32-tg1-c6/p1 to s34-t32-sut1-c1/p1.
- s34-t32-sut1-c1/p2 to s35-t32-sut2-c1/p2.
- s35-t32-sut2-c1/p1 to s90-t31t32-tg1-c6/p2.
-```
-
+``` \ No newline at end of file
diff --git a/docs/content/infrastructure/fdio_dc_vexxhost_inventory.md b/docs/content/infrastructure/fdio_dc_vexxhost_inventory.md
index 60f446bd28..36264463ae 100644
--- a/docs/content/infrastructure/fdio_dc_vexxhost_inventory.md
+++ b/docs/content/infrastructure/fdio_dc_vexxhost_inventory.md
@@ -97,8 +97,8 @@ Captured inventory data:
s80-t38-tg1 | 3n-icx | SYS-740GP-TNRT | C7470KL03P50454 | 10.30.51.80 | 10.30.50.80 | 3016.11 | u23-u26
s30-t15-sut1 | nomad-client | SYS-741GE-TNRT | C7490FL47A50154 | 10.30.51.30 | 10.30.50.30 | 3016.11 | u19-u22
s31-t16-sut1 | nomad-client | SYS-741GE-TNRT | C7490FL47A50149 | 10.30.51.31 | 10.30.50.31 | 3016.11 | u15-u18
- s56-t14-sut1 | 1n-tx2 | ThunderX2-9980 | N/A | 10.30.51.71 | 10.30.50.71 | 3016.11 | u13-u14
- s55-t13-sut1 | 1n-tx2 | ThunderX2-9980 | N/A | 10.30.51.70 | 10.30.50.70 | 3016.11 | u11-u12
+ s70-t13-sut1 | 1n-alt | WIWYNN | N/A | 10.30.51.70 | 10.30.50.70 | 3016.11 | u13-u14
+ s71-t14-sut1 | 1n-alt | WIWYNN | N/A | 10.30.51.71 | 10.30.50.71 | 3016.11 | u11-u12
s62-t34-sut1 | 3n-alt | WIWYNN | 04000059N0SC | 10.30.51.72 | 10.30.50.72 | 3016.11 | u9-u10
s63-t34-sut2 | 3n-alt | WIWYNN | 0390003EN0SC | 10.30.51.73 | 10.30.50.73 | 3016.11 | u7-u8
s64-t34-tg1 | 3n-alt | SYS-740GP-TNRT | C7470KK40P50249 | 10.30.51.74 | 10.30.50.74 | 3016.11 | u3-u6
@@ -123,4 +123,4 @@ Captured inventory data:
s35-t28-sut1 | 2n-clx | SYS-7049GP-TRT | C7470KH37A30509 | 10.32.8.20 | 10.30.55.20 | 3016.12 | u14-u17
s36-t28-tg1 | 2n-clx | SYS-7049GP-TRT | C7470KH37A30511 | 10.32.8.21 | 10.30.55.21 | 3016.12 | u10-u13
s37-t29-sut1 | 2n-clx | SYS-7049GP-TRT | C7470KH37A30566 | 10.32.8.22 | 10.30.55.22 | 3016.12 | u6-u9
- s38-t29-tg1 | 2n-clx | SYS-7049GP-TRT | C7470KH37A30506 | 10.32.8.23 | 10.30.55.23 | 3016.12 | u2-u5
+ s38-t29-tg1 | 2n-clx | SYS-7049GP-TRT | C7470KH37A30506 | 10.32.8.23 | 10.30.55.23 | 3016.12 | u2-u5 \ No newline at end of file
diff --git a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.70.yaml b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.70.yaml
index ab533c02bb..556e2b29fb 100644
--- a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.70.yaml
+++ b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.70.yaml
@@ -1,14 +1,14 @@
---
# file: host_vars/10.30.51.70.yaml
-hostname: "s55-t13-sut1"
-inventory_ipmi_hostname: "10.30.50.70"
-vfs_data_file: "csit-initialize-vfs-tx2.sh"
+hostname: "s70-t13-sut1"
grub:
hugepagesz: "2M"
hugepages: 32768
iommu.passthrough: "1"
-cpu_microarchitecture: "thunderx2"
+inventory_ipmi_hostname: "10.30.50.70"
+vfs_data_file: "csit-initialize-vfs-alt.sh"
+cpu_microarchitecture: "altra"
intel_700_matrix: "dpdk22.07"
@@ -60,12 +60,11 @@ nomad_servers:
- "10.30.51.23:4647"
- "10.30.51.24:4647"
- "10.30.51.25:4647"
-nomad_cpu_total_compute: "40000"
# Consul settigs.
nomad_use_consul: true
consul_certificates:
- - src: "{{ file_consul_agent_ca_pem }}"
+ - src: "{{ file_consul_ca_pem }}"
dest: "{{ consul_ca_file }}"
- src: "{{ file_consul_server_0_pem }}"
dest: "{{ consul_cert_file }}"
@@ -91,7 +90,8 @@ vault_version: "1.13.1"
# Docker settings.
docker_daemon:
- dns: ["172.17.0.1"]
- dns-opts: []
- dns-search: ["{{ansible_hostname}}"]
- storage-driver: "overlay2"
+ default-shm-size: "1073741824"
+# dns: ["172.17.0.1"]
+# dns-opts: []
+# dns-search: ["{{ansible_hostname}}"]
+# host: ["172.17.0.1:/var/run/docker.sock"]
diff --git a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.71.yaml b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.71.yaml
index 1ac36623eb..519923704e 100644
--- a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.71.yaml
+++ b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.71.yaml
@@ -1,13 +1,13 @@
---
# file: host_vars/10.30.51.71.yaml
-hostname: "s56-t14-sut1"
-inventory_ipmi_hostname: "10.30.50.71"
-vfs_data_file: "csit-initialize-vfs-tx2.sh"
+hostname: "s71-t14-sut1"
grub:
hugepagesz: "2M"
hugepages: 32768
iommu.passthrough: "1"
+inventory_ipmi_hostname: "10.30.50.71"
+vfs_data_file: "csit-initialize-vfs-alt.sh"
cpu_microarchitecture: "thunderx2"
intel_700_matrix: "dpdk22.07"
@@ -60,12 +60,11 @@ nomad_servers:
- "10.30.51.23:4647"
- "10.30.51.24:4647"
- "10.30.51.25:4647"
-nomad_cpu_total_compute: "40000"
# Consul settigs.
nomad_use_consul: true
consul_certificates:
- - src: "{{ file_consul_agent_ca_pem }}"
+ - src: "{{ file_consul_ca_pem }}"
dest: "{{ consul_ca_file }}"
- src: "{{ file_consul_server_0_pem }}"
dest: "{{ consul_cert_file }}"
@@ -91,7 +90,8 @@ vault_version: "1.13.1"
# Docker settings.
docker_daemon:
- dns: ["172.17.0.1"]
- dns-opts: []
- dns-search: ["{{ansible_hostname}}"]
- storage-driver: "overlay2"
+ default-shm-size: "1073741824"
+# dns: ["172.17.0.1"]
+# dns-opts: []
+# dns-search: ["{{ansible_hostname}}"]
+# host: ["172.17.0.1:/var/run/docker.sock"]
diff --git a/fdio.infra.ansible/roles/vpp_device/defaults/main.yaml b/fdio.infra.ansible/roles/vpp_device/defaults/main.yaml
deleted file mode 100644
index 377b910a42..0000000000
--- a/fdio.infra.ansible/roles/vpp_device/defaults/main.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
----
-# file: defaults/main.yaml
-
-iavf_target_dir: "/opt"
-iavf_version: "4.1.1"
-iavf_url: "https://downloads.sourceforge.net/project/e1000/iavf%20stable/{{ iavf_version }}/iavf-{{ iavf_version }}.tar.gz?ts=gAAAAABgvfs_L6gSH8B09NfEc8fzoooS3M2wyuOxlFEK5EtTstZWFdb2dYcqJZNqiirAT87dbc3GeJJrRst9KfUgS-byAeyaLw%3D%3D&r=https%3A%2F%2Fsourceforge.net%2Fprojects%2Fe1000%2Ffiles%2Fiavf%2520stable%2F{{ iavf_version }}%2Fiavf-{{ iavf_version }}.tar.gz%2Fdownload"
diff --git a/fdio.infra.ansible/roles/vpp_device/files/csit-initialize-vfs-alt.sh b/fdio.infra.ansible/roles/vpp_device/files/csit-initialize-vfs-alt.sh
new file mode 100644
index 0000000000..e3b22a2ef1
--- /dev/null
+++ b/fdio.infra.ansible/roles/vpp_device/files/csit-initialize-vfs-alt.sh
@@ -0,0 +1,34 @@
+#!/usr/bin/env bash
+
+# Copyright (c) 2023 PANTHEON.tech 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:
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# Add QLogic Corp. FastLinQ QL41000 Series 10/25/40/50GbE Controller to
+# blacklist.
+PCI_BLACKLIST=($(lspci -Dmmd ':8070:0200' | cut -f1 -d' '))
+# Add I350 Gigabit Network Connection 1521 to blacklist.
+PCI_BLACKLIST+=($(lspci -Dmmd ':1521:0200' | cut -f1 -d' '))
+# Add MT27800 Family [ConnectX-5] 1017 to blacklist.
+PCI_BLACKLIST+=($(lspci -Dmmd ':1017:0200' | cut -f1 -d' '))
+
+# Add Intel Corporation Ethernet Controller XL710 for 40GbE QSFP+ to whitelist.
+PCI_WHITELIST=($(lspci -Dmmd ':1583:0200' | cut -f1 -d' '))
+
+# See http://pci-ids.ucw.cz/v2.2/pci.ids for more info.
+
+declare -A PF_INDICES
+# Intel NICs
+PF_INDICES["0000:01:00.0"]=0
+PF_INDICES["0000:01:00.1"]=1
+PF_INDICES["0003:02:00.0"]=0
+PF_INDICES["0003:02:00.1"]=1
diff --git a/fdio.infra.ansible/roles/vpp_device/tasks/main.yaml b/fdio.infra.ansible/roles/vpp_device/tasks/main.yaml
index 88d4ddb1a0..5e98be2f84 100644
--- a/fdio.infra.ansible/roles/vpp_device/tasks/main.yaml
+++ b/fdio.infra.ansible/roles/vpp_device/tasks/main.yaml
@@ -1,13 +1,6 @@
---
# file: tasks/main.yaml
-- name: "ThunderX2 Kernel Modules Config"
- import_tasks: "thunderx2.yaml"
- when:
- - cpu_microarchitecture == "thunderx2"
- tags:
- - conf-kernel-modules
-
- name: "Disable IPv6 Router Advertisement"
ansible.builtin.sysctl:
name: "net.ipv6.conf.default.accept_ra"
diff --git a/fdio.infra.ansible/roles/vpp_device/tasks/thunderx2.yaml b/fdio.infra.ansible/roles/vpp_device/tasks/thunderx2.yaml
deleted file mode 100644
index 618a65ad7f..0000000000
--- a/fdio.infra.ansible/roles/vpp_device/tasks/thunderx2.yaml
+++ /dev/null
@@ -1,23 +0,0 @@
----
-# file: tasks/thunderx2.yaml
-
-- name: Load Kernel Modules On Startup (vfio-pci)
- ansible.builtin.lineinfile:
- path: "/etc/modules"
- state: "present"
- line: "{{ item }}"
- with_items:
- - "vfio-pci"
- tags:
- - load-kernel-modules
-
-- name: Disable Kernel Modules On Startup (cppc_cpufreq)
- ansible.builtin.lineinfile:
- path: "/etc/modprobe.d/blacklist-cppc_cpufreq.conf"
- state: "present"
- line: "{{ item }}"
- create: "yes"
- with_items:
- - "blacklist cppc_cpufreq"
- tags:
- - disable-kernel-modules
diff --git a/resources/job_specs/vpp_device/vpp-1n-tx2.md b/resources/job_specs/vpp_device/vpp-1n-alt.md
index ead17d7109..6f7c0263f7 100644
--- a/resources/job_specs/vpp_device/vpp-1n-tx2.md
+++ b/resources/job_specs/vpp_device/vpp-1n-alt.md
@@ -1,4 +1,4 @@
-# 1n-tx2
+# 1n-alt
## ./container_memif
### intel-x710
#### dpdk-vfio-pci