update qos sai lossy case for sn5600 and sn5610

1. For spc4, there is only lossy buffer, so the buffer for lossless buffer will be taken by lossy buffer, if the packet size is too small, the packet number sent to occupy the shared buffer will increase a lot, so it will lead that descriptor will be exhausted, so update testQosSaiPgSharedWatermark, testQosSaiQSharedWatermark and testQosSaiLossyQueue accordingly.
2. Remove the test config of scheduler.block_data_plane, otherwise it might rise yang validation error when do config reload
3. list the relevant Prs:
   sonic-net/sonic-buildimage#20992
   sonic-net/sonic-buildimage#21056
   sonic-net/sonic-buildimage#20991

Author: JibinBao

tests/qos/files/mellanox/special_qos_config.yml

@@ -27,12 +27,12 @@ qos_params:
         xon_4:
             packet_size: 800
         lossy_queue_1:
-            packet_size: 800
+            packet_size: 1200
         wm_pg_shared_lossless:
             packet_size: 800
             pkts_num_margin: 7
         wm_pg_shared_lossy:
-            packet_size: 800
-            pkts_num_margin: 5
+            packet_size: 1200
+            pkts_num_margin: 8
         wm_q_shared_lossy:
-            packet_size: 800
+            packet_size: 1200

tests/saitests/py3/sai_base_test.py

@@ -44,6 +44,7 @@
                                   "5": "scheduler.0",
                                   "6": "scheduler.0",
                                   "7": ""}
+BLOCK_DATA_PLANE_SCHEDULER_NAME = 'scheduler.block_data_plane'
 
 
 class ThriftInterface(BaseTest):
@@ -238,16 +239,15 @@ def disable_mellanox_egress_data_plane(self, ptf_port_list):
             dut_port = self.get_dut_port(ptf_port)
             dut_port_list.append(dut_port)
         self.original_dut_port_queue_scheduler_map = self.get_queue_scheduler_name(dut_port_list)
-        block_data_plane_scheduler_name = 'scheduler.block_data_plane'
         cmd_set_block_data_plane_scheduler = \
-            f'sonic-db-cli CONFIG_DB hset "SCHEDULER|{block_data_plane_scheduler_name}" "type" DWRR "weight" 15 "pir" 1'
+            f'sonic-db-cli CONFIG_DB hset "SCHEDULER|{BLOCK_DATA_PLANE_SCHEDULER_NAME}" "type" DWRR "weight" 15 "pir" 1'
 
         self.exec_cmd_on_dut(self.server, self.test_params['dut_username'], self.test_params['dut_password'],
                              cmd_set_block_data_plane_scheduler)
         for dut_port in dut_port_list:
             for q in DATA_PLANE_QUEUE_LIST:
                 cmd_block_q = \
-                    f" sonic-db-cli CONFIG_DB hset 'QUEUE|{dut_port}|{q}' scheduler {block_data_plane_scheduler_name}"
+                    f" sonic-db-cli CONFIG_DB hset 'QUEUE|{dut_port}|{q}' scheduler {BLOCK_DATA_PLANE_SCHEDULER_NAME}"
                 self.exec_cmd_on_dut(
                     self.server, self.test_params['dut_username'], self.test_params['dut_password'], cmd_block_q)
 
@@ -276,6 +276,20 @@ def enable_mellanox_egress_data_plane(self, ptf_port_list):
                 self.exec_cmd_on_dut(
                     self.server, self.test_params['dut_username'],
                     self.test_params['dut_password'], cmd_recover_q_scheduler_config)
+        self.remove_block_data_plan_scheduler()
+
+    def remove_block_data_plan_scheduler(self):
+        get_block_data_plane_scheduler_name = \
+            f"sonic-db-cli CONFIG_DB keys 'SCHEDULER|{BLOCK_DATA_PLANE_SCHEDULER_NAME}'"
+        scheduler_name, _, _ = self.exec_cmd_on_dut(self.server,
+                                                    self.test_params['dut_username'],
+                                                    self.test_params['dut_password'],
+                                                    get_block_data_plane_scheduler_name)
+        if isinstance(scheduler_name, list) and BLOCK_DATA_PLANE_SCHEDULER_NAME in scheduler_name[0]:
+            cmd_del_block_data_plane_scheduler = \
+                f'sonic-db-cli CONFIG_DB del "SCHEDULER|{BLOCK_DATA_PLANE_SCHEDULER_NAME}"'
+            self.exec_cmd_on_dut(self.server, self.test_params['dut_username'], self.test_params['dut_password'],
+                                 cmd_del_block_data_plane_scheduler)
 
 
 class ThriftInterfaceDataPlane(ThriftInterface):

tests/saitests/py3/sai_qos_tests.py

@@ -5193,7 +5193,7 @@ def runTest(self):
                 assert (q_wm_res[queue] <= (margin + 1) * cell_size)
             elif pkts_num_fill_min:
                 assert (q_wm_res[queue] == 0)
-            elif 'cisco-8000' in asic_type or "SN5600" in hwsku or "SN5400" in hwsku:
+            elif 'cisco-8000' in asic_type or "SN5600" in hwsku or "SN5400" in hwsku or "SN5610" in hwsku:
                 assert (q_wm_res[queue] <= (margin + 1) * cell_size)
             else:
                 if platform_asic and platform_asic == "broadcom-dnx":