[dts] [PATCH V2 1/2] tests/cvl_switch_filter: delete the placeholder fdir rule

[dts] [PATCH V2 1/2] tests/cvl_switch_filter: delete the placeholder fdir rule

[Jiale Song]

in non-pipeline mode, "priority" is ignored, a flow rule can be created as a flow director rule or
a switch rule depends on its pattern/action. if a rule is supported by switch or fdir at the same time,
it will be created in the switch table first. we no longer need to populate the fdir table first

dpdk commit: e4a0a7599d974f05665fec3e4c251659f0b11453

Signed-off-by: Jiale Song <songx.jiale@intel.com>
---
 test_plans/cvl_switch_filter_test_plan.rst | 2 +-
 tests/TestSuite_cvl_switch_filter.py       | 5 +----
 2 files changed, 2 insertions(+), 5 deletions(-)
 mode change 100644 => 100755 tests/TestSuite_cvl_switch_filter.py

diff --git a/test_plans/cvl_switch_filter_test_plan.rst b/test_plans/cvl_switch_filter_test_plan.rst
index ae29e64e..9a53e9cb 100644
--- a/test_plans/cvl_switch_filter_test_plan.rst
+++ b/test_plans/cvl_switch_filter_test_plan.rst
@@ -181,7 +181,7 @@ Prerequisites
 
 6. Launch dpdk with the following arguments in non-pipeline mode::
 
-     ./x86_64-native-linuxapp-gcc/app/testpmd -c 0xf -n 4 -a 0000:18:00.0 --log-level="ice,8" -- -i --txq=16 --rxq=16 --cmdline-file=testpmd_fdir_rules
+     ./x86_64-native-linuxapp-gcc/app/testpmd -c 0xf -n 4 -a 0000:18:00.0 --log-level="ice,8" -- -i --txq=16 --rxq=16
      testpmd> port config 0 rss-hash-key ipv4 1234abcd1234abcd1234abcd1234abcd1234abcd1234abcd1234abcd1234abcd1234abcd1234abcd1234abcd1234abcd1234abcd
      testpmd> set fwd rxonly
      testpmd> set verbose 1
diff --git a/tests/TestSuite_cvl_switch_filter.py b/tests/TestSuite_cvl_switch_filter.py
old mode 100644
new mode 100755
index 4837f16c..59d95849
--- a/tests/TestSuite_cvl_switch_filter.py
+++ b/tests/TestSuite_cvl_switch_filter.py
@@ -3001,7 +3001,7 @@ class CVLSwitchFilterTest(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 --cmdline-file=%s" % self.fdir_file
+        command = self.path + all_eal_param + " --log-level=\"ice,8\" -- -i --rxq=16 --txq=16 "
         # command = "./%s/app/testpmd %s --log-level=\"ice,8\" -- -i %s" % (self.dut.target, all_eal_param, "--rxq=16 --txq=16")
         return command
 
@@ -3178,9 +3178,6 @@ class CVLSwitchFilterTest(TestCase):
             out_lines = out.splitlines()
             res = filter(bool, map(p_spec.match, out_lines))
             result = [i.group(1) for i in res]
-            if is_non_pipeline:
-                #remove 15360 fdir rules id
-                del result[:self.fdir_rule_number]
             if is_need_rss_rule:
                 #remove rss rule id
                 del result[0]
-- 
2.17.1

[dts] [PATCH V2 2/2] tests/cvl_switch_filter_pppoe: delete the placeholder fdir rule

[Jiale Song]

Signed-off-by: Jiale Song <songx.jiale@intel.com>
---
 test_plans/cvl_switch_filter_pppoe_test_plan.rst | 2 +-
 tests/TestSuite_cvl_switch_filter_pppoe.py       | 5 +----
 2 files changed, 2 insertions(+), 5 deletions(-)
 mode change 100644 => 100755 tests/TestSuite_cvl_switch_filter_pppoe.py

diff --git a/test_plans/cvl_switch_filter_pppoe_test_plan.rst b/test_plans/cvl_switch_filter_pppoe_test_plan.rst
index 897e8c6c..ceef7760 100644
--- a/test_plans/cvl_switch_filter_pppoe_test_plan.rst
+++ b/test_plans/cvl_switch_filter_pppoe_test_plan.rst
@@ -203,7 +203,7 @@ Prerequisites
 
 6. Launch dpdk with the following arguments in non-pipeline mode::
 
-     ./x86_64-native-linuxapp-gcc/app/testpmd -c 0xf -n 4 -a 0000:18:00.0 --log-level="ice,8" -- -i --txq=16 --rxq=16 --cmdline-file=testpmd_fdir_rules
+     ./x86_64-native-linuxapp-gcc/app/testpmd -c 0xf -n 4 -a 0000:18:00.0 --log-level="ice,8" -- -i --txq=16 --rxq=16
      testpmd> port config 0 rss-hash-key ipv4 1234abcd1234abcd1234abcd1234abcd1234abcd1234abcd1234abcd1234abcd1234abcd1234abcd1234abcd1234abcd1234abcd
      testpmd> set fwd rxonly
      testpmd> set verbose 1
diff --git a/tests/TestSuite_cvl_switch_filter_pppoe.py b/tests/TestSuite_cvl_switch_filter_pppoe.py
old mode 100644
new mode 100755
index a8058f94..c14ea0e3
--- a/tests/TestSuite_cvl_switch_filter_pppoe.py
+++ b/tests/TestSuite_cvl_switch_filter_pppoe.py
@@ -2296,7 +2296,7 @@ class CVLSwitchFilterPPPOETest(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 --cmdline-file=%s" % self.fdir_file
+        command = self.path + all_eal_param + " --log-level=\"ice,8\" -- -i --rxq=16 --txq=16 "
         # command = "./%s/app/testpmd %s --log-level=\"ice,8\" -- -i %s" % (self.dut.target, all_eal_param, "--rxq=16 --txq=16")
         return command
 
@@ -2473,9 +2473,6 @@ class CVLSwitchFilterPPPOETest(TestCase):
             out_lines = out.splitlines()
             res = filter(bool, map(p_spec.match, out_lines))
             result = [i.group(1) for i in res]
-            if is_non_pipeline:
-                #remove 15360 fdir rules id
-                del result[:self.fdir_rule_number]
             if is_need_rss_rule:
                 #remove rss rule id
                 del result[0]
-- 
2.17.1

Re: [dts] [PATCH V2 2/2] tests/cvl_switch_filter_pppoe: delete the placeholder fdir rule

[Tu, Lijuan]

> -----Original Message-----
> From: dts <dts-bounces@dpdk.org> On Behalf Of Jiale Song
> Sent: 2021年10月26日 15:32
> To: dts@dpdk.org
> Cc: Jiale, SongX <songx.jiale@intel.com>
> Subject: [dts] [PATCH V2 2/2] tests/cvl_switch_filter_pppoe: delete the
> placeholder fdir rule
> 
> Signed-off-by: Jiale Song <songx.jiale@intel.com>

Applied