diff --git a/tests/qos/files/qos_params.gb.yaml b/tests/qos/files/qos_params.gb.yaml
index fdd5add13e..9f5f86e0ed 100644
--- a/tests/qos/files/qos_params.gb.yaml
+++ b/tests/qos/files/qos_params.gb.yaml
@@ -19,6 +19,15 @@ qos_params:
                 pkts_num_margin: 4
                 packet_size: 1350
                 cell_size: 384
+            wm_buf_pool_lossy:
+                dscp: 8
+                ecn: 1
+                pg: 0
+                queue: 0
+                pkts_num_trig_egr_drp: 4000
+                pkts_num_fill_egr_min: 0
+                cell_size: 384
+                packet_size: 1350
             shared_res_size_1:
                 ecn: 1
                 packet_size: 1350
@@ -29,6 +38,30 @@ qos_params:
                 packet_size: 1350
                 cell_size: 384
                 pkts_num_margin: 1
+            wrr:
+                ecn: 1
+                q0_num_of_pkts: 70
+                q1_num_of_pkts: 70
+                q2_num_of_pkts: 70
+                q3_num_of_pkts: 75
+                q4_num_of_pkts: 75
+                q5_num_of_pkts: 70
+                q6_num_of_pkts: 70
+                limit: 80
+            wrr_chg:
+                ecn: 1
+                q0_num_of_pkts: 40
+                q1_num_of_pkts: 40
+                q2_num_of_pkts: 40
+                q3_num_of_pkts: 150
+                q4_num_of_pkts: 150
+                q5_num_of_pkts: 40
+                q6_num_of_pkts: 40
+                limit: 80
+                lossy_weight: 8
+                lossless_weight: 30
+            hdrm_pool_wm_multiplier: 1
+            cell_size: 384
             100000_300m:
                 pkts_num_leak_out: 0
                 pg_drop:
@@ -157,15 +190,6 @@ qos_params:
                     pkts_num_trig_pfc: 3703
                     cell_size: 384
                     packet_size: 1350
-            wm_buf_pool_lossy:
-                dscp: 8
-                ecn: 1
-                pg: 0
-                queue: 0
-                pkts_num_trig_egr_drp: 4000
-                pkts_num_fill_egr_min: 0
-                cell_size: 384
-                packet_size: 1350
             100000_40m:
                 pkts_num_leak_out: 0
                 pg_drop:
@@ -422,28 +446,6 @@ qos_params:
                     pkts_num_trig_pfc: 3703
                     cell_size: 384
                     packet_size: 1350
-                wrr:
-                    ecn: 1
-                    q0_num_of_pkts: 70
-                    q1_num_of_pkts: 70
-                    q2_num_of_pkts: 70
-                    q3_num_of_pkts: 75
-                    q4_num_of_pkts: 75
-                    q5_num_of_pkts: 70
-                    q6_num_of_pkts: 70
-                    limit: 40
-                wrr_chg:
-                    ecn: 1
-                    q0_num_of_pkts: 40
-                    q1_num_of_pkts: 40
-                    q2_num_of_pkts: 40
-                    q3_num_of_pkts: 150
-                    q4_num_of_pkts: 150
-                    q5_num_of_pkts: 40
-                    q6_num_of_pkts: 40
-                    limit: 40
-                    lossy_weight: 8
-                    lossless_weight: 30
             400000_40m:
                 pkts_num_leak_out: 0
                 pg_drop:
@@ -586,28 +588,6 @@ qos_params:
                     pkts_num_margin: 4
                     packet_size: 1350
                     cell_size: 384
-                wrr:
-                    ecn: 1
-                    q0_num_of_pkts: 70
-                    q1_num_of_pkts: 70
-                    q2_num_of_pkts: 70
-                    q3_num_of_pkts: 75
-                    q4_num_of_pkts: 75
-                    q5_num_of_pkts: 70
-                    q6_num_of_pkts: 70
-                    limit: 40
-                wrr_chg:
-                    ecn: 1
-                    q0_num_of_pkts: 40
-                    q1_num_of_pkts: 40
-                    q2_num_of_pkts: 40
-                    q3_num_of_pkts: 150
-                    q4_num_of_pkts: 150
-                    q5_num_of_pkts: 40
-                    q6_num_of_pkts: 40
-                    limit: 40
-                    lossy_weight: 8
-                    lossless_weight: 30
             400000_300m:
                 pkts_num_leak_out: 0
                 pg_drop:
