[V1] add new fvl support cases of dual_vlan/generic_flow_api

From: Zhou jun <junx.w.zhou@intel.com>

add 5 new fvl support cases of dual_vlan/generic_flow_api

Signed-off-by: Zhou jun <junx.w.zhou@intel.com>
---
 conf/test_case_checklist.json       |  9 ---------
 conf/test_case_supportlist.json     |  6 ++++++
 tests/TestSuite_dual_vlan.py        |  2 +-
 tests/TestSuite_generic_flow_api.py | 32 ++++++++++++++++++++++----------
 4 files changed, 29 insertions(+), 20 deletions(-)
  

Tested-by: junx.w.zhou@intel.com

-----Original Message-----
From: Zhou, JunX W 
Sent: Friday, September 4, 2020 4:57 PM
To: dts@dpdk.org
Cc: Zhou, JunX W <junx.w.zhou@intel.com>
Subject: [dts][PATCH V1] add new fvl support cases of dual_vlan/generic_flow_api

From: Zhou jun <junx.w.zhou@intel.com>

add 5 new fvl support cases of dual_vlan/generic_flow_api

Signed-off-by: Zhou jun <junx.w.zhou@intel.com>
---
 conf/test_case_checklist.json       |  9 ---------
 conf/test_case_supportlist.json     |  6 ++++++
 tests/TestSuite_dual_vlan.py        |  2 +-
 tests/TestSuite_generic_flow_api.py | 32 ++++++++++++++++++++++----------
 4 files changed, 29 insertions(+), 20 deletions(-)

