From bb8a6462b8508108bf886f9c1d9d53d9ebf3f71a Mon Sep 17 00:00:00 2001 From: Vratko Polak Date: Thu, 5 Dec 2024 10:44:09 +0100 Subject: fix(gso): Repair linux interface name detection + Set GSO_FALSE tag on non-gso suite. Change-Id: I32b6ff2f492a0dd8f2fe47ef5435c8d0e3318406 Signed-off-by: Vratko Polak --- resources/libraries/python/IPUtil.py | 12 ++++-------- .../2n1l-10ge2p1x710-ethip4-ip4base-2vhost-iperf3-mrr.robot | 4 ++-- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/resources/libraries/python/IPUtil.py b/resources/libraries/python/IPUtil.py index d7996ccf79..672aa1ae3c 100644 --- a/resources/libraries/python/IPUtil.py +++ b/resources/libraries/python/IPUtil.py @@ -394,16 +394,12 @@ class IPUtil: :raises RuntimeError: If cannot get the information about interfaces. """ cmd = f"grep '{pci_addr}' /sys/class/net/*/device/uevent" - ret_code, stdout, stderr = exec_cmd(node, cmd, timeout=30) - if ret_code != 0: - return None - + msg = "Could not get information about interfaces" + stdout, stderr = exec_cmd_no_error(node, cmd, timeout=30, err_msg=msg) try: - stdout.split("/")[4] + return stdout.split("/")[4] except IndexError: - raise RuntimeError( - f"Could not get information about interfaces:\n{stderr}" - ) + raise RuntimeError(f"{msg}:\n{stderr}") @staticmethod def set_linux_interface_up( diff --git a/tests/vpp/perf/gso/2n1l-10ge2p1x710-ethip4-ip4base-2vhost-iperf3-mrr.robot b/tests/vpp/perf/gso/2n1l-10ge2p1x710-ethip4-ip4base-2vhost-iperf3-mrr.robot index f5d6db5b1a..d41b22fb94 100644 --- a/tests/vpp/perf/gso/2n1l-10ge2p1x710-ethip4-ip4base-2vhost-iperf3-mrr.robot +++ b/tests/vpp/perf/gso/2n1l-10ge2p1x710-ethip4-ip4base-2vhost-iperf3-mrr.robot @@ -1,4 +1,4 @@ -# Copyright (c) 2023 Cisco and/or its affiliates. +# Copyright (c) 2024 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: @@ -16,7 +16,7 @@ | | Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | MRR | ... | NIC_Intel-X710 | IP4FWD | BASE | IP4BASE | DRV_VHOST -| ... | RXQ_SIZE_1024 | TXQ_SIZE_1024 | GSO_TRUE +| ... | RXQ_SIZE_1024 | TXQ_SIZE_1024 | GSO_FALSE | ... | ethip4-ip4base-2vhost-iperf3 | | Suite Setup | Setup suite topology interfaces | iPerf3 -- cgit 1.2.3-korg