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 D3898A0546; Thu, 16 Jul 2020 09:43:24 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id BFDD21BED9; Thu, 16 Jul 2020 09:43:24 +0200 (CEST) Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by dpdk.org (Postfix) with ESMTP id 51E2A1BEBC for ; Thu, 16 Jul 2020 09:43:22 +0200 (CEST) IronPort-SDR: t2CiYi5emiYbOS07j7757H7cjim2eoPJH+4w1hRod/7OqeIuRkWEu70Nh/jO+PURTzmhRu0XtV W+7rY6P7MxMg== X-IronPort-AV: E=McAfee;i="6000,8403,9683"; a="128902082" X-IronPort-AV: E=Sophos;i="5.75,358,1589266800"; d="scan'208";a="128902082" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 16 Jul 2020 00:43:21 -0700 IronPort-SDR: h5YgSLv79XjDgYqbbRJHSjF3rr55/gY/WuxhRfg1l8Jhy6+TAtLp7t+uDQvVFoo0S0f49+ovn7 maeS7kn3YHZA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.75,358,1589266800"; d="scan'208";a="318338037" Received: from unknown (HELO xqm-virtio_tester.localdomain) ([10.240.183.52]) by fmsmga002.fm.intel.com with ESMTP; 16 Jul 2020 00:43:19 -0700 From: Zhou Jun To: dts@dpdk.org Cc: Zhou jun Date: Thu, 16 Jul 2020 15:34:27 +0800 Message-Id: <1594884867-42255-1-git-send-email-junx.w.zhou@intel.com> X-Mailer: git-send-email 1.8.3.1 Subject: [dts] [PATCH V1] add new fvl support cases 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 new fvl support cases Signed-off-by: Zhou jun --- conf/test_case_checklist.json | 35 +---------------------------------- conf/test_case_supportlist.json | 13 ++++++++++++- tests/TestSuite_generic_filter.py | 26 +++++++++++++------------- tests/TestSuite_generic_flow_api.py | 22 +++++++++++----------- 4 files changed, 37 insertions(+), 59 deletions(-) diff --git a/conf/test_case_checklist.json b/conf/test_case_checklist.json index 48fca04..26cad12 100644 --- a/conf/test_case_checklist.json +++ b/conf/test_case_checklist.json @@ -60,10 +60,7 @@ "NIC": [ "bartonhills", "powerville", - "fortville_eagle", - "fortville_spirit", "fortville_spirit_single", - "fortville_25g", "springville", "ironpond", "springfountain", @@ -90,10 +87,7 @@ "NIC": [ "niantic", "kawela_4", - "fortville_eagle", - "fortville_spirit", "fortville_spirit_single", - "fortville_25g", "springville", "ironpond", "springfountain", @@ -118,10 +112,7 @@ "ALL" ], "NIC": [ - "fortville_eagle", - "fortville_spirit", "fortville_spirit_single", - "fortville_25g", "springville", "fortpark_TLV", "fortpark_BASE-T", @@ -143,10 +134,7 @@ "kawela_4", "bartonhills", "powerville", - "fortville_eagle", - "fortville_spirit", "fortville_spirit_single", - "fortville_25g", "springville", "ironpond", "springfountain", @@ -172,10 +160,7 @@ ], "NIC": [ "niantic", - "fortville_eagle", - "fortville_spirit", "fortville_spirit_single", - "fortville_25g", "springville", "ironpond", "springfountain", @@ -199,10 +184,7 @@ "ALL" ], "NIC": [ - "fortville_eagle", - "fortville_spirit", "fortville_spirit_single", - "fortville_25g", "springville", "ironpond", "springfountain", @@ -257,11 +239,8 @@ "NIC": [ "niantic", "kawela_4", - "fortville_eagle", - "fortville_spirit", "fortville_spirit_single", "springville", - "fortville_25g", "ironpond", "springfountain", "twinpond", @@ -360,10 +339,7 @@ "ALL" ], "NIC": [ - "fortville_eagle", - "fortville_spirit", "fortville_spirit_single", - "fortville_25g", "powerville", "kawela_4", "springville", @@ -387,13 +363,10 @@ "ALL" ], "NIC": [ - "fortville_eagle", - "fortville_spirit", "fortville_spirit_single", "ironpond", "cavium_a034", - "cavium_0011", - "fortville_25g" + "cavium_0011" ], "Target": [ "ALL" @@ -1378,10 +1351,7 @@ "ALL" ], "NIC": [ - "fortville_eagle", - "fortville_spirit", "fortville_spirit_single", - "fortville_25g", "cavium_a064" ], "Target": [ @@ -1424,10 +1394,7 @@ "ALL" ], "NIC": [ - "fortville_eagle", - "fortville_spirit", "fortville_spirit_single", - "fortville_25g", "cavium_a064" ], "Target": [ diff --git a/conf/test_case_supportlist.json b/conf/test_case_supportlist.json index 496f0af..7c7c068 100644 --- a/conf/test_case_supportlist.json +++ b/conf/test_case_supportlist.json @@ -734,6 +734,7 @@ ], "NIC": [ "fortville_eagle", + "fortville_25g", "foxville", "fortville_spirit", "fortville_spirit_single", @@ -832,6 +833,7 @@ "sagepond", "sageville", "fortville_eagle", + "fortville_25g", "fortville_spirit", "fortville_spirit_single", "fortpark_TLV", @@ -852,6 +854,7 @@ ], "NIC": [ "fortville_eagle", + "fortville_25g", "fortville_spirit", "fortville_spirit_single", "fortpark_TLV", @@ -877,6 +880,7 @@ "sagepond", "sageville", "fortville_eagle", + "fortville_25g", "fortville_spirit", "fortville_spirit_single", "fortpark_TLV", @@ -916,6 +920,7 @@ ], "NIC": [ "fortville_eagle", + "fortville_25g", "fortville_spirit", "fortville_spirit_single", "fortpark_TLV", @@ -945,6 +950,7 @@ "sageville", "powerville", "fortville_eagle", + "fortville_25g", "fortville_spirit", "fortville_spirit_single", "fortpark_TLV", @@ -1004,6 +1010,7 @@ "sagepond", "sageville", "fortville_eagle", + "fortville_25g", "fortville_spirit", "fortville_spirit_single", "fortpark_TLV", @@ -1025,6 +1032,7 @@ ], "NIC": [ "fortville_eagle", + "fortville_25g", "fortville_spirit", "fortville_spirit_single", "fortpark_TLV", @@ -1695,7 +1703,10 @@ ], "NIC": [ "cavium_a064", - "cavium_a063" + "cavium_a063", + "fortville_eagle", + "fortville_25g", + "fortville_spirit" ], "Target": [ "ALL" diff --git a/tests/TestSuite_generic_filter.py b/tests/TestSuite_generic_filter.py index 7806e11..fb710eb 100644 --- a/tests/TestSuite_generic_filter.py +++ b/tests/TestSuite_generic_filter.py @@ -204,7 +204,7 @@ class TestGeneric_filter(TestCase): """ Enable receipt of SYN packets """ - self.verify(self.nic in ["niantic", "kawela_4", "bartonhills", "powerville", "sagepond", "foxville", "sageville"], "%s nic not support syn filter" % self.nic) + self.verify(self.nic in ["niantic", "kawela_4", "bartonhills", "powerville", "sagepond", "foxville", "sageville", "fortville_eagle", "fortville_25g", "fortville_spirit"], "%s nic not support syn filter" % self.nic) self.pmdout.start_testpmd( "%s" % self.cores, "--disable-rss --rxq=4 --txq=4 --portmask=%s --nb-cores=4 --nb-ports=1" % portMask) self.port_config() @@ -267,7 +267,7 @@ class TestGeneric_filter(TestCase): self.filter_send_packet("fivetuple") out = self.dut.send_expect("stop", "testpmd> ") self.verify_result(out, tx_pkts="1", expect_queue="2") - elif self.nic == "kawela_4": + elif self.nic in ["kawela_4", "fortville_eagle", "fortville_25g", "fortville_spirit"]: cmd = "5tuple_filter %s add dst_ip 2.2.2.5 src_ip 2.2.2.4 dst_port 1 src_port 1 protocol 0x06 mask 0x1f tcp_flags 0x02 priority 3 queue 3" % ( valports[0]) self.dut.send_expect("%s" % (cmd), "testpmd> ") @@ -307,7 +307,7 @@ class TestGeneric_filter(TestCase): """ five tuple filter """ - if self.nic in ["niantic", "kawela_4", "sagepond", "foxville", "sageville"]: + if self.nic in ["niantic", "kawela_4", "sagepond", "foxville", "sageville", "fortville_eagle", "fortville_25g", "fortville_spirit"]: self.pmdout.start_testpmd( "%s" % self.cores, "--disable-rss --rxq=4 --txq=4 --portmask=%s --nb-cores=4 --nb-ports=1" % portMask) self.port_config() @@ -318,14 +318,14 @@ class TestGeneric_filter(TestCase): if self.nic in ["niantic", "sagepond", "sageville"]: cmd = "5tuple_filter %s add dst_ip 2.2.2.5 src_ip 2.2.2.4 dst_port 1 src_port 1 protocol 0x06 mask %s tcp_flags 0x0 priority 3 queue 3" % ( valports[0], case) - if self.nic == "kawela_4": + if self.nic in ["kawela_4", "fortville_eagle", "fortville_25g", "fortville_spirit"]: cmd = "5tuple_filter %s add dst_ip 2.2.2.5 src_ip 2.2.2.4 dst_port 1 src_port 1 protocol 0x06 mask %s tcp_flags 0x02 priority 3 queue 3" % ( valports[0], case) else: if self.nic in ["niantic", "sagepond", "sageville"]: cmd = "5tuple_filter %s add dst_ip 2.2.2.5 src_ip 2.2.2.4 dst_port 1 src_port 1 protocol 0x06 mask %s tcp_flags 0x0 priority 3 queue 3" % ( valports[0], case) - if self.nic == "kawela_4": + if self.nic in ["kawela_4", "fortville_eagle", "fortville_25g", "fortville_spirit"]: cmd = "5tuple_filter %s add dst_ip 2.2.2.5 src_ip 2.2.2.4 dst_port 1 src_port 1 protocol 0x06 mask %s tcp_flags 0x02 priority 3 queue 3" % ( valports[0], case) @@ -348,14 +348,14 @@ class TestGeneric_filter(TestCase): if self.nic in ["niantic", "sagepond", "sageville"]: cmd = "5tuple_filter %s del dst_ip 2.2.2.5 src_ip 2.2.2.4 dst_port 1 src_port 1 protocol 0x06 mask %s tcp_flags 0x0 priority 3 queue 3" % ( valports[0], case) - if self.nic == "kawela_4": + if self.nic in ["kawela_4", "fortville_eagle", "fortville_25g", "fortville_spirit"]: cmd = "5tuple_filter %s del dst_ip 2.2.2.5 src_ip 2.2.2.4 dst_port 1 src_port 1 protocol 0x06 mask %s tcp_flags 0x02 priority 3 queue 3" % ( valports[0], case) else: if self.nic in ["niantic", "sagepond", "sageville"]: cmd = "5tuple_filter %s del dst_ip 2.2.2.5 src_ip 2.2.2.4 dst_port 1 src_port 1 protocol 0x06 mask %s tcp_flags 0x0 priority 3 queue 3" % ( valports[0], case) - if self.nic == "kawela_4": + if self.nic in ["kawela_4", "fortville_eagle", "fortville_25g", "fortville_spirit"]: cmd = "5tuple_filter %s del dst_ip 2.2.2.5 src_ip 2.2.2.4 dst_port 1 src_port 1 protocol 0x06 mask %s tcp_flags 0x02 priority 3 queue 3" % ( valports[0], case) @@ -371,7 +371,7 @@ class TestGeneric_filter(TestCase): def test_ethertype_filter(self): self.verify(self.nic in ["niantic", "kawela_4", "bartonhills", "sagepond", - "powerville", "fortville_eagle", "fortville_spirit", + "powerville", "fortville_eagle", "fortville_25g", "fortville_spirit", "fortville_spirit_single", "fortpark_TLV","fortpark_BASE-T", "fortville_25g","cavium_a063", "carlsville", "foxville", "sageville"], "%s nic not support syn filter" % self.nic) self.pmdout.start_testpmd( "%s" % self.cores, "--disable-rss --rxq=4 --txq=4 --portmask=%s --nb-cores=4 --nb-ports=1" % portMask) @@ -417,7 +417,7 @@ class TestGeneric_filter(TestCase): self.verify_result(out, tx_pkts="1", expect_queue="0") def test_multiple_filters_10GB(self): - if self.nic in ["niantic", "sagepond", "sageville"]: + if self.nic in ["niantic", "sagepond", "sageville", "fortville_eagle", "fortville_25g", "fortville_spirit"]: self.pmdout.start_testpmd( "%s" % self.cores, "--disable-rss --rxq=4 --txq=4 --portmask=%s --nb-cores=4 --nb-ports=1" % portMask) self.port_config() @@ -501,7 +501,7 @@ class TestGeneric_filter(TestCase): def test_twotuple_filter(self): - if self.nic in ["powerville", "bartonhills", "cavium_a063", "sagepond", "foxville", "sageville"]: + if self.nic in ["powerville", "bartonhills", "cavium_a063", "sagepond", "foxville", "sageville", "fortville_eagle", "fortville_25g", "fortville_spirit"]: self.pmdout.start_testpmd( "%s" % self.cores, "--disable-rss --rxq=4 --txq=4 --portmask=%s --nb-cores=4 --nb-ports=1" % portMask) self.port_config() @@ -534,7 +534,7 @@ class TestGeneric_filter(TestCase): self.verify(False, "%s nic not support two tuple filter" % self.nic) def test_flex_filter(self): - self.verify(self.nic in ["powerville", "bartonhills", "cavium_a063", "sagepond", "foxville", "sageville"], '%s not support flex filter' % self.nic) + self.verify(self.nic in ["powerville", "bartonhills", "cavium_a063", "sagepond", "foxville", "sageville", "fortville_eagle", "fortville_25g", "fortville_spirit"], '%s not support flex filter' % self.nic) masks = ['000C', '000C'] self.pmdout.start_testpmd( @@ -589,7 +589,7 @@ class TestGeneric_filter(TestCase): def test_multiple_filters_1GB(self): - if self.nic in ["powerville", "kawela_4", "bartonhills", "sagepond", "foxville", "sageville"]: + if self.nic in ["powerville", "kawela_4", "bartonhills", "sagepond", "foxville", "sageville", "fortville_eagle", "fortville_25g", "fortville_spirit"]: self.pmdout.start_testpmd( "%s" % self.cores, "--disable-rss --rxq=4 --txq=4 --portmask=%s --nb-cores=4 --nb-ports=1" % portMask) self.port_config() @@ -633,7 +633,7 @@ class TestGeneric_filter(TestCase): self.verify(False, "%s nic not support this test" % self.nic) def test_jumbo_frame_size(self): - self.verify(self.nic not in ["fortville_eagle", "fortville_spirit", "fortville_spirit_single", "fortville_25g", "fortpark_TLV","fortpark_BASE-T", "carlsville"], "%s nic not support this test" % self.nic) + self.verify(self.nic not in ["fortville_spirit_single", "fortpark_TLV","fortpark_BASE-T", "carlsville"], "%s nic not support this test" % self.nic) if (self.nic in ["cavium_a063", "cavium_a064", "foxville"]): self.pmdout.start_testpmd( "%s" % self.cores, "--disable-rss --rxq=4 --txq=4 --portmask=%s --nb-cores=4 --nb-ports=1 --mbcache=200 --mbuf-size=2048 --max-pkt-len=9200" % portMask) diff --git a/tests/TestSuite_generic_flow_api.py b/tests/TestSuite_generic_flow_api.py index ae7f9f1..7e95d4b 100644 --- a/tests/TestSuite_generic_flow_api.py +++ b/tests/TestSuite_generic_flow_api.py @@ -773,7 +773,7 @@ class TestGeneric_flow_api(TestCase): supported by i40e, ixgbe and igb """ self.verify(self.nic in ["niantic", "columbiaville_25g","columbiaville_100g","kawela_4", "kawela", "bartonhills", "twinville", "sagepond", "sageville", - "powerville", "fortville_eagle", "fortville_spirit", "carlsville", + "powerville", "fortville_eagle", "fortville_25g", "fortville_spirit", "carlsville", "fortville_spirit_single", "fortpark_TLV","fortpark_BASE-T", "foxville"], "%s nic not support ethertype filter" % self.nic) self.pmdout.start_testpmd("%s" % self.cores, "--disable-rss --rxq=%d --txq=%d" % (MAX_QUEUE+1, MAX_QUEUE+1), "-w %s --file-prefix=test1" % self.pf_pci) @@ -869,7 +869,7 @@ class TestGeneric_flow_api(TestCase): """ only supported by i40e """ - self.verify(self.nic in ["fortville_eagle", "fortville_spirit", "carlsville", + self.verify(self.nic in ["fortville_eagle", "fortville_25g", "fortville_spirit", "carlsville", "fortville_spirit_single", "fortpark_TLV","fortpark_BASE-T", "foxville"], "%s nic not support fdir L2 payload filter" % self.nic) self.pmdout.start_testpmd("%s" % self.pf_cores, "--pkt-filter-mode=perfect --rxq=%d --txq=%d" % (MAX_QUEUE+1, MAX_QUEUE+1), "-w %s --file-prefix=test1" % self.pf_pci) @@ -1322,7 +1322,7 @@ class TestGeneric_flow_api(TestCase): """ only supported by i40e """ - self.verify(self.nic in ["fortville_eagle", "fortville_spirit", "carlsville", + self.verify(self.nic in ["fortville_eagle", "fortville_25g", "fortville_spirit", "carlsville", "fortville_spirit_single", "fortpark_TLV","fortpark_BASE-T", "foxville"], "%s nic not support fdir vlan filter" % self.nic) self.setup_env() # start testpmd on pf @@ -1414,11 +1414,11 @@ class TestGeneric_flow_api(TestCase): only supported by i40e and ixgbe """ self.verify(self.nic in ["niantic", "columbiaville_25g","columbiaville_100g","twinville", "sagepond", "sageville", - "fortville_eagle", "fortville_spirit", "carlsville", + "fortville_eagle", "fortville_25g", "fortville_spirit", "carlsville", "fortville_spirit_single", "fortpark_TLV","fortpark_BASE-T", "foxville"], "%s nic not support fdir ipv4 filter" % self.nic) # i40e - if (self.nic in ["fortville_eagle", "fortville_spirit","columbiaville_25g","columbiaville_100g", + if (self.nic in ["fortville_eagle", "fortville_25g", "fortville_spirit","columbiaville_25g","columbiaville_100g", "fortville_spirit_single", "fortpark_TLV","fortpark_BASE-T", "foxville", "carlsville"]): self.setup_env() # start testpmd on pf @@ -1523,11 +1523,11 @@ class TestGeneric_flow_api(TestCase): only supported by i40e and ixgbe """ self.verify(self.nic in ["niantic", "twinville", "sagepond", "sageville","columbiaville_25g","columbiaville_100g", - "fortville_eagle", "fortville_spirit", "carlsville", + "fortville_eagle", "fortville_25g", "fortville_spirit", "carlsville", "fortville_spirit_single", "fortpark_TLV","fortpark_BASE-T", "foxville"], "%s nic not support fdir ipv6 filter" % self.nic) # i40e - if (self.nic in ["fortville_eagle", "fortville_spirit","columbiaville_25g","columbiaville_100g", + if (self.nic in ["fortville_eagle", "fortville_25g", "fortville_spirit","columbiaville_25g","columbiaville_100g", "fortville_spirit_single", "fortpark_TLV","fortpark_BASE-T", "carlsville"]): self.setup_env() self.pmdout.start_testpmd("%s" % self.pf_cores, "--pkt-filter-mode=perfect --disable-rss --rxq=%d --txq=%d" % (MAX_QUEUE+1, MAX_QUEUE+1), "-w %s --file-prefix=pf --socket-mem 1024,1024 --legacy-mem" % self.pf_pci) @@ -1643,11 +1643,11 @@ class TestGeneric_flow_api(TestCase): The filter structure is different between igb, ixgbe and i40e """ self.verify(self.nic in ["niantic", "twinville", "sagepond", "sageville", - "fortville_eagle", "fortville_spirit", "carlsville", + "fortville_eagle", "fortville_25g", "fortville_spirit", "carlsville", "fortville_spirit_single", "fortpark_TLV","fortpark_BASE-T", "foxville"], "%s nic not support fdir flexbytes filter" % self.nic) # i40e - if (self.nic in ["fortville_eagle", "fortville_spirit", "carlsville", + if (self.nic in ["fortville_eagle", "fortville_25g", "fortville_spirit", "carlsville", "fortville_spirit_single", "fortpark_TLV","fortpark_BASE-T"]): self.pmdout.start_testpmd("%s" % self.pf_cores, "--pkt-filter-mode=perfect --disable-rss --rxq=%d --txq=%d" % (MAX_QUEUE+1, MAX_QUEUE+1), "-w %s --file-prefix=pf" % self.pf_pci) self.dut.send_expect("set fwd rxonly", "testpmd> ", 120) @@ -1971,7 +1971,7 @@ class TestGeneric_flow_api(TestCase): """ only supported by i40e """ - self.verify(self.nic in ["fortville_eagle", "fortville_spirit","columbiaville_25g","columbiaville_100g", + self.verify(self.nic in ["fortville_eagle", "fortville_25g", "fortville_spirit","columbiaville_25g","columbiaville_100g", "fortville_spirit_single", "fortpark_TLV","fortpark_BASE-T", "foxville", "carlsville"], "%s nic not support tunnel vxlan filter" % self.nic) @@ -2035,7 +2035,7 @@ class TestGeneric_flow_api(TestCase): """ only supported by i40e """ - self.verify(self.nic in ["fortville_eagle", "fortville_spirit","columbiaville_25g","columbiaville_100g", + self.verify(self.nic in ["fortville_eagle", "fortville_25g", "fortville_spirit","columbiaville_25g","columbiaville_100g", "fortville_spirit_single", "fortpark_TLV","fortpark_BASE-T", "foxville", "carlsville"], "%s nic not support tunnel nvgre filter" % self.nic) -- 1.8.3.1