Skip to content

Add test_pfc_config.py script to t0 and t1-lag PR test set #13672

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
wangxin merged 1 commit into from
Jul 19, 2024
Merged

Add test_pfc_config.py script to t0 and t1-lag PR test set #13672

Show file tree
Hide file tree
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
2 changes: 2 additions & 0 deletions .azure-pipelines/pr_test_scripts.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,7 @@ t0:
- pc/test_lag_2.py
- pc/test_po_cleanup.py
- pc/test_po_update.py
- pfcwd/test_pfc_config.py
- platform_tests/broadcom/test_ser.py
- platform_tests/counterpoll/test_counterpoll_watermark.py
- platform_tests/fwutil/test_fwutil.py
Expand Down Expand Up @@ -229,6 +230,7 @@ t1-lag:
- override_config_table/test_override_config_table.py
- pc/test_lag_2.py
- pc/test_po_update.py
- pfcwd/test_pfc_config.py
- platform_tests/test_cpu_memory_usage.py
- process_monitoring/test_critical_process_monitoring.py
- qos/test_buffer.py
Expand Down
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 @@ -107,7 +107,7 @@ def setup_pfc_test(
duthost = duthosts[enum_rand_one_per_hwsku_frontend_hostname]
mg_facts = duthost.get_extended_minigraph_facts(tbinfo)
port_list = list(mg_facts['minigraph_ports'].keys())
neighbors = conn_graph_facts['device_conn'][duthost.hostname]
neighbors = conn_graph_facts['device_conn'].get(duthost.hostname, {})
dut_eth0_ip = duthost.mgmt_ip
vlan_nw = None

Expand Down
48 changes: 25 additions & 23 deletions tests/pfcwd/files/pfcwd_helper.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,21 +104,22 @@ def parse_intf_list(self):
if item['peer_addr'] == pfc_wd_test_port_addr:
pfc_wd_test_neighbor_addr = item['addr']

self.test_ports[pfc_wd_test_port] = {'test_neighbor_addr': pfc_wd_test_neighbor_addr,
'rx_port': [self.pfc_wd_rx_port],
'rx_neighbor_addr': self.pfc_wd_rx_neighbor_addr,
'peer_device': self.neighbors[pfc_wd_test_port]['peerdevice'],
'test_port_id': pfc_wd_test_port_id,
'rx_port_id': [self.pfc_wd_rx_port_id],
'test_port_type': 'interface'
}
self.test_ports[pfc_wd_test_port] = {
'test_neighbor_addr': pfc_wd_test_neighbor_addr,
'rx_port': [self.pfc_wd_rx_port],
'rx_neighbor_addr': self.pfc_wd_rx_neighbor_addr,
'peer_device': self.neighbors.get(pfc_wd_test_port, {}).get('peerdevice', ''),
'test_port_id': pfc_wd_test_port_id,
'rx_port_id': [self.pfc_wd_rx_port_id],
'test_port_type': 'interface'
}
# populate info for the first port
if first_pair:
self.test_ports[self.pfc_wd_rx_port] = {
'test_neighbor_addr': self.pfc_wd_rx_neighbor_addr,
'rx_port': [pfc_wd_test_port],
'rx_neighbor_addr': pfc_wd_test_neighbor_addr,
'peer_device': self.neighbors[self.pfc_wd_rx_port]['peerdevice'],
'peer_device': self.neighbors.get(self.pfc_wd_rx_port, {}).get('peerdevice', ''),
'test_port_id': self.pfc_wd_rx_port_id,
'rx_port_id': [pfc_wd_test_port_id],
'test_port_type': 'interface'
Expand Down Expand Up @@ -173,7 +174,7 @@ def parse_pc_list(self):
self.test_ports[port] = {'test_neighbor_addr': pfc_wd_test_neighbor_addr,
'rx_port': self.pfc_wd_rx_port,
'rx_neighbor_addr': self.pfc_wd_rx_neighbor_addr,
'peer_device': self.neighbors[port]['peerdevice'],
'peer_device': self.neighbors.get(port, {}).get('peerdevice', ''),
'test_port_id': self.port_idx_info[port],
'rx_port_id': self.pfc_wd_rx_port_id,
'test_portchannel_members': pfc_wd_test_port_id,
Expand All @@ -185,7 +186,7 @@ def parse_pc_list(self):
self.test_ports[port] = {'test_neighbor_addr': self.pfc_wd_rx_neighbor_addr,
'rx_port': pfc_wd_test_port,
'rx_neighbor_addr': pfc_wd_test_neighbor_addr,
'peer_device': self.neighbors[port]['peerdevice'],
'peer_device': self.neighbors.get(port, {}).get('peerdevice', ''),
'test_port_id': self.port_idx_info[port],
'rx_port_id': pfc_wd_test_port_id,
'test_portchannel_members': self.pfc_wd_rx_port_id,
Expand Down Expand Up @@ -222,7 +223,7 @@ def parse_vlan_list(self):
temp_ports[item] = {'test_neighbor_addr': self.vlan_nw,
'rx_port': rx_port,
'rx_neighbor_addr': self.pfc_wd_rx_neighbor_addr,
'peer_device': self.neighbors[item]['peerdevice'],
'peer_device': self.neighbors.get(item, {}).get('peerdevice', ''),
'test_port_id': self.port_idx_info[item],
'rx_port_id': rx_port_id,
'test_port_type': 'vlan'
Expand Down Expand Up @@ -267,23 +268,24 @@ def parse_vlan_sub_interface_list(self):
if item['peer_addr'] == pfc_wd_test_port_addr:
pfc_wd_test_neighbor_addr = item['addr']

self.test_ports[pfc_wd_test_port] = {'test_neighbor_addr': pfc_wd_test_neighbor_addr,
'rx_port': [self.pfc_wd_rx_port],
'rx_neighbor_addr': self.pfc_wd_rx_neighbor_addr,
'peer_device': self.neighbors[pfc_wd_test_port]['peerdevice'],
'test_port_id': pfc_wd_test_port_id,
'rx_port_id': [self.pfc_wd_rx_port_id],
'rx_port_vlan_id': self.pfc_wd_rx_port_vlan_id,
'test_port_vlan_id': vlan_id,
'test_port_type': 'interface'
}
self.test_ports[pfc_wd_test_port] = {
'test_neighbor_addr': pfc_wd_test_neighbor_addr,
'rx_port': [self.pfc_wd_rx_port],
'rx_neighbor_addr': self.pfc_wd_rx_neighbor_addr,
'peer_device': self.neighbors.get(pfc_wd_test_port, {}).get('peerdevice', ''),
'test_port_id': pfc_wd_test_port_id,
'rx_port_id': [self.pfc_wd_rx_port_id],
'rx_port_vlan_id': self.pfc_wd_rx_port_vlan_id,
'test_port_vlan_id': vlan_id,
'test_port_type': 'interface'
}
# populate info for the first port
if first_pair:
self.test_ports[self.pfc_wd_rx_port] = {
'test_neighbor_addr': self.pfc_wd_rx_neighbor_addr,
'rx_port': [pfc_wd_test_port],
'rx_neighbor_addr': pfc_wd_test_neighbor_addr,
'peer_device': self.neighbors[self.pfc_wd_rx_port]['peerdevice'],
'peer_device': self.neighbors.get(self.pfc_wd_rx_port, {}).get('peerdevice', ''),
'test_port_id': self.pfc_wd_rx_port_id,
'rx_port_id': [pfc_wd_test_port_id],
'rx_port_vlan_id': vlan_id,
Expand Down