<div dir="ltr">Applied to next-dts, thanks.</div> <div class="gmail_quote gmail_quote_container"><div dir="ltr" class="gmail_attr">On Thu, Jun 26, 2025 at 3:56 PM Dean Marx <<a href="mailto:dmarx@iol.unh.edu">dmarx@iol.unh.edu</a>> wrote: </div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">Add a method for validating flow rules to the testpmd shell class. Implement test case skipping for flow rules that do not pass validation. Signed-off-by: Dean Marx <<a href="mailto:dmarx@iol.unh.edu" target="_blank">dmarx@iol.unh.edu</a>> Reviewed-by: Patrick Robb <<a href="mailto:probb@iol.unh.edu" target="_blank">probb@iol.unh.edu</a>> --- dts/framework/remote_session/testpmd_shell.py | 15 +++++++++++++ dts/framework/test_run.py | 3 +++ dts/framework/test_suite.py | 21 ++++++++++++++++++- 3 files changed, 38 insertions(+), 1 deletion(-) diff --git a/dts/framework/remote_session/testpmd_shell.py b/dts/framework/remote_session/testpmd_shell.py index 0b9bb4070a..299887dd80 100644 --- a/dts/framework/remote_session/testpmd_shell.py +++ b/dts/framework/remote_session/testpmd_shell.py @@ -1984,6 +1984,21 @@ def flow_create(self, flow_rule: FlowRule, port_id: int) -> int: self._logger.debug(f"Failed to create flow rule:\n{flow_output}") raise InteractiveCommandExecutionError(f"Failed to create flow rule:\n{flow_output}") + def flow_validate(self, flow_rule: FlowRule, port_id: int) -> bool: + """Validates a flow rule in the testpmd session. + + Args: + flow_rule: :class:`FlowRule` object used for validating testpmd flow rule. + port_id: Integer representing the port to use. + + Returns: + Boolean representing whether rule is valid or not. + """ + flow_output = self.send_command(f"flow validate {port_id} {flow_rule}") + if "Flow rule validated" in flow_output: + return True + return False + def flow_delete(self, flow_id: int, port_id: int, verify: bool = True) -> None: """Deletes the specified flow rule from the testpmd session. diff --git a/dts/framework/test_run.py b/dts/framework/test_run.py index 10a5e1a6b8..fd49a7dc74 100644 --- a/dts/framework/test_run.py +++ b/dts/framework/test_run.py @@ -655,6 +655,9 @@ def next(self) -> State | None: return self self.result.update(Result.FAIL, e) + except SkippedTestException as e: + <a href="http://self.logger.info" rel="noreferrer" target="_blank">self.logger.info</a>(f"{self.description.capitalize()} SKIPPED: {e}") + self.result.update(Result.SKIP, e) else: self.result.update(Result.PASS) <a href="http://self.logger.info" rel="noreferrer" target="_blank">self.logger.info</a>(f"{self.description.capitalize()} PASSED.") diff --git a/dts/framework/test_suite.py b/dts/framework/test_suite.py index e5fbadd1a1..145b79496f 100644 --- a/dts/framework/test_suite.py +++ b/dts/framework/test_suite.py @@ -39,7 +39,7 @@ PacketFilteringConfig, ) -from .exception import ConfigurationError, InternalError, TestCaseVerifyError +from .exception import ConfigurationError, InternalError, SkippedTestException, TestCaseVerifyError from .logger import DTSLogger, get_dts_logger from .utils import get_packet_summaries, to_pascal_case @@ -411,6 +411,25 @@ def _fail_test_case_verify(self, failure_description: str) -> None: self._logger.debug(command_res.command) raise TestCaseVerifyError(failure_description) + def verify_else_skip(self, condition: bool, skip_reason: str) -> None: + """Verify `condition` and handle skips. + + When `condition` is :data:`False`, raise a skip exception. + + Args: + condition: The condition to check. + skip_reason: Description of the reason for skipping. + + Raises: + SkippedTestException: `condition` is :data:`False`. + """ + if not condition: + self._skip_test_case_verify(skip_reason) + + def _skip_test_case_verify(self, skip_description: str) -> None: + self._logger.debug(f"Test case skipped: {skip_description}") + raise SkippedTestException(skip_description) + def verify_packets(self, expected_packet: Packet, received_packets: list[Packet]) -> None: """Verify that `expected_packet` has been received. -- 2.49.0 </blockquote></div>