From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 121F5A04BE; Fri, 4 Sep 2020 11:11:30 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id C3C3A1C0CA; Fri, 4 Sep 2020 11:11:29 +0200 (CEST) Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by dpdk.org (Postfix) with ESMTP id 92B9E1C0C6 for ; Fri, 4 Sep 2020 11:11:27 +0200 (CEST) IronPort-SDR: ddyHTiSLr4o6S0dbiGqvtHBEL92YfLX6mZUlFRHKRAROTqTaNnHIZZZlcactaO916fby8/QWyU YFTn7CQXppug== X-IronPort-AV: E=McAfee;i="6000,8403,9733"; a="145447765" X-IronPort-AV: E=Sophos;i="5.76,389,1592895600"; d="scan'208";a="145447765" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 04 Sep 2020 02:11:26 -0700 IronPort-SDR: dOEl7mMuQ2t34wFL+kWBsifbD1gsxoFF2H3/FjcYD5Tc4u/1lqoSiAIsKB0wxABxrnGdlGGzCX K346nzlO9Y+Q== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.76,389,1592895600"; d="scan'208";a="405758678" Received: from unknown (HELO localhost.localdomain) ([10.240.183.52]) by fmsmga001.fm.intel.com with ESMTP; 04 Sep 2020 02:11:24 -0700 From: "Zhou, Jun" To: dts@dpdk.org Cc: Zhou jun Date: Fri, 4 Sep 2020 08:56:48 +0000 Message-Id: <20200904085648.4211-1-junx.w.zhou@intel.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dts] [PATCH V1] add new fvl support cases of dual_vlan/generic_flow_api X-BeenThere: dts@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: test suite reviews and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dts-bounces@dpdk.org Sender: "dts" From: Zhou jun add 5 new fvl support cases of dual_vlan/generic_flow_api Signed-off-by: Zhou jun --- 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