aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--resources/libraries/python/TrafficGenerator.py4
-rw-r--r--resources/tools/testbed-setup/ansible/roles/common/defaults/main.yaml1
2 files changed, 3 insertions, 2 deletions
diff --git a/resources/libraries/python/TrafficGenerator.py b/resources/libraries/python/TrafficGenerator.py
index 12c5271873..f44ff870bd 100644
--- a/resources/libraries/python/TrafficGenerator.py
+++ b/resources/libraries/python/TrafficGenerator.py
@@ -244,7 +244,6 @@ class TrafficGenerator(AbstractMeasurer):
)
# TODO: pylint says disable=too-many-locals.
- # A fix is developed in https://gerrit.fd.io/r/c/csit/+/22221
def initialize_traffic_generator(
self, tg_node, tg_if1, tg_if2, tg_if1_adj_node, tg_if1_adj_if,
tg_if2_adj_node, tg_if2_adj_if, osi_layer, tg_if1_dst_mac=None,
@@ -369,7 +368,8 @@ class TrafficGenerator(AbstractMeasurer):
# Configure TRex.
ports = ''
for port in tg_node[u"interfaces"].values():
- ports += f" {port.get(u'pci_address')}"
+ if u'Mellanox' not in port.get(u'model'):
+ ports += f" {port.get(u'pci_address')}"
cmd = f"sh -c \"cd {Constants.TREX_INSTALL_DIR}/scripts/ && " \
f"./dpdk_nic_bind.py -u {ports} || true\""
diff --git a/resources/tools/testbed-setup/ansible/roles/common/defaults/main.yaml b/resources/tools/testbed-setup/ansible/roles/common/defaults/main.yaml
index f54bfce228..45e792ce31 100644
--- a/resources/tools/testbed-setup/ansible/roles/common/defaults/main.yaml
+++ b/resources/tools/testbed-setup/ansible/roles/common/defaults/main.yaml
@@ -19,6 +19,7 @@ packages_by_distro:
ubuntu:
- "build-essential"
- "libpcap-dev"
+ - "net-tools"
- "python-all"
- "python-apt"
- "python-cffi"