#!/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},
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
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)