From 75ac8edcfe62444d09425ad542264f6fd0b0e5fd Mon Sep 17 00:00:00 2001 From: Sonic Build Admin Date: Wed, 29 Jan 2025 23:21:54 +0000 Subject: [PATCH] feat: use round() instead of ceil to fix #16080 ### Description of PR Summary: Use method `round()` to suit better need comparing to ceil vs int(). Fixes # (issue) #16080 ### Type of change - [ ] Bug fix - [ ] Testbed and Framework(new/improvement) - [ ] New Test case - [ ] Skipped for non-supported platforms - [ ] Test case improvement ### Back port request - [ ] 202012 - [ ] 202205 - [ ] 202305 - [ ] 202311 - [ ] 202405 - [ ] 202411 ### Approach #### What is the motivation for this PR? #### How did you do it? #### How did you verify/test it? #### Any platform specific information? #### Supported testbed topology if it's a new test case? ### Documentation --- .../files/lossless_response_to_external_pause_storms_helper.py | 2 +- .../lossless_response_to_throttling_pause_storms_helper.py | 2 +- .../multidut/pfc/files/m2o_fluctuating_lossless_helper.py | 3 +-- .../multidut/pfc/files/m2o_oversubscribe_lossless_helper.py | 2 +- .../pfc/files/m2o_oversubscribe_lossless_lossy_helper.py | 2 +- .../multidut/pfc/files/m2o_oversubscribe_lossy_helper.py | 2 +- 6 files changed, 6 insertions(+), 7 deletions(-) diff --git a/tests/snappi_tests/multidut/pfc/files/lossless_response_to_external_pause_storms_helper.py b/tests/snappi_tests/multidut/pfc/files/lossless_response_to_external_pause_storms_helper.py index e2b9715e30..bf46b008c7 100644 --- a/tests/snappi_tests/multidut/pfc/files/lossless_response_to_external_pause_storms_helper.py +++ b/tests/snappi_tests/multidut/pfc/files/lossless_response_to_external_pause_storms_helper.py @@ -154,7 +154,7 @@ def run_lossless_response_to_external_pause_storms_test(api, total_rx_pkts = rx_pkts_1 + rx_pkts_2 # Calculate the drop percentage drop_percentage = 100 * pkt_drop / total_rx_pkts - pytest_assert(ceil(drop_percentage) == 0, 'FAIL: There should be no packet drops in ingress dut counters') + pytest_assert(round(drop_percentage) == 0, 'FAIL: There should be no packet drops in ingress dut counters') verify_external_pause_storm_result(flow_stats, tx_port, diff --git a/tests/snappi_tests/multidut/pfc/files/lossless_response_to_throttling_pause_storms_helper.py b/tests/snappi_tests/multidut/pfc/files/lossless_response_to_throttling_pause_storms_helper.py index 674d35b47e..29e490fd9c 100644 --- a/tests/snappi_tests/multidut/pfc/files/lossless_response_to_throttling_pause_storms_helper.py +++ b/tests/snappi_tests/multidut/pfc/files/lossless_response_to_throttling_pause_storms_helper.py @@ -161,7 +161,7 @@ def run_lossless_response_to_throttling_pause_storms_test(api, total_rx_pkts = rx_pkts_1 + rx_pkts_2 # Calculate the drop percentage drop_percentage = 100 * pkt_drop / total_rx_pkts - pytest_assert(ceil(drop_percentage) == 0, 'FAIL: There should be no packet drops in ingress dut counters') + pytest_assert(round(drop_percentage) == 0, 'FAIL: There should be no packet drops in ingress dut counters') """ Verify Results """ verify_throttling_pause_storm_result(flow_stats, diff --git a/tests/snappi_tests/multidut/pfc/files/m2o_fluctuating_lossless_helper.py b/tests/snappi_tests/multidut/pfc/files/m2o_fluctuating_lossless_helper.py index ea3a6a462a..ca30d49455 100644 --- a/tests/snappi_tests/multidut/pfc/files/m2o_fluctuating_lossless_helper.py +++ b/tests/snappi_tests/multidut/pfc/files/m2o_fluctuating_lossless_helper.py @@ -1,5 +1,4 @@ import logging # noqa: F401 -from math import ceil from tests.common.helpers.assertions import pytest_assert, pytest_require # noqa: F401 from tests.common.fixtures.conn_graph_facts import conn_graph_facts, fanout_graph_facts # noqa: F401 from tests.common.snappi_tests.snappi_helpers import get_dut_port_id # noqa: F401 @@ -143,7 +142,7 @@ def run_m2o_fluctuating_lossless_test(api, total_rx_pkts = rx_pkts_1 + rx_pkts_2 # Calculate the drop percentage drop_percentage = 100 * pkt_drop / total_rx_pkts - pytest_assert(ceil(drop_percentage) == 8, 'FAIL: Drop packets must be around 8 percent') + pytest_assert(round(drop_percentage) == 8, 'FAIL: Drop packets must be around 8 percent') """ Verify Results """ verify_m2o_fluctuating_lossless_result(flow_stats, diff --git a/tests/snappi_tests/multidut/pfc/files/m2o_oversubscribe_lossless_helper.py b/tests/snappi_tests/multidut/pfc/files/m2o_oversubscribe_lossless_helper.py index 1369021912..611db81313 100644 --- a/tests/snappi_tests/multidut/pfc/files/m2o_oversubscribe_lossless_helper.py +++ b/tests/snappi_tests/multidut/pfc/files/m2o_oversubscribe_lossless_helper.py @@ -146,7 +146,7 @@ def run_m2o_oversubscribe_lossless_test(api, total_rx_pkts = rx_pkts_1 + rx_pkts_2 # Calculate the drop percentage drop_percentage = 100 * pkt_drop / total_rx_pkts - pytest_assert(ceil(drop_percentage) == 0, 'FAIL: There should be no packet drops in ingress dut counters') + pytest_assert(round(drop_percentage) == 0, 'FAIL: There should be no packet drops in ingress dut counters') """ Verify Results """ verify_m2o_oversubscribe_lossless_result(flow_stats, diff --git a/tests/snappi_tests/multidut/pfc/files/m2o_oversubscribe_lossless_lossy_helper.py b/tests/snappi_tests/multidut/pfc/files/m2o_oversubscribe_lossless_lossy_helper.py index db420a99f9..c006fabb12 100644 --- a/tests/snappi_tests/multidut/pfc/files/m2o_oversubscribe_lossless_lossy_helper.py +++ b/tests/snappi_tests/multidut/pfc/files/m2o_oversubscribe_lossless_lossy_helper.py @@ -151,7 +151,7 @@ def run_pfc_m2o_oversubscribe_lossless_lossy_test(api, total_rx_pkts = rx_pkts_1 + rx_pkts_2 # Calculate the drop percentage drop_percentage = 100 * pkt_drop / total_rx_pkts - pytest_assert(ceil(drop_percentage) == 5, 'FAIL: Drop packets must be around 5 percent') + pytest_assert(round(drop_percentage) == 5, 'FAIL: Drop packets must be around 5 percent') """ Verify Results """ verify_m2o_oversubscribe_lossless_lossy_result(flow_stats, diff --git a/tests/snappi_tests/multidut/pfc/files/m2o_oversubscribe_lossy_helper.py b/tests/snappi_tests/multidut/pfc/files/m2o_oversubscribe_lossy_helper.py index 7d467a98fc..a2a8c0830d 100644 --- a/tests/snappi_tests/multidut/pfc/files/m2o_oversubscribe_lossy_helper.py +++ b/tests/snappi_tests/multidut/pfc/files/m2o_oversubscribe_lossy_helper.py @@ -151,7 +151,7 @@ def run_pfc_m2o_oversubscribe_lossy_test(api, total_rx_pkts = rx_pkts_1 + rx_pkts_2 # Calculate the drop percentage drop_percentage = 100 * pkt_drop / total_rx_pkts - pytest_assert(ceil(drop_percentage) == 10, 'FAIL: Drop packets must be around 10 percent') + pytest_assert(round(drop_percentage) == 10, 'FAIL: Drop packets must be around 10 percent') """ Verify Results """ verify_m2o_oversubscribe_lossy_result(flow_stats,