Skip to content

Commit

Permalink
fix: fix failure pfcwd_multiport (#15562)
Browse files Browse the repository at this point in the history
Description of PR
Summary:
Fixes # (issue) 30115858

Approach
What is the motivation for this PR?
From the original PR #10198 these changes were left out. After adding it back in it passed all the tests

Signed-off-by: Austin Pham <[email protected]>
  • Loading branch information
auspham authored and mssonicbld committed Nov 17, 2024
1 parent 942c68c commit 3f512cc
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions tests/pfcwd/test_pfcwd_function.py
Original file line number Diff line number Diff line change
Expand Up @@ -517,6 +517,7 @@ def __init__(self, ptf, router_mac, tx_mac, pfc_params, is_dualtor):
self.pfc_wd_rx_port_vlan_id = pfc_params['rx_port_vlan_id']
self.port_id_to_type_map = pfc_params['port_id_to_type_map']
self.port_type = pfc_params['port_type']
self.is_dualtor = is_dualtor
if is_dualtor:
self.vlan_mac = "00:aa:bb:cc:dd:ee"
else:
Expand Down Expand Up @@ -568,7 +569,7 @@ def verify_rx_ingress(self, action):
else:
dst_port = "[ " + str(self.pfc_wd_rx_port_id) + " ]"
ptf_params = {'router_mac': self.tx_mac,
'vlan_mac': self.vlan_mac,
'vlan_mac': self.vlan_mac if self.is_dualtor else self.tx_mac,
'queue_index': self.pfc_queue_index,
'pkt_count': self.pfc_wd_test_pkt_count,
'port_src': self.pfc_wd_test_port_id,
Expand Down Expand Up @@ -634,7 +635,7 @@ def verify_other_pfc_pg(self):
other_pg = self.pfc_queue_index + 1

ptf_params = {'router_mac': self.tx_mac,
'vlan_mac': self.vlan_mac,
'vlan_mac': self.vlan_mac if self.is_dualtor else self.tx_mac,
'queue_index': other_pg,
'pkt_count': self.pfc_wd_test_pkt_count,
'port_src': self.pfc_wd_test_port_id,
Expand Down

0 comments on commit 3f512cc

Please sign in to comment.