@@ -914,49 +894,591 @@ qos_params:
                     pkts_num_margin: 4
                     packet_size: 1350
                     cell_size: 384
-                wrr:
+            100000_120000m:
+                pkts_num_leak_out: 0
+                pg_drop:
+                    dscp: 3
                     ecn: 1
-                    q0_num_of_pkts: 70
-                    q1_num_of_pkts: 70
-                    q2_num_of_pkts: 70
-                    q3_num_of_pkts: 75
-                    q4_num_of_pkts: 75
-                    q5_num_of_pkts: 70
-                    q6_num_of_pkts: 70
-                    limit: 40
-                wrr_chg:
+                    pg: 3
+                    queue: 3
+                    pkts_num_trig_pfc: 262144
+                    pkts_num_trig_ingr_drp: 524288
+                    pkts_num_margin: 30000
+                    iterations: 30
+                xoff_1:
+                    dscp: 3
                     ecn: 1
-                    q0_num_of_pkts: 40
-                    q1_num_of_pkts: 40
-                    q2_num_of_pkts: 40
-                    q3_num_of_pkts: 150
-                    q4_num_of_pkts: 150
-                    q5_num_of_pkts: 40
-                    q6_num_of_pkts: 40
-                    limit: 40
-                    lossy_weight: 8
-                    lossless_weight: 30
+                    pg: 3
+                    pkts_num_trig_pfc: 3202
+                    pkts_num_trig_ingr_drp: 6404
+                    packet_size: 8156
+                    pkts_num_margin: 20
+                xoff_2:
+                    dscp: 4
+                    ecn: 1
+                    pg: 4
+                    pkts_num_trig_pfc: 3202
+                    pkts_num_trig_ingr_drp: 6404
+                    packet_size: 8156
+                    pkts_num_margin: 20
+                xon_1:
+                    dscp: 3
+                    ecn: 1
+                    pg: 3
+                    pkts_num_trig_pfc: 3201
+                    pkts_num_dismiss_pfc: 2
+                    packet_size: 8156
+                xon_2:
+                    dscp: 4
+                    ecn: 1
+                    pg: 4
+                    pkts_num_trig_pfc: 3201
+                    pkts_num_dismiss_pfc: 2
+                    packet_size: 8156
+                lossy_queue_1:
+                    dscp: 8
+                    ecn: 1
+                    pg: 0
+                    pkts_num_trig_egr_drp: 16000
+                    pkts_num_margin: 4
+                    packet_size: 1350
+                    cell_size: 384
+                lossy_queue_voq_2:
+                    dscp: 8
+                    ecn: 1
+                    pg: 0
+                    flow_config: shared
+                    pkts_num_trig_egr_drp: 16000
+                    pkts_num_margin: 4
+                    packet_size: 64
+                    cell_size: 384
+                wm_pg_shared_lossless:
+                    dscp: 3
+                    ecn: 1
+                    pg: 3
+                    pkts_num_trig_pfc: 6403
+                    pkts_num_fill_min: 0
+                    pkts_num_margin: 4
+                    packet_size: 8156
+                    cell_size: 8192
+                wm_pg_shared_lossy:
+                    dscp: 8
+                    ecn: 1
+                    pg: 0
+                    pkts_num_trig_egr_drp: 728
+                    pkts_num_fill_min: 0
+                    pkts_num_margin: 4
+                    packet_size: 8156
+                    cell_size: 8192
+                wm_q_shared_lossless:
+                    dscp: 3
+                    ecn: 1
+                    queue: 3
+                    pkts_num_fill_min: 0
+                    pkts_num_trig_ingr_drp: 12807
+                    pkts_num_margin: 19456
+                    cell_size: 6144
+                    packet_size: 8156
+                wm_q_shared_lossy:
+                    dscp: 8
+                    ecn: 1
+                    queue: 0
+                    pkts_num_fill_min: 0
+                    pkts_num_trig_egr_drp: 16000
+                    pkts_num_margin: 3072
+                    cell_size: 384
+                wm_buf_pool_lossless:
+                    dscp: 3
+                    ecn: 1
+                    pg: 3
+                    queue: 3
+                    pkts_num_fill_ingr_min: 140
+                    pkts_num_trig_pfc: 6412
+                    cell_size: 8192
+                    packet_size: 8140
+                wm_q_wm_all_ports:
+                    ecn: 1
+                    pkt_count: 3000
+                    pkts_num_margin: 19456
+                    cell_size: 6144
+                    packet_size: 6144
+            400000_120000m:
+                pkts_num_leak_out: 0
+                wm_buf_pool_lossless:
+                    dscp: 3
+                    ecn: 1
+                    pg: 3
+                    queue: 3
+                    pkts_num_fill_ingr_min: 181
+                    pkts_num_trig_pfc: 23044
+                    cell_size: 8192
+                    packet_size: 6144
+                wm_q_shared_lossless:
+                    dscp: 3
+                    ecn: 1
+                    queue: 3
+                    pkts_num_fill_min: 0
+                    pkts_num_trig_ingr_drp: 6404
+                    pkts_num_margin: 19456
+                    cell_size: 6144
+                    packet_size: 6144
+                wm_q_shared_lossy:
+                    dscp: 8
+                    ecn: 1
+                    queue: 0
+                    pkts_num_fill_min: 0
+                    pkts_num_trig_egr_drp: 16000
+                    pkts_num_margin: 3072
+                    cell_size: 384
+                wm_q_wm_all_ports:
+                    ecn: 1
+                    pkt_count: 3000
+                    pkts_num_margin: 19456
+                    cell_size: 6144
+                    packet_size: 6144
+        topo-t2:
+            wm_buf_pool_lossy:
+                dscp: 8
+                ecn: 1
+                pg: 0
+                queue: 0
+                pkts_num_trig_egr_drp: 4000
+                pkts_num_fill_egr_min: 0
+                cell_size: 384
+                packet_size: 1350
+            shared_res_size_1:
+                ecn: 1
+                packet_size: 1350
+                cell_size: 384
+                pkts_num_margin: 1
+            shared_res_size_2:
+                ecn: 1
+                packet_size: 1350
+                cell_size: 384
+                pkts_num_margin: 1
             wrr:
                 ecn: 1
