Skip to content

Commit a3ad5be

Browse files
authored
Fixing import issue for fixture is_pfc_enabled (#21313)
* is_pfc_enabled Fix pfc cases "import is_pfc_enabled"because of recent changes #20783 * missed one file update
1 parent 95be986 commit a3ad5be

File tree

7 files changed

+8
-8
lines changed

7 files changed

+8
-8
lines changed

tests/common/snappi_tests/common_helpers.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -547,8 +547,8 @@ def enable_ecn(host_ans, prio, asic_value=None):
547547
"""
548548
if asic_value is None:
549549
host_ans.shell('sudo ecnconfig -q {} on'.format(prio))
550-
results = host_ans.shell('ecnconfig -q {}'.format(prio))
551-
if re.search("queue {}: on".format(prio), results['stdout']):
550+
results = host_ans.shell('sudo ecnconfig -q {} on'.format(prio))
551+
if re.search("sudo ecnconfig -q {} on".format(prio), results['cmd']):
552552
return True
553553
else:
554554
host_ans.shell('sudo ecnconfig -n {} -q {} on'.format(asic_value, prio))

tests/snappi_tests/pfc/test_pfc_pause_response_with_snappi.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
from tests.common.fixtures.conn_graph_facts import conn_graph_facts,\
77
fanout_graph_facts # noqa: F401
88
from tests.common.snappi_tests.snappi_fixtures import snappi_api_serv_ip, snappi_api_serv_port,\
9-
snappi_api, snappi_testbed_config # noqa: F401
9+
snappi_api, snappi_testbed_config, is_pfc_enabled # noqa: F401
1010
from tests.common.snappi_tests.qos_fixtures import prio_dscp_map, all_prio_list, lossless_prio_list,\
1111
lossy_prio_list, disable_pfcwd # noqa: F401
1212
from tests.common.snappi_tests.snappi_test_params import SnappiTestParams

tests/snappi_tests/pfc/test_pfc_pause_unset_bit_enable_vector.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
from tests.common.fixtures.conn_graph_facts import conn_graph_facts,\
77
fanout_graph_facts # noqa: F401
88
from tests.common.snappi_tests.snappi_fixtures import snappi_api_serv_ip, snappi_api_serv_port,\
9-
snappi_api, snappi_testbed_config # noqa: F401
9+
snappi_api, snappi_testbed_config, is_pfc_enabled # noqa: F401
1010
from tests.common.snappi_tests.qos_fixtures import prio_dscp_map, all_prio_list, lossless_prio_list,\
1111
lossy_prio_list, disable_pfcwd # noqa: F401
1212
from tests.common.snappi_tests.snappi_test_params import SnappiTestParams

tests/snappi_tests/pfc/test_pfc_pause_zero_mac.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
from tests.common.fixtures.conn_graph_facts import conn_graph_facts,\
77
fanout_graph_facts # noqa: F401
88
from tests.common.snappi_tests.snappi_fixtures import snappi_api_serv_ip, snappi_api_serv_port,\
9-
snappi_api, snappi_testbed_config # noqa: F401
9+
snappi_api, snappi_testbed_config, is_pfc_enabled # noqa: F401
1010
from tests.common.snappi_tests.qos_fixtures import prio_dscp_map, all_prio_list, lossless_prio_list,\
1111
lossy_prio_list, disable_pfcwd # noqa: F401
1212
from tests.common.snappi_tests.snappi_test_params import SnappiTestParams

tests/snappi_tests/pfc/test_valid_pfc_frame_with_snappi.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
from tests.common.fixtures.conn_graph_facts import conn_graph_facts,\
77
fanout_graph_facts # noqa: F401
88
from tests.common.snappi_tests.snappi_fixtures import snappi_api_serv_ip, snappi_api_serv_port,\
9-
snappi_api, snappi_testbed_config # noqa: F401
9+
snappi_api, snappi_testbed_config, is_pfc_enabled # noqa: F401
1010
from tests.common.snappi_tests.qos_fixtures import prio_dscp_map, all_prio_list, lossless_prio_list,\
1111
lossy_prio_list, disable_pfcwd # noqa: F401
1212
from tests.common.snappi_tests.snappi_test_params import SnappiTestParams

tests/snappi_tests/pfc/test_valid_src_mac_pfc_frame.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
from tests.common.fixtures.conn_graph_facts import conn_graph_facts,\
88
fanout_graph_facts # noqa: F401
99
from tests.common.snappi_tests.snappi_fixtures import snappi_api_serv_ip, snappi_api_serv_port,\
10-
snappi_api, snappi_testbed_config, is_snappi_multidut # noqa: F401
10+
snappi_api, snappi_testbed_config, is_snappi_multidut, is_pfc_enabled # noqa: F401
1111
from tests.common.snappi_tests.qos_fixtures import prio_dscp_map, all_prio_list, lossless_prio_list,\
1212
lossy_prio_list, disable_pfcwd # noqa: F401
1313
from tests.common.snappi_tests.snappi_test_params import SnappiTestParams

tests/snappi_tests/pfc/warm_reboot/test_pfc_pause_lossless_warm_reboot.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
from tests.common.fixtures.conn_graph_facts import conn_graph_facts,\
1010
fanout_graph_facts # noqa: F401
1111
from tests.common.snappi_tests.snappi_fixtures import snappi_api_serv_ip, snappi_api_serv_port,\
12-
snappi_api, snappi_testbed_config # noqa: F401
12+
snappi_api, snappi_testbed_config, is_pfc_enabled # noqa: F401
1313
from tests.common.snappi_tests.qos_fixtures import prio_dscp_map, all_prio_list, lossless_prio_list,\
1414
lossy_prio_list # noqa: F401
1515
from tests.common.snappi_tests.snappi_test_params import SnappiTestParams

0 commit comments

Comments
 (0)