aboutsummaryrefslogtreecommitdiffstats
path: root/resources
diff options
context:
space:
mode:
Diffstat (limited to 'resources')
-rw-r--r--resources/libraries/bash/function/device.sh10
-rw-r--r--resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.70.yaml2
-rw-r--r--resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.71.yaml2
-rw-r--r--resources/tools/testbed-setup/ansible/roles/vpp_device/files/csit-initialize-vfs-tx2.sh12
4 files changed, 7 insertions, 19 deletions
diff --git a/resources/libraries/bash/function/device.sh b/resources/libraries/bash/function/device.sh
index cd987cafd2..6816ac823f 100644
--- a/resources/libraries/bash/function/device.sh
+++ b/resources/libraries/bash/function/device.sh
@@ -270,14 +270,8 @@ function get_available_interfaces () {
# Add Intel Corporation XL710/X710 Virtual Function to the
# whitelist.
pci_id="0x154c"
- tg_netdev=(enp5s2 enp5s3 enp5s4 enp5s5
- enp5s6 enp5s7 enp5s8 enp5s9)
- tg_netdev+=(enp5s10 enp5s11 enp5s12 enp5s13
- enp5s14 enp5s15 enp5s16 enp5s17)
- dut1_netdev=(enp145s2 enp145s3 enp145s4 enp145s5
- enp145s6 enp145s7 enp145s8 enp145s9)
- dut1_netdev+=(enp145s10 enp145s11 enp145s12 enp145s13
- enp145s14 enp145s15 enp145s16 enp145s17)
+ tg_netdev=(enp5)
+ dut1_netdev=(enp145)
;;
"1n_vbox")
# Add Intel Corporation 82545EM Gigabit Ethernet Controller to the
diff --git a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.70.yaml b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.70.yaml
index ad33f0276e..caf80df9ca 100644
--- a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.70.yaml
+++ b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.70.yaml
@@ -6,7 +6,7 @@ inventory_ipmi_hostname: "10.30.50.70"
vfs_data_file: "csit-initialize-vfs-tx2.sh"
grub:
hugepagesz: "2M"
- nr_hugepages: 65536
+ nr_hugepages: 32768
cpu_microarchitecture: "thunderx2"
# User management.
diff --git a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.71.yaml b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.71.yaml
index 1712346116..1be446f288 100644
--- a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.71.yaml
+++ b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.71.yaml
@@ -6,7 +6,7 @@ inventory_ipmi_hostname: "10.30.50.71"
vfs_data_file: "csit-initialize-vfs-tx2.sh"
grub:
hugepagesz: "2M"
- nr_hugepages: 65536
+ nr_hugepages: 32768
cpu_microarchitecture: "thunderx2"
# User management.
diff --git a/resources/tools/testbed-setup/ansible/roles/vpp_device/files/csit-initialize-vfs-tx2.sh b/resources/tools/testbed-setup/ansible/roles/vpp_device/files/csit-initialize-vfs-tx2.sh
index b900efcf7c..6c56752ad0 100644
--- a/resources/tools/testbed-setup/ansible/roles/vpp_device/files/csit-initialize-vfs-tx2.sh
+++ b/resources/tools/testbed-setup/ansible/roles/vpp_device/files/csit-initialize-vfs-tx2.sh
@@ -1,6 +1,6 @@
#!/usr/bin/env bash
-# Copyright (c) 2020 PANTHEON.tech and/or its affiliates.
+# Copyright (c) 2021 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:
@@ -18,11 +18,11 @@
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' '))
-# Add MT27800 Family [ConnectX-5] 1017 to whitelist.
-PCI_WHITELIST+=($(lspci -Dmmd ':1017:0200' | cut -f1 -d' '))
# See http://pci-ids.ucw.cz/v2.2/pci.ids for more info.
@@ -32,9 +32,3 @@ PF_INDICES["0000:05:00.0"]=0
PF_INDICES["0000:05:00.1"]=1
PF_INDICES["0000:91:00.0"]=0
PF_INDICES["0000:91:00.1"]=1
-
-# Mellanox NICs
-PF_INDICES["0000:0b:00.0"]=2
-PF_INDICES["0000:0b:00.1"]=3
-PF_INDICES["0000:9a:00.0"]=2
-PF_INDICES["0000:9a:00.1"]=3