-                q0_num_of_pkts: 140
-                q1_num_of_pkts: 140
-                q2_num_of_pkts: 140
-                q3_num_of_pkts: 150
-                q4_num_of_pkts: 150
-                q5_num_of_pkts: 140
-                q6_num_of_pkts: 140
-                limit: 80
+                q0_num_of_pkts: 70
+                q1_num_of_pkts: 70
+                q2_num_of_pkts: 70
+                q3_num_of_pkts: 75
+                q4_num_of_pkts: 75
+                q5_num_of_pkts: 70
+                q6_num_of_pkts: 70
+                limit: 40
             wrr_chg:
                 ecn: 1
-                q0_num_of_pkts: 80
-                q1_num_of_pkts: 80
-                q2_num_of_pkts: 80
-                q3_num_of_pkts: 300
-                q4_num_of_pkts: 300
-                q5_num_of_pkts: 80
-                q6_num_of_pkts: 80
-                limit: 80
+                q0_num_of_pkts: 40
+                q1_num_of_pkts: 40
+                q2_num_of_pkts: 40
+                q3_num_of_pkts: 150
+                q4_num_of_pkts: 150
+                q5_num_of_pkts: 40
+                q6_num_of_pkts: 40
+                limit: 40
                 lossy_weight: 8
                 lossless_weight: 30
