Skip to content

[Cherry-pick#16654] [Qos]Fixture update for duthost selection in test_pfc_counter.py #139

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

Open
ansrajpu-git wants to merge 1 commit into
base: 202405
Choose a base branch
from
+24 −24
Open

[Cherry-pick#16654] [Qos]Fixture update for duthost selection in test_pfc_counter.py #139

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
48 changes: 24 additions & 24 deletions tests/qos/test_pfc_counters.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from tests.common.fixtures.conn_graph_facts import conn_graph_facts, fanout_graph_facts # noqa F401
from tests.common.fixtures.conn_graph_facts import conn_graph_facts, enum_fanout_graph_facts # noqa F401
from .qos_fixtures import leaf_fanouts # noqa F401
from .qos_helpers import eos_to_linux_intf, nxos_to_linux_intf, sonic_to_linux_intf
import os
Expand Down Expand Up @@ -69,7 +69,7 @@ def setup_testbed(fanouthosts, duthost, leaf_fanouts): # noqa F811



def run_test(fanouthosts, duthost, conn_graph_facts, fanout_graph_facts, leaf_fanouts, # noqa F811
def run_test(fanouthosts, duthost, conn_graph_facts, enum_fanout_graph_facts, leaf_fanouts, # noqa F811
is_pfc=True, pause_time=65535, check_continuous_pfc=False):
"""
@Summary: Run test for Ethernet flow control (FC) or priority-based flow control (PFC)
Expand Down Expand Up @@ -105,7 +105,7 @@ def run_test(fanouthosts, duthost, conn_graph_facts, fanout_graph_facts, leaf_fa

peerdev_ans = fanouthosts[peer_device]
fanout_os = peerdev_ans.get_fanout_os()
fanout_hwsku = fanout_graph_facts[peerdev_ans.hostname]["device_info"]["HwSku"]
fanout_hwsku = enum_fanout_graph_facts[peerdev_ans.hostname]["device_info"]["HwSku"]
if fanout_os == "nxos":
peer_port_name = nxos_to_linux_intf(peer_port)
elif fanout_os == "sonic":
Expand Down Expand Up @@ -176,7 +176,7 @@ def run_test(fanouthosts, duthost, conn_graph_facts, fanout_graph_facts, leaf_fa

peerdev_ans = fanouthosts[peer_device]
fanout_os = peerdev_ans.get_fanout_os()
fanout_hwsku = fanout_graph_facts[peerdev_ans.hostname]["device_info"]["HwSku"]
fanout_hwsku = enum_fanout_graph_facts[peerdev_ans.hostname]["device_info"]["HwSku"]
if fanout_os == "nxos":
peer_port_name = nxos_to_linux_intf(peer_port)
elif fanout_os == "sonic":
Expand Down Expand Up @@ -209,40 +209,40 @@ def run_test(fanouthosts, duthost, conn_graph_facts, fanout_graph_facts, leaf_fa
assert pfc_rx[intf]['Rx'][i] == '0'


def test_pfc_pause(fanouthosts, duthosts, rand_one_tgen_dut_hostname,
conn_graph_facts, fanout_graph_facts, leaf_fanouts): # noqa F811
def test_pfc_pause(fanouthosts, duthosts, enum_rand_one_per_hwsku_frontend_hostname,
conn_graph_facts, enum_fanout_graph_facts, leaf_fanouts): # noqa F811
""" @Summary: Run PFC pause frame (pause time quanta > 0) tests """
duthost = duthosts[rand_one_tgen_dut_hostname]
duthost = duthosts[enum_rand_one_per_hwsku_frontend_hostname]
run_test(fanouthosts, duthost, conn_graph_facts,
fanout_graph_facts, leaf_fanouts)
enum_fanout_graph_facts, leaf_fanouts)


def test_pfc_unpause(fanouthosts, duthosts, rand_one_tgen_dut_hostname,
conn_graph_facts, fanout_graph_facts, leaf_fanouts): # noqa F811
def test_pfc_unpause(fanouthosts, duthosts, enum_rand_one_per_hwsku_frontend_hostname,
conn_graph_facts, enum_fanout_graph_facts, leaf_fanouts): # noqa F811
""" @Summary: Run PFC unpause frame (pause time quanta = 0) tests """
duthost = duthosts[rand_one_tgen_dut_hostname]
duthost = duthosts[enum_rand_one_per_hwsku_frontend_hostname]
run_test(fanouthosts, duthost, conn_graph_facts,
fanout_graph_facts, leaf_fanouts, pause_time=0)
enum_fanout_graph_facts, leaf_fanouts, pause_time=0)


def test_fc_pause(fanouthosts, duthosts, rand_one_tgen_dut_hostname,
conn_graph_facts, fanout_graph_facts, leaf_fanouts): # noqa F811
def test_fc_pause(fanouthosts, duthosts, enum_rand_one_per_hwsku_frontend_hostname,
conn_graph_facts, enum_fanout_graph_facts, leaf_fanouts): # noqa F811
""" @Summary: Run FC pause frame (pause time quanta > 0) tests """
duthost = duthosts[rand_one_tgen_dut_hostname]
duthost = duthosts[enum_rand_one_per_hwsku_frontend_hostname]
run_test(fanouthosts, duthost, conn_graph_facts,
fanout_graph_facts, leaf_fanouts, is_pfc=False)
enum_fanout_graph_facts, leaf_fanouts, is_pfc=False)


def test_fc_unpause(fanouthosts, duthosts, rand_one_tgen_dut_hostname,
conn_graph_facts, fanout_graph_facts, leaf_fanouts): # noqa F811
def test_fc_unpause(fanouthosts, duthosts, enum_rand_one_per_hwsku_frontend_hostname,
conn_graph_facts, enum_fanout_graph_facts, leaf_fanouts): # noqa F811
""" @Summary: Run FC pause frame (pause time quanta = 0) tests """
duthost = duthosts[rand_one_tgen_dut_hostname]
duthost = duthosts[enum_rand_one_per_hwsku_frontend_hostname]
run_test(fanouthosts, duthost, conn_graph_facts,
fanout_graph_facts, leaf_fanouts, is_pfc=False, pause_time=0)
enum_fanout_graph_facts, leaf_fanouts, is_pfc=False, pause_time=0)


def test_continous_pfc(fanouthosts, duthosts, rand_one_tgen_dut_hostname,
conn_graph_facts, fanout_graph_facts, leaf_fanouts): # noqa F811
duthost = duthosts[rand_one_tgen_dut_hostname]
def test_continous_pfc(fanouthosts, duthosts, enum_rand_one_per_hwsku_frontend_hostname,
conn_graph_facts, enum_fanout_graph_facts, leaf_fanouts): # noqa F811
duthost = duthosts[enum_rand_one_per_hwsku_frontend_hostname]
run_test(fanouthosts, duthost, conn_graph_facts,
fanout_graph_facts, leaf_fanouts, check_continuous_pfc=True)
enum_fanout_graph_facts, leaf_fanouts, check_continuous_pfc=True)