Skip to content

Fix key Error in tunnel qos test #7628

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
bingwang-ms merged 1 commit into from
Mar 3, 2023
Merged

Fix key Error in tunnel qos test #7628

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 tests/qos/test_tunnel_qos_remap.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -446,6 +446,7 @@ def test_tunnel_decap_dscp_to_pg_mapping(rand_selected_dut, ptfhost, dut_config,
"inner_dscp_to_pg_map": tunnel_qos_map["inner_dscp_to_pg_map"],
"port_map_file": dut_config["port_map_file"],
"sonic_asic_type": dut_config["asic_type"],
"platform_asic": dut_config["platform_asic"],
"cell_size": cell_size
})

Expand Down Expand Up @@ -482,6 +483,7 @@ def test_xoff_for_pcbb(rand_selected_dut, ptfhost, dut_config, qos_config, xoff_
"standby_tor_ip": dut_config["unselected_tor_loopback"],
"server": dut_config["selected_tor_mgmt"],
"port_map_file": dut_config["port_map_file"],
"platform_asic": dut_config["platform_asic"],
"sonic_asic_type": dut_config["asic_type"],
})
# Update qos config into test_params
Expand Down
2 changes: 2 additions & 0 deletions tests/qos/tunnel_qos_remap_base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,7 @@ def dut_config(rand_selected_dut, rand_unselected_dut, tbinfo, ptf_portmap_file_
mg_facts = duthost.get_extended_minigraph_facts(tbinfo)

asic_type = duthost.facts["asic_type"]
platform_asic = duthost.facts['platform_asic']
# Always use the first portchannel member
lag_port_name = list(mg_facts['minigraph_portchannels'].values())[0]['members'][0]
lag_port_ptf_id = mg_facts['minigraph_ptf_indices'][lag_port_name]
Expand All @@ -157,6 +158,7 @@ def dut_config(rand_selected_dut, rand_unselected_dut, tbinfo, ptf_portmap_file_

return {
"asic_type": asic_type,
"platform_asic": platform_asic,
"lag_port_name": lag_port_name,
"lag_port_ptf_id": lag_port_ptf_id,
"server_port_name": server_port_name,
Expand Down
2 changes: 1 addition & 1 deletion tests/saitests/py3/sai_base_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ def setUp(self):
self.server = 'localhost'
self.platform_asic = self.test_params.get('platform_asic', None)

self.asic_id = self.test_params['asic_id']
self.asic_id = self.test_params.get('asic_id', None)
if "port_map" in self.test_params:
user_input = self.test_params['port_map']
splitted_map = user_input.split(",")
Expand Down