diff --git a/tests/common/snappi_tests/common_helpers.py b/tests/common/snappi_tests/common_helpers.py index 294aea40947..8039b82d469 100644 --- a/tests/common/snappi_tests/common_helpers.py +++ b/tests/common/snappi_tests/common_helpers.py @@ -547,8 +547,8 @@ def enable_ecn(host_ans, prio, asic_value=None): """ if asic_value is None: host_ans.shell('sudo ecnconfig -q {} on'.format(prio)) - results = host_ans.shell('ecnconfig -q {}'.format(prio)) - if re.search("queue {}: on".format(prio), results['stdout']): + results = host_ans.shell('sudo ecnconfig -q {} on'.format(prio)) + if re.search("sudo ecnconfig -q {} on".format(prio), results['cmd']): return True else: host_ans.shell('sudo ecnconfig -n {} -q {} on'.format(asic_value, prio)) diff --git a/tests/snappi_tests/pfc/test_pfc_pause_response_with_snappi.py b/tests/snappi_tests/pfc/test_pfc_pause_response_with_snappi.py index f028c353195..9f204582a32 100644 --- a/tests/snappi_tests/pfc/test_pfc_pause_response_with_snappi.py +++ b/tests/snappi_tests/pfc/test_pfc_pause_response_with_snappi.py @@ -6,7 +6,7 @@ from tests.common.fixtures.conn_graph_facts import conn_graph_facts,\ fanout_graph_facts # noqa: F401 from tests.common.snappi_tests.snappi_fixtures import snappi_api_serv_ip, snappi_api_serv_port,\ - snappi_api, snappi_testbed_config # noqa: F401 + snappi_api, snappi_testbed_config, is_pfc_enabled # noqa: F401 from tests.common.snappi_tests.qos_fixtures import prio_dscp_map, all_prio_list, lossless_prio_list,\ lossy_prio_list, disable_pfcwd # noqa: F401 from tests.common.snappi_tests.snappi_test_params import SnappiTestParams diff --git a/tests/snappi_tests/pfc/test_pfc_pause_unset_bit_enable_vector.py b/tests/snappi_tests/pfc/test_pfc_pause_unset_bit_enable_vector.py index 64ab07c7ac0..1394a7967f1 100644 --- a/tests/snappi_tests/pfc/test_pfc_pause_unset_bit_enable_vector.py +++ b/tests/snappi_tests/pfc/test_pfc_pause_unset_bit_enable_vector.py @@ -6,7 +6,7 @@ from tests.common.fixtures.conn_graph_facts import conn_graph_facts,\ fanout_graph_facts # noqa: F401 from tests.common.snappi_tests.snappi_fixtures import snappi_api_serv_ip, snappi_api_serv_port,\ - snappi_api, snappi_testbed_config # noqa: F401 + snappi_api, snappi_testbed_config, is_pfc_enabled # noqa: F401 from tests.common.snappi_tests.qos_fixtures import prio_dscp_map, all_prio_list, lossless_prio_list,\ lossy_prio_list, disable_pfcwd # noqa: F401 from tests.common.snappi_tests.snappi_test_params import SnappiTestParams diff --git a/tests/snappi_tests/pfc/test_pfc_pause_zero_mac.py b/tests/snappi_tests/pfc/test_pfc_pause_zero_mac.py index 8175119e5ec..d3b8856daff 100644 --- a/tests/snappi_tests/pfc/test_pfc_pause_zero_mac.py +++ b/tests/snappi_tests/pfc/test_pfc_pause_zero_mac.py @@ -6,7 +6,7 @@ from tests.common.fixtures.conn_graph_facts import conn_graph_facts,\ fanout_graph_facts # noqa: F401 from tests.common.snappi_tests.snappi_fixtures import snappi_api_serv_ip, snappi_api_serv_port,\ - snappi_api, snappi_testbed_config # noqa: F401 + snappi_api, snappi_testbed_config, is_pfc_enabled # noqa: F401 from tests.common.snappi_tests.qos_fixtures import prio_dscp_map, all_prio_list, lossless_prio_list,\ lossy_prio_list, disable_pfcwd # noqa: F401 from tests.common.snappi_tests.snappi_test_params import SnappiTestParams diff --git a/tests/snappi_tests/pfc/test_valid_pfc_frame_with_snappi.py b/tests/snappi_tests/pfc/test_valid_pfc_frame_with_snappi.py index abddf60d4e6..b513ed543fb 100644 --- a/tests/snappi_tests/pfc/test_valid_pfc_frame_with_snappi.py +++ b/tests/snappi_tests/pfc/test_valid_pfc_frame_with_snappi.py @@ -6,7 +6,7 @@ from tests.common.fixtures.conn_graph_facts import conn_graph_facts,\ fanout_graph_facts # noqa: F401 from tests.common.snappi_tests.snappi_fixtures import snappi_api_serv_ip, snappi_api_serv_port,\ - snappi_api, snappi_testbed_config # noqa: F401 + snappi_api, snappi_testbed_config, is_pfc_enabled # noqa: F401 from tests.common.snappi_tests.qos_fixtures import prio_dscp_map, all_prio_list, lossless_prio_list,\ lossy_prio_list, disable_pfcwd # noqa: F401 from tests.common.snappi_tests.snappi_test_params import SnappiTestParams diff --git a/tests/snappi_tests/pfc/test_valid_src_mac_pfc_frame.py b/tests/snappi_tests/pfc/test_valid_src_mac_pfc_frame.py index 3a7ca8699ae..bf8115c0790 100644 --- a/tests/snappi_tests/pfc/test_valid_src_mac_pfc_frame.py +++ b/tests/snappi_tests/pfc/test_valid_src_mac_pfc_frame.py @@ -7,7 +7,7 @@ from tests.common.fixtures.conn_graph_facts import conn_graph_facts,\ fanout_graph_facts # noqa: F401 from tests.common.snappi_tests.snappi_fixtures import snappi_api_serv_ip, snappi_api_serv_port,\ - snappi_api, snappi_testbed_config, is_snappi_multidut # noqa: F401 + snappi_api, snappi_testbed_config, is_snappi_multidut, is_pfc_enabled # noqa: F401 from tests.common.snappi_tests.qos_fixtures import prio_dscp_map, all_prio_list, lossless_prio_list,\ lossy_prio_list, disable_pfcwd # noqa: F401 from tests.common.snappi_tests.snappi_test_params import SnappiTestParams diff --git a/tests/snappi_tests/pfc/warm_reboot/test_pfc_pause_lossless_warm_reboot.py b/tests/snappi_tests/pfc/warm_reboot/test_pfc_pause_lossless_warm_reboot.py index 79cb7b69ebe..0a4e4dcb4d8 100644 --- a/tests/snappi_tests/pfc/warm_reboot/test_pfc_pause_lossless_warm_reboot.py +++ b/tests/snappi_tests/pfc/warm_reboot/test_pfc_pause_lossless_warm_reboot.py @@ -9,7 +9,7 @@ from tests.common.fixtures.conn_graph_facts import conn_graph_facts,\ fanout_graph_facts # noqa: F401 from tests.common.snappi_tests.snappi_fixtures import snappi_api_serv_ip, snappi_api_serv_port,\ - snappi_api, snappi_testbed_config # noqa: F401 + snappi_api, snappi_testbed_config, is_pfc_enabled # noqa: F401 from tests.common.snappi_tests.qos_fixtures import prio_dscp_map, all_prio_list, lossless_prio_list,\ lossy_prio_list # noqa: F401 from tests.common.snappi_tests.snappi_test_params import SnappiTestParams