From cb0188995fc92673b0d5701207a3b4dc7801589c Mon Sep 17 00:00:00 2001 From: Jan Gelety Date: Tue, 26 May 2020 15:10:07 +0200 Subject: FIX: do not fail when skipping patch for l3fwd Change-Id: I1159fb29d43f61628922cdbd51313f710aa72f4a Signed-off-by: Jan Gelety --- resources/libraries/python/DPDK/L3fwdTest.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'resources/libraries/python/DPDK') diff --git a/resources/libraries/python/DPDK/L3fwdTest.py b/resources/libraries/python/DPDK/L3fwdTest.py index c2b3da184f..5adab76745 100644 --- a/resources/libraries/python/DPDK/L3fwdTest.py +++ b/resources/libraries/python/DPDK/L3fwdTest.py @@ -17,7 +17,7 @@ This module exists to provide the l3fwd test for DPDK on topology nodes. from resources.libraries.python.Constants import Constants from resources.libraries.python.DpdkUtil import DpdkUtil -from resources.libraries.python.ssh import exec_cmd_no_error +from resources.libraries.python.ssh import exec_cmd_no_error, exec_cmd from resources.libraries.python.topology import NodeType, Topology @@ -155,4 +155,6 @@ class L3fwdTest: f"{Constants.REMOTE_FW_DIR}/{Constants.RESOURCES_LIB_SH}"\ f"/entry/{patch}" message = f"Failed to patch l3fwd at node {node['host']}" - exec_cmd_no_error(node, command, timeout=1800, message=message) + ret_code, stdout, _ = exec_cmd(node, command, timeout=1800) + if ret_code != 0 and u"Skipping patch." not in stdout: + raise RuntimeError(message) -- cgit 1.2.3-korg