From fce274ba49bd75a56296905bf437e6c74759b872 Mon Sep 17 00:00:00 2001 From: pmikus Date: Fri, 2 Jun 2023 11:52:16 +0000 Subject: fix(dpdk): CX7 support Signed-off-by: pmikus Change-Id: Ib98b25bd3c98b5e6dbcb1bfe8478bd41bf37d71c (cherry picked from commit 0952440b3136fc75aa2f2d98df3d198ff978661b) --- fdio.infra.ansible/roles/docker_images/files/base/Dockerfile | 2 ++ .../roles/docker_images/templates/docker-compose-sut.yaml.j2 | 4 ++++ resources/libraries/python/DPDK/TestpmdTest.py | 8 ++++++-- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/fdio.infra.ansible/roles/docker_images/files/base/Dockerfile b/fdio.infra.ansible/roles/docker_images/files/base/Dockerfile index 5a0ad8ac45..6f859d90d2 100644 --- a/fdio.infra.ansible/roles/docker_images/files/base/Dockerfile +++ b/fdio.infra.ansible/roles/docker_images/files/base/Dockerfile @@ -33,6 +33,7 @@ RUN apt-get -q update \ libapr1 \ libblas-dev \ libffi-dev \ + libibverbs-dev \ liblapack-dev \ libmbedcrypto7 \ libmbedtls14 \ @@ -57,6 +58,7 @@ RUN apt-get -q update \ python3-setuptools \ python3-virtualenv \ qemu-system \ + rdma-core \ rsyslog \ screen \ socat \ diff --git a/fdio.infra.ansible/roles/docker_images/templates/docker-compose-sut.yaml.j2 b/fdio.infra.ansible/roles/docker_images/templates/docker-compose-sut.yaml.j2 index d24ea0236e..79f0f71e58 100644 --- a/fdio.infra.ansible/roles/docker_images/templates/docker-compose-sut.yaml.j2 +++ b/fdio.infra.ansible/roles/docker_images/templates/docker-compose-sut.yaml.j2 @@ -4,6 +4,8 @@ services: build: context: "base/" dockerfile: "Dockerfile" + cap_add: + - NET_RAW command: ["/usr/sbin/sshd","-D", "-p", "6001"] expose: - "6001" @@ -47,6 +49,8 @@ services: build: context: "base/" dockerfile: "Dockerfile" + cap_add: + - NET_RAW command: ["/usr/sbin/sshd","-D", "-p", "6002"] expose: - "6002" diff --git a/resources/libraries/python/DPDK/TestpmdTest.py b/resources/libraries/python/DPDK/TestpmdTest.py index 091110f129..f2e1efacf1 100644 --- a/resources/libraries/python/DPDK/TestpmdTest.py +++ b/resources/libraries/python/DPDK/TestpmdTest.py @@ -1,4 +1,4 @@ -# Copyright (c) 2022 Cisco and/or its affiliates. +# Copyright (c) 2023 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: @@ -27,7 +27,7 @@ class TestpmdTest: """ This class start testpmd on topology nodes and check if properly started. """ - + @staticmethod def start_testpmd_on_all_duts( nodes, topology_info, phy_cores, rx_queues=None, jumbo_frames=False, @@ -88,6 +88,10 @@ class TestpmdTest: if u"DUT" in node: for i in range(3): try: + nic_model = nodes[node]["interfaces"][if1]["model"] + if "Mellanox-CX7VEAT" in nic_model: + # Does not support lsc interrupt. + break TestpmdTest.check_testpmd(nodes[node]) break except RuntimeError: -- cgit 1.2.3-korg