Skip to content

Refactor pfcwd_helpers.py from folder tests/pfcwd to tests/common/helpers #14580

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
StormLiangMS merged 2 commits into from
Sep 14, 2024
Merged

Refactor pfcwd_helpers.py from folder tests/pfcwd to tests/common/helpers #14580

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cf123d2
Refactor pfcwd_helpers.py
yutongzhang-microsoft Sep 13, 2024
7648961
Fix
yutongzhang-microsoft Sep 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
0 tests/pfcwd/files/pfcwd_helper.py → tests/common/helpers/pfcwd_helper.py
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion tests/pfcwd/conftest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
from tests.common.fixtures.ptfhost_utils import change_mac_addresses # noqa F401
from tests.common.fixtures.ptfhost_utils import pause_garp_service # noqa F401
from tests.common.mellanox_data import is_mellanox_device as isMellanoxDevice
from .files.pfcwd_helper import TrafficPorts, set_pfc_timers, select_test_ports
from tests.common.helpers.pfcwd_helper import TrafficPorts, set_pfc_timers, select_test_ports
from tests.common.utilities import str2bool

logger = logging.getLogger(__name__)
Expand Down
7 changes: 4 additions & 3 deletions tests/pfcwd/test_pfcwd_all_port_storm.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,10 @@
from tests.common.fixtures.conn_graph_facts import enum_fanout_graph_facts # noqa F401
from tests.common.helpers.pfc_storm import PFCMultiStorm
from tests.common.plugins.loganalyzer.loganalyzer import LogAnalyzer
from .files.pfcwd_helper import start_wd_on_ports, start_background_traffic # noqa F401
from .files.pfcwd_helper import EXPECT_PFC_WD_DETECT_RE, EXPECT_PFC_WD_RESTORE_RE, fetch_vendor_specific_diagnosis_re
from .files.pfcwd_helper import send_background_traffic
from tests.common.helpers.pfcwd_helper import start_wd_on_ports, start_background_traffic # noqa F401
from tests.common.helpers.pfcwd_helper import EXPECT_PFC_WD_DETECT_RE, EXPECT_PFC_WD_RESTORE_RE, \
fetch_vendor_specific_diagnosis_re
from tests.common.helpers.pfcwd_helper import send_background_traffic
from tests.common import config_reload

TEMPLATES_DIR = os.path.join(os.path.dirname(os.path.realpath(__file__)), "templates")
Expand Down
9 changes: 5 additions & 4 deletions tests/pfcwd/test_pfcwd_function.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,16 @@
from tests.common.helpers.assertions import pytest_assert, pytest_require
from tests.common.helpers.pfc_storm import PFCStorm
from tests.common.plugins.loganalyzer.loganalyzer import LogAnalyzer
from .files.pfcwd_helper import start_wd_on_ports
from .files.pfcwd_helper import EXPECT_PFC_WD_DETECT_RE, EXPECT_PFC_WD_RESTORE_RE, fetch_vendor_specific_diagnosis_re
from .files.pfcwd_helper import has_neighbor_device
from tests.common.helpers.pfcwd_helper import start_wd_on_ports
from tests.common.helpers.pfcwd_helper import EXPECT_PFC_WD_DETECT_RE, EXPECT_PFC_WD_RESTORE_RE, \
fetch_vendor_specific_diagnosis_re
from tests.common.helpers.pfcwd_helper import has_neighbor_device
from tests.ptf_runner import ptf_runner
from tests.common import port_toggle
from tests.common import constants
from tests.common.dualtor.dual_tor_utils import is_tunnel_qos_remap_enabled, dualtor_ports # noqa F401
from tests.common.dualtor.mux_simulator_control import toggle_all_simulator_ports_to_enum_rand_one_per_hwsku_frontend_host_m # noqa F401, E501
from .files.pfcwd_helper import send_background_traffic, check_pfc_storm_state
from tests.common.helpers.pfcwd_helper import send_background_traffic, check_pfc_storm_state
from tests.common.utilities import wait_until


Expand Down
4 changes: 2 additions & 2 deletions tests/pfcwd/test_pfcwd_timer_accuracy.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@
from tests.common.fixtures.conn_graph_facts import enum_fanout_graph_facts # noqa F401
from tests.common.helpers.assertions import pytest_assert
from tests.common.helpers.pfc_storm import PFCStorm
from .files.pfcwd_helper import start_wd_on_ports, start_background_traffic # noqa F401
from tests.common.helpers.pfcwd_helper import start_wd_on_ports, start_background_traffic # noqa F401

from tests.common.plugins.loganalyzer import DisableLogrotateCronContext
from .files.pfcwd_helper import send_background_traffic
from tests.common.helpers.pfcwd_helper import send_background_traffic


pytestmark = [
Expand Down
6 changes: 3 additions & 3 deletions tests/pfcwd/test_pfcwd_warm_reboot.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@
from tests.common.utilities import InterruptableThread
from tests.common.utilities import join_all
from tests.ptf_runner import ptf_runner
from .files.pfcwd_helper import EXPECT_PFC_WD_DETECT_RE, EXPECT_PFC_WD_RESTORE_RE
from .files.pfcwd_helper import send_background_traffic
from .files.pfcwd_helper import has_neighbor_device
from tests.common.helpers.pfcwd_helper import EXPECT_PFC_WD_DETECT_RE, EXPECT_PFC_WD_RESTORE_RE
from tests.common.helpers.pfcwd_helper import send_background_traffic
from tests.common.helpers.pfcwd_helper import has_neighbor_device
from tests.common.utilities import wait_until

TEMPLATES_DIR = os.path.join(os.path.dirname(os.path.realpath(__file__)), "templates")
Expand Down
2 changes: 1 addition & 1 deletion tests/qos/test_qos_sai.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
from tests.common.dualtor.dual_tor_utils import dualtor_ports, is_tunnel_qos_remap_enabled # noqa F401
from tests.common.helpers.assertions import pytest_assert
from tests.common.helpers.pfc_storm import PFCStorm
from tests.pfcwd.files.pfcwd_helper import set_pfc_timers, start_wd_on_ports
from tests.common.helpers.pfcwd_helper import set_pfc_timers, start_wd_on_ports
from tests.common.platform.device_utils import list_dut_fanout_connections
from tests.common.utilities import wait_until
from .qos_sai_base import QosSaiBase
Expand Down