diff --git a/conf/test_case_checklist.json b/conf/test_case_checklist.json index c3663f0..74dade7 100644
--- a/conf/test_case_checklist.json
+++ b/conf/test_case_checklist.json
@@ -293,10 +293,7 @@
                 "ALL"
             ],
             "NIC": [
-                "fortville_eagle",
-                "fortville_spirit",
                 "fortville_spirit_single",
-                "fortville_25g",
                 "fortpark_TLV",
                 "fortpark_BASE-T",
                 "cavium_a063",
@@ -553,10 +550,7 @@
                 "ALL"
             ],
             "NIC": [
-                "fortville_eagle",
-                "fortville_spirit",
                 "fortville_spirit_single",
-                "fortville_25g",
                 "fortpark_TLV",
                 "fortpark_BASE-T",
                 "sagepond",
@@ -578,10 +572,7 @@
                 "ALL"
             ],
             "NIC": [
-                "fortville_eagle",
-                "fortville_spirit",
                 "fortville_spirit_single",
-                "fortville_25g",
                 "fortpark_TLV",
                 "fortpark_BASE-T",
                 "sagepond",
diff --git a/conf/test_case_supportlist.json b/conf/test_case_supportlist.json index 85da736..7232135 100644
--- a/conf/test_case_supportlist.json
+++ b/conf/test_case_supportlist.json
@@ -757,6 +757,9 @@
             "NIC": [
                 "bartonhills",
                 "powerville",
+                "fortville_eagle",
+                "fortville_25g",
+                "fortville_spirit",
                 "foxville"
             ],
             "Target": [
@@ -791,6 +794,9 @@
             ],
             "NIC": [
                 "twinville",
+                "fortville_eagle",
+                "fortville_25g",
+                "fortville_spirit",
                 "sagepond",
                 "sageville",
                 "foxville"
diff --git a/tests/TestSuite_dual_vlan.py b/tests/TestSuite_dual_vlan.py index 855769c..933ffb9 100644
--- a/tests/TestSuite_dual_vlan.py
+++ b/tests/TestSuite_dual_vlan.py
@@ -398,7 +398,7 @@ class TestDualVlan(TestCase):
         """
         Configure receive port out vlan TPID
         """
-        self.verify(self.nic not in ["columbiaville_25g", "columbiaville_100g", "fortville_eagle", "fortville_spirit", "fortville_spirit_single", "fortville_25g", "fortpark_TLV","fortpark_BASE-T" ,"hartwell", "carlsville"], "%s NIC not support tcpid " % self.nic)
+        self.verify(self.nic not in ["columbiaville_25g", 
+ "columbiaville_100g", "fortville_spirit_single", 
+ "fortpark_TLV","fortpark_BASE-T" ,"hartwell", "carlsville"], "%s NIC 
+ not support tcpid " % self.nic)
 
         self.mode_config(filter="on", strip="on", extend="on")
         # nic only support inner model, except fortville nic diff --git a/tests/TestSuite_generic_flow_api.py b/tests/TestSuite_generic_flow_api.py
index 7e95d4b..5f0f167 100644
--- a/tests/TestSuite_generic_flow_api.py
+++ b/tests/TestSuite_generic_flow_api.py
@@ -743,7 +743,7 @@ class TestGeneric_flow_api(TestCase):
         """
         only supported by igb
         """
-        self.verify(self.nic in ["bartonhills", "powerville", "foxville"], "%s nic not support 2-tuple filter" % self.nic)
+        self.verify(self.nic in ["bartonhills", "powerville", 
+ "foxville", "fortville_eagle", "fortville_25g", "fortville_spirit"], 
+ "%s nic not support 2-tuple filter" % self.nic)
 
         self.pmdout.start_testpmd("%s" % self.cores, "--disable-rss --rxq=%d --txq=%d" % (MAX_QUEUE+1, MAX_QUEUE+1))
         self.dut.send_expect("set fwd rxonly", "testpmd> ", 120) @@ -753,10 +753,16 @@ class TestGeneric_flow_api(TestCase):
 
         # i350 and 82580 only support 2-tuple, and don't support SCTP
         # create the flow rules
-        basic_flow_actions = [
-            {'create': 'create', 'flows': ['ipv4', 'proto', 'udp', 'dport'], 'actions': ['queue']},
-            {'create': 'create', 'flows': ['ipv4', 'proto', 'tcp', 'dport'], 'actions': ['queue']},
-        ]
+        if self.nic in ["fortville_eagle", "fortville_25g", "fortville_spirit"]:
+            basic_flow_actions = [
+                {'create': 'create', 'flows': ['ipv4', 'udp', 'dport'], 'actions': ['queue']},
+                {'create': 'create', 'flows': ['ipv4', 'tcp', 'dport'], 'actions': ['queue']},
+            ]
+        else:
+            basic_flow_actions = [
+                {'create': 'create', 'flows': ['ipv4', 'proto', 'udp', 'dport'], 'actions': ['queue']},
+                {'create': 'create', 'flows': ['ipv4', 'proto', 'tcp', 'dport'], 'actions': ['queue']},
+            ]
         extrapkt_rulenum = self.all_flows_process(basic_flow_actions)
         extra_packet = extrapkt_rulenum['extrapacket']
         # send the packets inconsistent to the rules.
@@ -1906,7 +1912,7 @@ class TestGeneric_flow_api(TestCase):
         """
         only supported by ixgbe
         """
-        self.verify(self.nic in ["twinville", "sagepond", "sageville", "foxville"], "%s nic not support fdir mac vlan filter" % self.nic)
+        self.verify(self.nic in ["twinville", "sagepond", "sageville", 
+ "foxville", "fortville_eagle", "fortville_25g", "fortville_spirit"], 
+ "%s nic not support fdir mac vlan filter" % self.nic)
 
         self.pmdout.start_testpmd("%s" % self.cores, "--pkt-filter-mode=perfect-mac-vlan --disable-rss --rxq=%d --txq=%d" % (MAX_QUEUE+1, MAX_QUEUE+1))
         self.dut.send_expect("set fwd rxonly", "testpmd> ", 120) @@ -1917,10 +1923,16 @@ class TestGeneric_flow_api(TestCase):
         time.sleep(2)
 
         # create the flow rules
-        basic_flow_actions = [
-            {'create': 'create', 'flows': ['dst_mac', 'vlan'], 'actions': ['queue']},
-            {'create': 'create', 'flows': ['dst_mac', 'vlan'], 'actions': ['queue']},
-        ]
+        if self.nic in ["fortville_eagle", "fortville_25g", "fortville_spirit"]:
+            basic_flow_actions = [
+                {'create': 'create', 'flows': ['vlan'], 'actions': ['queue']},
+                {'create': 'create', 'flows': ['vlan'], 'actions': ['queue']}
+            ]
+        else:
+            basic_flow_actions = [
+                {'create': 'create', 'flows': ['dst_mac', 'vlan'], 'actions': ['queue']},
+                {'create': 'create', 'flows': ['dst_mac', 'vlan'], 'actions': ['queue']},
+            ]
         extrapkt_rulenum = self.all_flows_process(basic_flow_actions)
         rule_num = extrapkt_rulenum['rulenum']
         self.verify_rulenum(rule_num)
--
1.8.3.1
  

> Subject: [dts] [PATCH V1] add new fvl support cases of
> dual_vlan/generic_flow_api
> 
> From: Zhou jun <junx.w.zhou@intel.com>
> 
> add 5 new fvl support cases of dual_vlan/generic_flow_api
> 
> Signed-off-by: Zhou jun <junx.w.zhou@intel.com>

Applied