-            hdrm_pool_wm_multiplier: 1
-            cell_size: 384
+            100000_300m:
+                pkts_num_leak_out: 0
+                pkts_num_egr_mem: 6884
+                pg_drop:
+                    dscp: 3
+                    ecn: 1
+                    pg: 3
+                    queue: 3
+                    pkts_num_trig_pfc: 13660
+                    pkts_num_trig_ingr_drp: 14819
+                    pkts_num_margin: 375
+                    iterations: 100
+                    cell_size: 384
+                xoff_1:
+                    dscp: 3
+                    ecn: 1
+                    pg: 3
+                    pkts_num_trig_pfc: 10300
+                    pkts_num_trig_ingr_drp: 10589
+                    packet_size: 1350
+                    pkts_num_margin: 20
+                xoff_2:
+                    dscp: 4
+                    ecn: 1
+                    pg: 4
+                    pkts_num_trig_pfc: 10300
+                    pkts_num_trig_ingr_drp: 10589
+                    packet_size: 1350
+                    pkts_num_margin: 20
+                wm_q_wm_all_ports:
+                    ecn: 1
+                    pkt_count: 3000
+                    pkts_num_margin: 1024
+                    cell_size: 384
+                xon_1:
+                    dscp: 3
+                    ecn: 1
+                    pg: 3
+                    pkts_num_trig_pfc: 3415
+                    pkts_num_dismiss_pfc: 23
+                    packet_size: 1350
+                xon_2:
+                    dscp: 4
+                    ecn: 1
+                    pg: 4
+                    pkts_num_trig_pfc: 3415
+                    pkts_num_dismiss_pfc: 23
+                    packet_size: 1350
+                lossy_queue_1:
+                    dscp: 8
+                    ecn: 1
+                    pg: 0
+                    pkts_num_trig_egr_drp: 16000
+                    pkts_num_margin: 20
+                    packet_size: 1350
+                    cell_size: 384
+                lossless_voq_1:
+                    dscp: 3
+                    ecn: 1
+                    pg: 3
+                    num_of_flows: 'multiple'
+                    pkts_num_trig_pfc: 3415
+                    pkts_num_margin: 4
+                    packet_size: 1350
+                lossless_voq_2:
+                    dscp: 4
+                    ecn: 1
+                    pg: 4
+                    num_of_flows: 'multiple'
+                    pkts_num_trig_pfc: 3415
+                    pkts_num_margin: 4
+                    packet_size: 1350
+                lossless_voq_3:
+                    dscp: 3
+                    ecn: 1
+                    pg: 3
+                    num_of_flows: 'single'
+                    pkts_num_trig_pfc: 3415
+                    pkts_num_margin: 4
+                    packet_size: 1350
+                lossless_voq_4:
+                    dscp: 4
+                    ecn: 1
+                    pg: 4
+                    num_of_flows: 'single'
+                    pkts_num_trig_pfc: 3415
+                    pkts_num_margin: 4
+                    packet_size: 1350
+                wm_q_shared_lossless:
+                    dscp: 3
+                    ecn: 1
+                    queue: 3
+                    pkts_num_fill_min: 0
+                    pkts_num_trig_ingr_drp: 13660
+                    pkts_num_margin: 3072
+                    cell_size: 384
+                wm_q_shared_lossy:
+                    dscp: 8
+                    ecn: 1
+                    queue: 0
+                    pkts_num_fill_min: 0
+                    pkts_num_trig_egr_drp: 16000
+                    pkts_num_margin: 3072
+                    cell_size: 384
+                wm_pg_shared_lossless:
+                    dscp: 3
+                    ecn: 1
+                    pg: 3
+                    pkts_num_trig_pfc: 14804
+                    pkts_num_fill_min: 0
+                    pkts_num_margin: 4
+                    packet_size: 1350
+                    cell_size: 384
+                wm_buf_pool_lossless:
+                    dscp: 3
+                    ecn: 1
+                    pg: 3
+                    queue: 3
+                    pkts_num_fill_ingr_min: 0
+                    pkts_num_trig_pfc: 3415
+                    cell_size: 384
+                    packet_size: 1350
+            400000_300m:
+                pkts_num_leak_out: 0
+                pkts_num_egr_mem: 6884
+                pg_drop:
+                    dscp: 3
+                    ecn: 1
+                    pg: 3
+                    queue: 3
+                    pkts_num_trig_pfc: 12152
+                    pkts_num_trig_ingr_drp: 14816
+                    pkts_num_margin: 375
+                    iterations: 100
+                    cell_size: 384
+                xoff_1:
+                    dscp: 3
+                    ecn: 1
+                    pg: 3
+                    pkts_num_trig_pfc: 9923
+                    pkts_num_trig_ingr_drp: 10589
+                    packet_size: 1350
+                    pkts_num_margin: 20
+                xoff_2:
+                    dscp: 4
+                    ecn: 1
+                    pg: 4
+                    pkts_num_trig_pfc: 9923
+                    pkts_num_trig_ingr_drp: 10589
+                    packet_size: 1350
+                    pkts_num_margin: 20
+                wm_q_wm_all_ports:
+                    ecn: 1
+                    pkt_count: 3000
+                    pkts_num_margin: 1024
+                    cell_size: 384
+                    packet_size: 1350
+                xon_1:
+                    dscp: 3
+                    ecn: 1
+                    pg: 3
+                    pkts_num_trig_pfc: 3038
+                    pkts_num_dismiss_pfc: 23
+                    packet_size: 1350
+                xon_2:
+                    dscp: 4
+                    ecn: 1
+                    pg: 4
+                    pkts_num_trig_pfc: 3038
+                    pkts_num_dismiss_pfc: 23
+                    packet_size: 1350
+                lossless_voq_1:
+                    dscp: 3
+                    ecn: 1
+                    pg: 3
+                    num_of_flows: 'multiple'
+                    pkts_num_trig_pfc: 3038
+                    pkts_num_margin: 4
+                    packet_size: 1350
+                lossless_voq_2:
+                    dscp: 4
+                    ecn: 1
+                    pg: 4
+                    num_of_flows: 'multiple'
+                    pkts_num_trig_pfc: 3038
+                    pkts_num_margin: 4
+                    packet_size: 1350
+                lossless_voq_3:
+                    dscp: 3
+                    ecn: 1
+                    pg: 3
+                    num_of_flows: 'single'
+                    pkts_num_trig_pfc: 3038
+                    pkts_num_margin: 4
+                    packet_size: 1350
+                lossless_voq_4:
+                    dscp: 4
+                    ecn: 1
+                    pg: 4
+                    num_of_flows: 'single'
+                    pkts_num_trig_pfc: 3038
+                    pkts_num_margin: 4
+                    packet_size: 1350
+                lossy_queue_1:
+                    dscp: 8
+                    ecn: 1
+                    pg: 0
+                    pkts_num_trig_egr_drp: 16000
+                    pkts_num_margin: 4
+                    packet_size: 1350
+                    cell_size: 384
+                wm_q_shared_lossless:
+                    dscp: 3
+                    ecn: 1
+                    queue: 3
+                    pkts_num_fill_min: 0
+                    pkts_num_trig_ingr_drp: 13660
+                    pkts_num_margin: 3072
+                    cell_size: 384
+                wm_q_shared_lossy:
+                    dscp: 8
+                    ecn: 1
+                    queue: 0
+                    pkts_num_fill_min: 0
+                    pkts_num_trig_egr_drp: 16000
+                    pkts_num_margin: 3072
+                    cell_size: 384
+                wm_pg_shared_lossless:
+                    dscp: 3
+                    ecn: 1
+                    pg: 3
+                    pkts_num_trig_pfc: 14804
+                    pkts_num_fill_min: 0
+                    pkts_num_margin: 4
+                    packet_size: 1350
+                    cell_size: 384
+                wm_buf_pool_lossless:
+                    dscp: 3
+                    ecn: 1
+                    pg: 3
+                    queue: 3
+                    pkts_num_fill_ingr_min: 0
+                    pkts_num_trig_pfc: 3038
+                    cell_size: 384
+                    packet_size: 1350
+            100000_120000m:
+                pkts_num_leak_out: 0
+                pkts_num_egr_mem: 1276
+                pg_drop:
+                    dscp: 3
+                    ecn: 1
+                    pg: 3
+                    queue: 3
+                    pkts_num_trig_pfc: 262144
+                    pkts_num_trig_ingr_drp: 524288
+                    pkts_num_margin: 13267
+                    iterations: 100
+                xoff_1:
+                    dscp: 3
+                    ecn: 1
+                    pg: 3
+                    pkts_num_trig_pfc: 4481
+                    pkts_num_trig_ingr_drp: 7689
+                    packet_size: 8140
+                    pkts_num_margin: 20
+                xoff_2:
+                    dscp: 4
+                    ecn: 1
+                    pg: 4
+                    pkts_num_trig_pfc: 4481
+                    pkts_num_trig_ingr_drp: 7689
+                    packet_size: 8140
+                    pkts_num_margin: 20
+                xon_1:
+                    dscp: 3
+                    ecn: 1
+                    pg: 3
+                    pkts_num_trig_pfc: 3202
+                    pkts_num_dismiss_pfc: 4
+                    packet_size: 8156
+                xon_2:
+                    dscp: 4
+                    ecn: 1
+                    pg: 4
+                    pkts_num_trig_pfc: 3202
+                    pkts_num_dismiss_pfc: 4
+                    packet_size: 8156
+                lossy_queue_1:
+                    dscp: 8
+                    ecn: 1
+                    pg: 0
+                    pkts_num_trig_egr_drp: 16000
+                    pkts_num_margin: 4
+                    packet_size: 1350
+                    cell_size: 384
+                lossy_queue_voq_2:
+                    dscp: 8
+                    ecn: 1
+                    pg: 0
+                    flow_config: shared
+                    pkts_num_trig_egr_drp: 16000
+                    pkts_num_margin: 4
+                    packet_size: 64
+                    cell_size: 384
+                wm_buf_pool_lossless:
+                    dscp: 3
+                    ecn: 1
+                    pg: 3
+                    queue: 3
+                    pkts_num_fill_ingr_min: 181
+                    pkts_num_trig_pfc: 642
+                    cell_size: 8192
+                    packet_size: 6144
+                wm_pg_shared_lossless:
+                    dscp: 3
+                    ecn: 1
+                    pg: 3
+                    pkts_num_trig_pfc: 6403
+                    pkts_num_fill_min: 0
+                    pkts_num_margin: 4
+                    packet_size: 8156
+                    cell_size: 8192
+                wm_q_shared_lossless:
+                    dscp: 3
+                    ecn: 1
+                    queue: 3
+                    pkts_num_fill_min: 0
+                    pkts_num_trig_ingr_drp: 855
+                    pkts_num_margin: 1024
+                    cell_size: 6144
+                    packet_size: 6144
+                wm_q_shared_lossy:
+                    dscp: 8
+                    ecn: 1
+                    queue: 0
+                    pkts_num_fill_min: 0
+                    pkts_num_trig_egr_drp: 16000
+                    pkts_num_margin: 3072
+                    cell_size: 384
+                wm_q_wm_all_ports:
+                    ecn: 1
+                    pkt_count: 855
+                    pkts_num_margin: 1024
+                    cell_size: 6144
+                    packet_size: 6144
+            400000_120000m:
+                pkts_num_leak_out: 0
+                pkts_num_egr_mem: 1276
+                xoff_1:
+                    dscp: 3
+                    ecn: 1
+                    pg: 3
+                    pkts_num_trig_pfc: 12798
+                    pkts_num_trig_ingr_drp: 24320
+                    packet_size: 8156
+                    pkts_num_margin: 20
+                xoff_2:
+                    dscp: 4
+                    ecn: 1
+                    pg: 4
+                    pkts_num_trig_pfc: 12798
+                    pkts_num_trig_ingr_drp: 24320
+                    packet_size: 8156
+                    pkts_num_margin: 20
+                lossy_queue_1:
+                    dscp: 8
+                    ecn: 1
+                    pg: 0
+                    pkts_num_trig_egr_drp: 16000
+                    pkts_num_margin: 4
+                    packet_size: 1350
+                    cell_size: 384
+                wm_buf_pool_lossless:
+                    dscp: 3
+                    ecn: 1
+                    pg: 3
+                    queue: 3
+                    pkts_num_fill_ingr_min: 181
+                    pkts_num_trig_pfc: 642
+                    cell_size: 8192
+                    packet_size: 6144
+                wm_q_shared_lossless:
+                    dscp: 3
+                    ecn: 1
+                    queue: 3
+                    pkts_num_fill_min: 0
+                    pkts_num_trig_ingr_drp: 855
+                    pkts_num_margin: 1024
+                    cell_size: 6144
+                    packet_size: 6144
+                wm_q_shared_lossy:
+                    dscp: 8
+                    ecn: 1
+                    queue: 0
+                    pkts_num_fill_min: 0
+                    pkts_num_trig_egr_drp: 16000
+                    pkts_num_margin: 3072
+                    cell_size: 384
+                wm_q_wm_all_ports:
+                    ecn: 1
+                    pkt_count: 855
+                    pkts_num_margin: 1024
+                    cell_size: 6144
+                    packet_size: 6144