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

[dts] [PATCH V1 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

Signed-off-by: Jiale Song <songx.jiale@intel.com>
---
 test_plans/cvl_switch_filter_test_plan.rst | 8 ++------
 tests/TestSuite_cvl_switch_filter.py       | 5 +----
 2 files changed, 3 insertions(+), 10 deletions(-)
 mode change 100644 => 100755 test_plans/cvl_switch_filter_test_plan.rst
 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
old mode 100644
new mode 100755
index b8f7e14..0f04371
--- a/test_plans/cvl_switch_filter_test_plan.rst
+++ b/test_plans/cvl_switch_filter_test_plan.rst
@@ -51,11 +51,7 @@ for device's flow director engine.
 
 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 fdir table first. Therefore, to test switch filter in non-pipeline mode, we need to
-fill the fdir table first, and then the rules are created in the switch filter table. The capacity of fdir
-table is 16K, of which 14K is shared by all pfs and vfs, and the remaining 2K is gurantee for pfs. If 4*25G
-NIC, the gurantee for each pf is 512. If 2*100G NIC, the gurantee of each pf is 1024. so 1 pf can create at
-most 14848 rules on 4 ports card and 15360 rules on 2 ports card.
+will be created in the switch table first.
 
 Pattern and input set
 ---------------------
@@ -181,7 +177,7 @@ Prerequisites
 
 6. Launch dpdk with the following arguments in non-pipeline mode::
 
-     ./x86_64-native-linuxapp-gcc/app/testpmd -c 0xf -n 4 -w 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 -w 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 5ec8b18..36420d1
--- a/tests/TestSuite_cvl_switch_filter.py
+++ b/tests/TestSuite_cvl_switch_filter.py
@@ -2607,7 +2607,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
 
@@ -2784,9 +2784,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 V1 2/2] tests/cvl_switch_filter_pppoe: 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

Signed-off-by: Jiale Song <songx.jiale@intel.com>
---
 test_plans/cvl_switch_filter_pppoe_test_plan.rst | 7 ++-----
 tests/TestSuite_cvl_switch_filter_pppoe.py       | 5 +----
 2 files changed, 3 insertions(+), 9 deletions(-)
 mode change 100644 => 100755 test_plans/cvl_switch_filter_pppoe_test_plan.rst
 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
old mode 100644
new mode 100755
index f63965b..3a5c287
--- a/test_plans/cvl_switch_filter_pppoe_test_plan.rst
+++ b/test_plans/cvl_switch_filter_pppoe_test_plan.rst
@@ -51,10 +51,7 @@ for device's flow director engine.
 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 fdir table first. Therefore, to test switch filter in non-pipeline mode, we need to
-fill the fdir table first, and then the rules are created in the switch filter table. The capacity of fdir
-table is 16K, of which 14K is shared by all pfs and vfs, and the remaining 2K is gurantee for pfs. If 4*25G
-NIC, the gurantee for each pf is 512. If 2*100G NIC, the gurantee of each pf is 1024. so 1 pf can create at
-most 14848 rules on 4 ports card and 15360 rules on 2 ports card.
+fill the switch table first.
 
 Pattern and input set
 ---------------------
@@ -203,7 +200,7 @@ Prerequisites
 
 6. Launch dpdk with the following arguments in non-pipeline mode::
 
-     ./x86_64-native-linuxapp-gcc/app/testpmd -c 0xf -n 4 -w 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 -w 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 a33bb2f..28cbc99
--- a/tests/TestSuite_cvl_switch_filter_pppoe.py
+++ b/tests/TestSuite_cvl_switch_filter_pppoe.py
@@ -2297,7 +2297,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
 
@@ -2474,9 +2474,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 V1 1/2] tests/cvl_switch_filter: delete the placeholder fdir rule

[Huang, ZhiminX]

> -----Original Message-----
> From: dts <dts-bounces@dpdk.org> On Behalf Of Jiale Song
> Sent: Saturday, October 9, 2021 4:12 PM
> To: dts@dpdk.org
> Cc: Jiale, SongX <songx.jiale@intel.com>
> Subject: [dts] [PATCH V1 1/2] tests/cvl_switch_filter: delete the placeholder
> fdir rule
> 
> 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
> 
> Signed-off-by: Jiale Song <songx.jiale@intel.com>
> ---
Add dpdk code changed commit: e4a0a7599d974f05665fec3e4c251659f0b11453