From 46a55b391f35c7385feba8dfa5c17d3577c11a1f Mon Sep 17 00:00:00 2001 From: bingwang Date: Thu, 2 Mar 2023 22:27:34 +0000 Subject: [PATCH] Fix key Error in tunnel qos test --- tests/qos/test_tunnel_qos_remap.py | 2 ++ tests/qos/tunnel_qos_remap_base.py | 2 ++ tests/saitests/py3/sai_base_test.py | 2 +- 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/tests/qos/test_tunnel_qos_remap.py b/tests/qos/test_tunnel_qos_remap.py index 2a3cd65b414..79f48f1dc29 100644 --- a/tests/qos/test_tunnel_qos_remap.py +++ b/tests/qos/test_tunnel_qos_remap.py @@ -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 }) @@ -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 diff --git a/tests/qos/tunnel_qos_remap_base.py b/tests/qos/tunnel_qos_remap_base.py index 2051a3faebb..17e40120622 100644 --- a/tests/qos/tunnel_qos_remap_base.py +++ b/tests/qos/tunnel_qos_remap_base.py @@ -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] @@ -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, diff --git a/tests/saitests/py3/sai_base_test.py b/tests/saitests/py3/sai_base_test.py index adf0933a5bd..cdbd0c070a3 100644 --- a/tests/saitests/py3/sai_base_test.py +++ b/tests/saitests/py3/sai_base_test.py @@ -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(",")