diff options
| -rwxr-xr-x | resources/libraries/bash/entry/patch_l3fwd_flip_routes | 2 | ||||
| -rw-r--r-- | resources/libraries/python/DPDK/L3fwdTest.py | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/resources/libraries/bash/entry/patch_l3fwd_flip_routes b/resources/libraries/bash/entry/patch_l3fwd_flip_routes index c1fb0d93b3..3b35e1f930 100755 --- a/resources/libraries/bash/entry/patch_l3fwd_flip_routes +++ b/resources/libraries/bash/entry/patch_l3fwd_flip_routes @@ -1,6 +1,6 @@ #!/bin/sh -patch --ignore-whitespace l3fwd_lpm.c <<"_EOF" +patch --ignore-whitespace --forward l3fwd_lpm.c <<"_EOF" 44,45c44,45 < {RTE_IPV4(198, 18, 0, 0), 24, 0}, < {RTE_IPV4(198, 18, 1, 0), 24, 1}, 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) |