diff --git a/tests/qos/test_qos_sai.py b/tests/qos/test_qos_sai.py index 1247aa67635..ede51c1247e 100644 --- a/tests/qos/test_qos_sai.py +++ b/tests/qos/test_qos_sai.py @@ -833,16 +833,23 @@ def testQosSaiHeadroomPoolWatermark( dst_dut_index = get_src_dst_asic_and_duts['dst_dut_index'] src_asic_index = get_src_dst_asic_and_duts['src_asic_index'] dst_asic_index = get_src_dst_asic_and_duts['dst_asic_index'] - src_ports = dutConfig['testPortIds'][src_dut_index][src_asic_index] - if get_src_dst_asic_and_duts['src_asic'] == get_src_dst_asic_and_duts['dst_asic']: - # Src and dst are the same asics, leave one for dst port and the rest for src ports - qosConfig["hdrm_pool_size"]["src_port_ids"] = src_ports[:-1] - qosConfig["hdrm_pool_size"]["dst_port_id"] = src_ports[-1] - qosConfig["hdrm_pool_size"]["pgs_num"] = 2 * len(qosConfig["hdrm_pool_size"]["src_port_ids"]) - else: - qosConfig["hdrm_pool_size"]["src_port_ids"] = src_ports - qosConfig["hdrm_pool_size"]["dst_port_id"] = dutConfig['testPortIds'][dst_dut_index][dst_asic_index][-1] - qosConfig["hdrm_pool_size"]["pgs_num"] = 2 * len(qosConfig["hdrm_pool_size"]["src_port_ids"]) + + if ('platform_asic' in dutTestParams["basicParams"] and + dutTestParams["basicParams"]["platform_asic"] == "broadcom-dnx"): + # Need to adjust hdrm_pool_size src_port_ids, dst_port_id and pgs_num based on how many source and dst ports + # present + src_ports = dutConfig['testPortIds'][src_dut_index][src_asic_index] + if get_src_dst_asic_and_duts['src_asic'] == get_src_dst_asic_and_duts['dst_asic']: + # Src and dst are the same asics, leave one for dst port and the rest for src ports + qosConfig["hdrm_pool_size"]["src_port_ids"] = src_ports[:-1] + qosConfig["hdrm_pool_size"]["dst_port_id"] = src_ports[-1] + qosConfig["hdrm_pool_size"]["pgs_num"] = 2 * len(qosConfig["hdrm_pool_size"]["src_port_ids"]) + else: + qosConfig["hdrm_pool_size"]["src_port_ids"] = src_ports + qosConfig["hdrm_pool_size"]["dst_port_id"] = dutConfig['testPortIds'][dst_dut_index][dst_asic_index][-1] + qosConfig["hdrm_pool_size"]["pgs_num"] = 2 * len(qosConfig["hdrm_pool_size"]["src_port_ids"]) + + self.updateTestPortIdIp(dutConfig, get_src_dst_asic_and_duts, qosConfig["hdrm_pool_size"]) testParams = dict() testParams.update(dutTestParams["basicParams"])