[dts] [PATCH V1 2/5] tests/ice_switch_filter: optimize the rte_flow test process

[Jiale Song <songx.jiale@intel.com>]

1. synchronize test plans, lower log level.
2. optimization scripts, remove the method of reload ice.
3. optimize the rte_flow test process that the action is switch to queue.

Signed-off-by: Jiale Song <songx.jiale@intel.com>
---
 tests/TestSuite_ice_switch_filter.py | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/tests/TestSuite_ice_switch_filter.py b/tests/TestSuite_ice_switch_filter.py
index 76bd630f..f5f8ec1f 100644
--- a/tests/TestSuite_ice_switch_filter.py
+++ b/tests/TestSuite_ice_switch_filter.py
@@ -4279,16 +4279,14 @@ class ICESwitchFilterTest(TestCase):
 
         self.generate_file_with_fdir_rules()
         self.path = self.dut.apps_name["test-pmd"]
-
-    def reload_ice(self):
-        self.dut.send_expect("rmmod ice", "# ", 15)
-        self.dut.send_expect("modprobe ice", "# ", 15)
+        self.rxq = 16
+        self.rxq_param = "--rxq={0} --txq={0}".format(self.rxq)
 
     def set_up(self):
         """
         Run before each test case.
         """
-        self.reload_ice()
+        pass
 
     def generate_file_with_fdir_rules(self):
         """
@@ -4327,9 +4325,8 @@ class ICESwitchFilterTest(TestCase):
         # Prepare testpmd EAL and parameters
         all_eal_param = self.dut.create_eal_parameters(cores="1S/4C/1T", ports=[0])
         command = (
-            self.path + all_eal_param + ' --log-level="ice,8" -- -i --rxq=16 --txq=16 '
+            self.path + all_eal_param + ' --log-level="ice,7" -- -i %s' % self.rxq_param
         )
-        # command = "./%s/app/testpmd %s --log-level=\"ice,8\" -- -i %s" % (self.dut.target, all_eal_param, "--rxq=16 --txq=16")
         return command
 
     def create_testpmd_command_pipeline_mode(self):
@@ -4341,7 +4338,7 @@ class ICESwitchFilterTest(TestCase):
             cores="1S/4C/1T", ports=[0], port_options={0: "pipeline-mode-support=1"}
         )
         command = (
-            self.path + all_eal_param + ' --log-level="ice,8" -- -i --rxq=16 --txq=16'
+            self.path + all_eal_param + ' --log-level="ice,7" -- -i %s' % self.rxq_param
         )
         return command
 
@@ -4370,13 +4367,15 @@ class ICESwitchFilterTest(TestCase):
         """
         # Specify the port to use
         dic["check_func"]["param"]["expect_port"] = port
+        dic["check_func"]["param"]["rxq"] = self.rxq
+        self.pmd.wait_link_status_up(port)
         self.dut.send_expect("start", "testpmd> ", 15)
-        time.sleep(2)
         # send packets
         self.pkt.update_pkt(dic["scapy_str"])
         self.pkt.send_pkt(self.tester, tx_port=self.__tx_iface, count=1, timeout=370)
-        time.sleep(3)
-        out = self.dut.send_expect("stop", "testpmd> ", 15)
+        out1 = self.pmd.get_output(timeout=1)
+        out2 = self.pmd.execute_cmd("stop")
+        out = out1 + out2
         result_flag, log_msg = dic["check_func"]["func"](
             out, dic["check_func"]["param"], dic["expect_results"]
         )
@@ -4701,6 +4700,9 @@ class ICESwitchFilterTest(TestCase):
         count = 1
         for tv in test_vectors:
             pattern_name = tv["name"]
+            self.logger.info(
+                GREEN("{0} case_name:{1} {0}".format("*" * 20, pattern_name))
+            )
             test_results[pattern_name] = OrderedDict()
             # get the queues that packets originally came to
             if count == 1:
-- 
2.25.1