Tested-by: Xiao, QimaiX Regards, Xiao Qimai > -----Original Message----- > From: dts [mailto:dts-bounces@dpdk.org] On Behalf Of Xu, Hailin > Sent: Thursday, April 23, 2020 4:42 PM > To: dts@dpdk.org > Cc: Xu, HailinX > Subject: [dts] [PATCH v1] dts_suite:add nic casrlsville. > > From: "xu,hailin" > > carlsville driver is i40e, so the nic support the suite. > > Signed-off-by: xu,hailin > --- > tests/TestSuite_generic_flow_api.py | 42 ++++++++++++++++++------------- > ------ > tests/TestSuite_rss_to_rte_flow.py | 12 +++++------ > tests/TestSuite_rxtx_offload.py | 2 +- > 3 files changed, 28 insertions(+), 28 deletions(-) > > diff --git a/tests/TestSuite_generic_flow_api.py > b/tests/TestSuite_generic_flow_api.py > index a8a7956..1d27a74 100644 > --- a/tests/TestSuite_generic_flow_api.py > +++ b/tests/TestSuite_generic_flow_api.py > @@ -290,10 +290,10 @@ class TestGeneric_flow_api(TestCase): > if "86dd" in flow_cmd or "0800" in flow_cmd or "index %s" % > str(MAX_QUEUE + 1) in flow_cmd: > if self.nic in ["fortville_eagle", "fortville_spirit", > "fortville_spirit_single", "fortpark_TLV","fortpark_BASE-T", > "niantic", "kawela_4", "kawela", "bartonhills", "twinville", > "sagepond", "sageville", > - "powerville"]: > + "powerville", "carlsville"]: > self.dut.send_expect(flow_cmd, "error") > elif "type is 0x8100" in flow_cmd: > - if self.nic in ["fortville_eagle", "fortville_spirit", > "fortville_spirit_single", "fortpark_TLV","fortpark_BASE-T"]: > + if self.nic in ["fortville_eagle", "fortville_spirit", > "fortville_spirit_single", "fortpark_TLV","fortpark_BASE-T", "carlsville"]: > self.dut.send_expect(flow_cmd, "error") > # vf queue id exceeds max vf queue number. > elif (("vf0" in flow_action['flows']) or ("vf1" in flow_action['flows']) or > ( @@ -307,10 +307,10 @@ class TestGeneric_flow_api(TestCase): > if "86dd" in flow_cmd or "0800" in flow_cmd or "index %s" % > str(MAX_QUEUE + 1) in flow_cmd: > if self.nic in ["fortville_eagle", "fortville_spirit", > "fortville_spirit_single", "fortpark_TLV","fortpark_BASE-T", > "niantic", "kawela_4", "kawela", "bartonhills", "twinville", > "sagepond", "sageville", > - "powerville"]: > + "powerville", "carlsville"]: > self.dut.send_expect(flow_cmd, "error") > elif "type is 0x8100" in flow_cmd: > - if self.nic in ["fortville_eagle", "fortville_spirit", > "fortville_spirit_single", "fortpark_TLV","fortpark_BASE-T"]: > + if self.nic in ["fortville_eagle", "fortville_spirit", > "fortville_spirit_single", "fortpark_TLV","fortpark_BASE-T", "carlsville"]: > self.dut.send_expect(flow_cmd, "error") > # vf queue id exceeds max vf queue number. > elif (("vf0" in flow_action['flows']) or ("vf1" in flow_action['flows']) or > ( @@ -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", > + "powerville", "fortville_eagle", > + "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) @@ -783,7 +783,7 @@ class TestGeneric_flow_api(TestCase): > time.sleep(2) > > # i40e,ixgbe and igb support different packet types. > - if (self.nic in ["fortville_eagle", "fortville_spirit", > + if (self.nic in ["fortville_eagle", "fortville_spirit", > + "carlsville", > "fortville_spirit_single", "fortpark_TLV","fortpark_BASE- > T","columbiaville_25g","columbiaville_100g"]): > > basic_flow_actions = [ > @@ -869,7 +869,7 @@ class TestGeneric_flow_api(TestCase): > """ > only supported by i40e > """ > - self.verify(self.nic in ["fortville_eagle", "fortville_spirit", > + self.verify(self.nic in ["fortville_eagle", "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) @@ -913,7 +913,7 @@ class > TestGeneric_flow_api(TestCase): > """ > only supported by i40e > """ > - self.verify(self.nic in ["fortville_eagle", "fortville_spirit", > + self.verify(self.nic in ["fortville_eagle", "fortville_spirit", > + "carlsville", > "fortville_spirit_single", "fortpark_TLV"], "%s nic not > support fdir vlan filter" % self.nic) > > self.pmdout.start_testpmd("%s" % self.cores, "--rxq=%d --txq=%d" % > (MAX_QUEUE+1, MAX_QUEUE+1), "-w %s --file-prefix=test1" % self.pf_pci) > @@ -1001,7 +1001,7 @@ class TestGeneric_flow_api(TestCase): > """ > only supported by i40e > """ > - self.verify(self.nic in ["fortville_eagle", "fortville_spirit", > + self.verify(self.nic in ["fortville_eagle", "fortville_spirit", > + "carlsville", > "fortville_spirit_single", "fortpark_TLV"], "%s nic not > support fdir vlan filter" % self.nic) > > self.pmdout.start_testpmd("%s" % self.cores, "--rxq=%d --txq=%d" % > (MAX_QUEUE+1, MAX_QUEUE+1), "-w %s --file-prefix=test1" % self.pf_pci) > @@ -1089,7 +1089,7 @@ class TestGeneric_flow_api(TestCase): > """ > only supported by i40e > """ > - self.verify(self.nic in ["fortville_eagle", "fortville_spirit", > + self.verify(self.nic in ["fortville_eagle", "fortville_spirit", > + "carlsville", > "fortville_spirit_single", "fortpark_TLV"], "%s nic not > support fdir vlan filter" % self.nic) > > self.pmdout.start_testpmd("%s" % self.cores, "--rxq=%d --txq=%d" % > (MAX_QUEUE+1, MAX_QUEUE+1), "-w %s --file-prefix=test1" % self.pf_pci) > @@ -1177,7 +1177,7 @@ class TestGeneric_flow_api(TestCase): > """ > only supported by i40e > """ > - self.verify(self.nic in ["fortville_eagle", "fortville_spirit", > + self.verify(self.nic in ["fortville_eagle", "fortville_spirit", > + "carlsville", > "fortville_spirit_single", "fortpark_TLV"], "%s nic not > support fdir vlan filter" % self.nic) > > self.pmdout.start_testpmd("%s" % self.cores, "--rxq=%d --txq=%d" % > (MAX_QUEUE+1, MAX_QUEUE+1), "-w %s --file-prefix=test1" % self.pf_pci) > @@ -1264,7 +1264,7 @@ class TestGeneric_flow_api(TestCase): > """ > only supported by i40e > """ > - self.verify(self.nic in ["fortville_eagle", "fortville_spirit", > + self.verify(self.nic in ["fortville_eagle", "fortville_spirit", > + "carlsville", > "fortville_spirit_single", "fortpark_TLV"], "%s nic not > support fdir vlan filter" % self.nic) > > self.pmdout.start_testpmd("%s" % self.cores, "--rxq=%d --txq=%d" % > (MAX_QUEUE+1, MAX_QUEUE+1), "-w %s --file-prefix=test1" % self.pf_pci) > @@ -1317,7 +1317,7 @@ class TestGeneric_flow_api(TestCase): > """ > only supported by i40e > """ > - self.verify(self.nic in ["fortville_eagle", "fortville_spirit", > + self.verify(self.nic in ["fortville_eagle", "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 > @@ -1409,12 +1409,12 @@ 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", > + "fortville_eagle", "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", > - "fortville_spirit_single", "fortpark_TLV","fortpark_BASE-T", > "foxville"]): > + "fortville_spirit_single", "fortpark_TLV","fortpark_BASE-T", > "foxville", "carlsville"]): > self.setup_env() > # start testpmd on pf > 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) @@ -1518,12 +1518,12 @@ 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", > + "fortville_eagle", "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", > - "fortville_spirit_single", "fortpark_TLV","fortpark_BASE-T"]): > + "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) > self.dut.send_expect("set fwd rxonly", "testpmd> ", 120) @@ - > 1638,11 +1638,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", > + "fortville_eagle", "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", > + if (self.nic in ["fortville_eagle", "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) @@ -1967,7 > +1967,7 @@ class TestGeneric_flow_api(TestCase): > only supported by i40e > """ > self.verify(self.nic in ["fortville_eagle", > "fortville_spirit","columbiaville_25g","columbiaville_100g", > - "fortville_spirit_single", "fortpark_TLV","fortpark_BASE-T", > "foxville"], > + "fortville_spirit_single", > + "fortpark_TLV","fortpark_BASE-T", "foxville", "carlsville"], > "%s nic not support tunnel vxlan filter" % self.nic) > > self.setup_env() > @@ -2031,7 +2031,7 @@ class TestGeneric_flow_api(TestCase): > only supported by i40e > """ > self.verify(self.nic in ["fortville_eagle", > "fortville_spirit","columbiaville_25g","columbiaville_100g", > - "fortville_spirit_single", "fortpark_TLV","fortpark_BASE-T", > "foxville"], > + "fortville_spirit_single", > + "fortpark_TLV","fortpark_BASE-T", "foxville", "carlsville"], > "%s nic not support tunnel nvgre filter" % self.nic) > > self.setup_env() > diff --git a/tests/TestSuite_rss_to_rte_flow.py > b/tests/TestSuite_rss_to_rte_flow.py > index b345a84..8d5cf51 100644 > --- a/tests/TestSuite_rss_to_rte_flow.py > +++ b/tests/TestSuite_rss_to_rte_flow.py > @@ -226,7 +226,7 @@ class TestRSS_to_Rteflow(TestCase): > time.sleep(2) > > # Show port default RSS fucntions > - if (self.nic in ["fortville_eagle", "fortville_spirit","carlsville" > + if (self.nic in ["fortville_eagle", > + "fortville_spirit","carlsville", > "fortville_spirit_single", "fortpark_TLV","fortpark_BASE-T", > "fortville_25g"]): > self.dut.send_expect( > "show port 0 rss-hash", "ipv4-frag ipv4-other ipv6-frag ipv6-other ip") > @@ -240,7 +240,7 @@ class TestRSS_to_Rteflow(TestCase): > > self.send_packet("ipv4-udp", self.tester_itf) > out = self.dut.send_expect("stop", "testpmd> ", 120) > - if (self.nic in ["fortville_eagle", "fortville_spirit","carlsville" > + if (self.nic in ["fortville_eagle", > + "fortville_spirit","carlsville", > "fortville_spirit_single", "fortpark_TLV","fortpark_BASE-T", > "fortville_25g"]): > self.check_packet_queue("0", out) > else: > @@ -286,7 +286,7 @@ class TestRSS_to_Rteflow(TestCase): > # ipv4-other and ipv6-other is enabled by default. > # i40e > rss_queue = ["1", "4", "7"] > - if (self.nic in ["fortville_eagle", "fortville_spirit", "carlsville" > + if (self.nic in ["fortville_eagle", "fortville_spirit", > + "carlsville", > "fortville_spirit_single", "fortpark_TLV","fortpark_BASE-T", > "fortville_25g"]): > self.send_and_check(self.pkt4, rss_queue) > self.send_and_check(self.pkt8, rss_queue) @@ -416,7 +416,7 @@ > class TestRSS_to_Rteflow(TestCase): > Set key and key_len. > """ > # Only supported by i40e > - self.verify(self.nic in ["fortville_eagle", "fortville_spirit", "carlsville" > + self.verify(self.nic in ["fortville_eagle", "fortville_spirit", > + "carlsville", > "fortville_spirit_single", "fortpark_TLV","fortpark_BASE-T", > "fortville_25g"], "NIC Unsupported: " + str(self.nic)) > pkt1 = "Ether(dst='%s')/IP(src='0.0.0.0',dst='4.0.0.0')/UDP(sport=100, > dport=200)/('X'*48)" % self.pf_mac > pkt2 = "Ether(dst='%s')/IP(src='0.0.0.0',dst='4.0.0.0')/UDP(sport=100, > dport=201)/('X'*48)" % self.pf_mac @@ -603,7 +603,7 @@ class > TestRSS_to_Rteflow(TestCase): > """ > Set RSS queue rule with queue region API. > """ > - self.verify(self.nic in ["fortville_eagle", "fortville_spirit", > + self.verify(self.nic in ["fortville_eagle", "fortville_spirit", > + "carlsville", > "fortville_spirit_single", "fortpark_TLV","fortpark_BASE-T", > "fortville_25g"], "NIC Unsupported: " + str(self.nic)) > self.pmdout.start_testpmd("%s" % self.cores, "--rxq=16 --txq=16 --port- > topology=chained") > self.dut.send_expect("set fwd rxonly", "testpmd> ", 120) @@ -647,7 > +647,7 @@ class TestRSS_to_Rteflow(TestCase): > """ > Set RSS queue rule with invalid parameter in queue region API. > """ > - self.verify(self.nic in ["fortville_eagle", "fortville_spirit", > + self.verify(self.nic in ["fortville_eagle", "fortville_spirit", > + "carlsville", > "fortville_spirit_single", "fortpark_TLV","fortpark_BASE-T", > "fortville_25g", "carlsville"], "NIC Unsupported: " + str(self.nic)) > self.pmdout.start_testpmd("%s" % self.cores, "--rxq=16 --txq=16 --port- > topology=chained") > self.dut.send_expect("set fwd rxonly", "testpmd> ", 120) diff --git > a/tests/TestSuite_rxtx_offload.py b/tests/TestSuite_rxtx_offload.py index > dcd1212..bf2c901 100644 > --- a/tests/TestSuite_rxtx_offload.py > +++ b/tests/TestSuite_rxtx_offload.py > @@ -678,7 +678,7 @@ class TestRxTx_Offload(TestCase): > Set Rx offload by queue. > """ > # Only support i40e NICs > - self.verify(self.nic in ["fortville_eagle", "fortville_spirit","fortville_25g", > + self.verify(self.nic in ["fortville_eagle", > + "fortville_spirit","fortville_25g", "carlsville", > "fortville_spirit_single", "fortpark_TLV","fortpark_BASE-T"], > "%s nic not support rx offload setting by queue." % self.nic) > # Check offload configuration by port and by queue. > self.pmdout.start_testpmd("%s" % self.cores, "--rxq=4 --txq=4") > -- > 1.8.3.1