From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by dpdk.org (Postfix) with ESMTP id 6B70AC36E for ; Wed, 15 Jun 2016 10:46:43 +0200 (CEST) Received: from orsmga003.jf.intel.com ([10.7.209.27]) by fmsmga102.fm.intel.com with ESMTP; 15 Jun 2016 01:46:42 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.26,475,1459839600"; d="scan'208";a="828415406" Received: from shvmail01.sh.intel.com ([10.239.29.42]) by orsmga003.jf.intel.com with ESMTP; 15 Jun 2016 01:46:41 -0700 Received: from shecgisg003.sh.intel.com (shecgisg003.sh.intel.com [10.239.29.90]) by shvmail01.sh.intel.com with ESMTP id u5F8kd6L023135; Wed, 15 Jun 2016 16:46:39 +0800 Received: from shecgisg003.sh.intel.com (localhost [127.0.0.1]) by shecgisg003.sh.intel.com (8.13.6/8.13.6/SuSE Linux 0.8) with ESMTP id u5F8kb0x016559; Wed, 15 Jun 2016 16:46:39 +0800 Received: (from pengyuan@localhost) by shecgisg003.sh.intel.com (8.13.6/8.13.6/Submit) id u5F8kbE3016555; Wed, 15 Jun 2016 16:46:37 +0800 From: pengyuan To: dts@dpdk.org Cc: pengyuan Date: Wed, 15 Jun 2016 16:46:36 +0800 Message-Id: <1465980396-16521-1-git-send-email-yuan.peng@intel.com> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: References: details: Added the NIC type'fortpark_TLV' in all the testcases the 'fortville' appears. The 'fortpark_TLV' is 4*10G ports. Subject: [dts] [PATCH] Support NIC type fortpark_TLV 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: , X-List-Received-Date: Wed, 15 Jun 2016 08:46:44 -0000 Signed-off-by: pengyuan diff --git a/tests/TestSuite_dual_vlan.py b/tests/TestSuite_dual_vlan.py index a4ae23e..1089b7f 100644 --- a/tests/TestSuite_dual_vlan.py +++ b/tests/TestSuite_dual_vlan.py @@ -103,7 +103,7 @@ class TestDualVlan(TestCase): self.pmdout = PmdOutput(self.dut) self.pmdout.start_testpmd("Default", "--portmask=%s" % portMask, socket=self.ports_socket) - if self.nic in ["fortville_eagle", "fortville_spirit", "fortville_spirit_single"]: + if self.nic in ["fortville_eagle", "fortville_spirit", "fortville_spirit_single", "fortpark_TLV"]: self.dut.send_expect("vlan set filter on all", "testpmd> ") self.dut.send_expect("set promisc all off", "testpmd> ") @@ -147,7 +147,7 @@ class TestDualVlan(TestCase): """ for mode in modeName: - if self.nic in ["fortville_eagle", "fortville_spirit", "fortville_spirit_single"]: + if self.nic in ["fortville_eagle", "fortville_spirit", "fortville_spirit_single", "fortpark_TLV"]: # fortville NIC vlan filter can't close, if want close need remove rx_vlan if mode == "filter": if modeName[mode] == "off": @@ -164,7 +164,7 @@ class TestDualVlan(TestCase): out = self.dut.send_expect("show port info %s" % dutRxPortId, "testpmd> ") for mode in modeName: - if self.nic in ["fortville_eagle", "fortville_spirit", "fortville_spirit_single"]: + if self.nic in ["fortville_eagle", "fortville_spirit", "fortville_spirit_single", "fortpark_TLV"]: # fortville NIC vlan filter can't close, if want close need remove rx_vlan if mode == "filter": if modeName[mode] == "off": @@ -254,7 +254,7 @@ class TestDualVlan(TestCase): print out self.verify(out is not None and "vlan %s" % outvlan not in out, "Vlan filter enable error: " + out) - if self.nic not in ["fortville_eagle", "fortville_spirit", "fortville_spirit_single"]: + if self.nic not in ["fortville_eagle", "fortville_spirit", "fortville_spirit_single", "fortpark_TLV"]: self.mode_config(filter="off") self.vlan_send_packet(outvlan) out = self.get_tcpdump_package() @@ -293,7 +293,7 @@ class TestDualVlan(TestCase): self.mode_config(filter="off") self.mode_config(qinq="off") self.mode_config(strip="on") - if self.nic in ["fortville_eagle", "fortville_spirit", "fortville_spirit_single"]: + if self.nic in ["fortville_eagle", "fortville_spirit", "fortville_spirit_single", "fortpark_TLV"]: self.dut.send_expect('rx_vlan add %s %s' % (outvlan, dutRxPortId), "testpmd> ") self.vlan_send_packet(outvlan) out = self.get_tcpdump_package() @@ -303,20 +303,20 @@ class TestDualVlan(TestCase): self.vlan_send_packet(outvlan) out = self.get_tcpdump_package() self.verify("vlan %s" % outvlan in out, "Vlan strip disable error: " + out) - if self.nic in ["fortville_eagle", "fortville_spirit", "fortville_spirit_single"]: + if self.nic in ["fortville_eagle", "fortville_spirit", "fortville_spirit_single", "fortpark_TLV"]: self.dut.send_expect('rx_vlan rm %s %s' % (outvlan, dutRxPortId), "testpmd> ") def test_vlan_stripq_config(self): """ Enable/Disable VLAN packets strip on queue """ - self.verify(self.nic not in ["fortville_eagle", "fortville_spirit", "fortville_spirit_single"], "%s NIC not support queue vlan strip " % self.nic) + self.verify(self.nic not in ["fortville_eagle", "fortville_spirit", "fortville_spirit_single", "fortpark_TLV"], "%s NIC not support queue vlan strip " % self.nic) self.mode_config(filter="off") self.mode_config(qinq="off") self.mode_config(strip="off") self.mode_config(stripq="off") - if self.nic in ["fortville_eagle", "fortville_spirit", "fortville_spirit_single"]: + if self.nic in ["fortville_eagle", "fortville_spirit", "fortville_spirit_single", "fortpark_TLV"]: self.dut.send_expect('rx_vlan add %s %s' % (outvlan, dutRxPortId), "testpmd> ") self.vlan_send_packet(outvlan) out = self.get_tcpdump_package() @@ -332,7 +332,7 @@ class TestDualVlan(TestCase): self.vlan_send_packet(outvlan) out = self.get_tcpdump_package() self.verify("vlan %s" % outvlan in out, "vlan strip queue disable error: " + out) - if self.nic in ["fortville_eagle", "fortville_spirit", "fortville_spirit_single"]: + if self.nic in ["fortville_eagle", "fortville_spirit", "fortville_spirit_single", "fortpark_TLV"]: self.dut.send_expect('rx_vlan rm %s %s' % (outvlan, dutRxPortId), "testpmd> ") def test_vlan_insert_config(self): @@ -361,7 +361,7 @@ class TestDualVlan(TestCase): """ Configure receive port out vlan TPID """ - self.verify(self.nic not in ["fortville_eagle", "fortville_spirit", "fortville_spirit_single", "hartwell"], "%s NIC not support tcpid " % self.nic) + self.verify(self.nic not in ["fortville_eagle", "fortville_spirit", "fortville_spirit_single", "fortpark_TLV", "hartwell"], "%s NIC not support tcpid " % self.nic) self.mode_config(filter="on", strip="on", qinq="on") # nic only support inner model, except fortville nic diff --git a/tests/TestSuite_fdir.py b/tests/TestSuite_fdir.py index 5a0a6b0..537ab1f 100644 --- a/tests/TestSuite_fdir.py +++ b/tests/TestSuite_fdir.py @@ -78,7 +78,7 @@ class TestFdir(TestCase, IxiaPacketGenerator): out = self.dut.get_session_output() self.dut.send_expect("stop", "testpmd>") - if(self.nic in ["kawela", "niantic", "fortville_eagle", "fortville_spirit", "fortville_spirit_single"]): + if(self.nic in ["kawela", "niantic", "fortville_eagle", "fortville_spirit", "fortville_spirit_single", "fortpark_TLV"]): if ("fwd" == self.fdir_type): if condition: self.queue = 2 @@ -205,7 +205,7 @@ class TestFdir(TestCase, IxiaPacketGenerator): Fdir Performance Benchmarking set rules """ self.dut.send_expect("port stop %s" % self.dut_ports[0], "testpmd>") - if(self.nic in ["fortville_eagle", "fortville_spirit", "fortville_spirit_single"]): + if(self.nic in ["fortville_eagle", "fortville_spirit", "fortville_spirit_single", "fortpark_TLV"]): self.dut.send_expect("flow_director_flex_payload %s l2 (0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15)" % self.dut_ports[0], "testpmd>") self.dut.send_expect("flow_director_flex_payload %s l3 (0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15)" % self.dut_ports[0], "testpmd>") self.dut.send_expect("flow_director_flex_payload %s l4 (0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15)" % self.dut_ports[0], "testpmd>") @@ -221,7 +221,7 @@ class TestFdir(TestCase, IxiaPacketGenerator): Fdir get flexbytes and payload according NIC """ - if(self.nic in ["fortville_eagle", "fortville_spirit", "fortville_spirit_single"]): + if(self.nic in ["fortville_eagle", "fortville_spirit", "fortville_spirit_single", "fortpark_TLV"]): if not sctp: self.flexbytes = "0x11,0x11,0x22,0x22,0x33,0x33,0x44,0x44,0x55,0x55,0x66,0x66,0x77,0x77,0x88,0x88" else: @@ -297,7 +297,7 @@ class TestFdir(TestCase, IxiaPacketGenerator): # ipv4 frag # ip-frag only support in fortville - if (self.nic in ["fortville_eagle", "fortville_spirit", "fortville_spirit_single"]): + if (self.nic in ["fortville_eagle", "fortville_spirit", "fortville_spirit_single", "fortpark_TLV"]): self.dut.send_expect("flow_director_filter %s mode IP add flow ipv4-other src 192.168.0.1 dst 192.168.0.2 tos 2 proto 20 ttl 40 vlan 0 flexbytes () fwd pf queue %d fd_id %d " % (self.dut_ports[0], 3, 1), "testpmd>") self.dut.send_expect("flow_director_filter %s mode IP add flow ipv4-frag src 192.168.0.1 dst 192.168.0.2 tos 2 proto 20 ttl 40 vlan 0 flexbytes () fwd pf queue %d fd_id %d " % (self.dut_ports[0], 2, 1), "testpmd>") self.send_and_verify(True, 'sendp([Ether(src=get_if_hwaddr("%s"), dst="00:1B:21:8E:B2:30")/IP(src="192.168.0.1", dst="192.168.0.2", frag=1, flags="MF")/Raw(load="X"*46)], iface="%s")' % (self.dut_rx_interface, self.dut_rx_interface)) @@ -316,7 +316,7 @@ class TestFdir(TestCase, IxiaPacketGenerator): if self.nic in ["niantic"]: # Niantic ipv6 only support signature mode self.dut.send_expect("./%s/app/testpmd -c %s -n 4 -- -i --portmask=%s --disable-rss --rxq=4 --txq=4 --nb-cores=4 --nb-ports=1 --pkt-filter-mode=signature" % (self.target, self.coreMask, dts.create_mask([self.dut_ports[0]])), "testpmd>", 120) - elif self.nic in ["fortville_eagle", "fortville_spirit", "fortville_spirit_single"]: + elif self.nic in ["fortville_eagle", "fortville_spirit", "fortville_spirit_single", "fortpark_TLV"]: # Fortville ipv6 support perfect mode self.dut.send_expect("./%s/app/testpmd -c %s -n 4 -- -i --portmask=%s --disable-rss --rxq=4 --txq=4 --nb-cores=4 --nb-ports=1 --pkt-filter-mode=perfect" % (self.target, self.coreMask, dts.create_mask([self.dut_ports[0]])), "testpmd>", 120) self.dut.send_expect("set verbose 1", "testpmd>") @@ -373,7 +373,7 @@ class TestFdir(TestCase, IxiaPacketGenerator): # ipv6 frag # ip-frag only support in fortville - if (self.nic in ["fortville_eagle", "fortville_spirit", "fortville_spirit_single"]): + if (self.nic in ["fortville_eagle", "fortville_spirit", "fortville_spirit_single", "fortpark_TLV"]): self.dut.send_expect("flow_director_filter %s mode IP add flow ipv6-other src FE80:0:0:0:200:1FF:FE00:200 dst 3555:5555:6666:6666:7777:7777:8888:8888 tos 2 proto 20 ttl 40 vlan 0 flexbytes () fwd pf queue %d fd_id %d " % (self.dut_ports[0], 3, 1), "testpmd>") self.dut.send_expect("flow_director_filter %s mode IP add flow ipv6-frag src FE80:0:0:0:200:1FF:FE00:200 dst 3555:5555:6666:6666:7777:7777:8888:8888 tos 2 proto 20 ttl 40 vlan 0 flexbytes () fwd pf queue %d fd_id %d " % (self.dut_ports[0], 2, 1), "testpmd>") self.send_and_verify(True, 'sendp([Ether(src=get_if_hwaddr("%s"), dst="00:1B:21:8E:B2:30")/IPv6(src="FE80:0:0:0:200:1FF:FE00:200", dst="3555:5555:6666:6666:7777:7777:8888:8888", nh=44)/IPv6ExtHdrFragment()/Raw(load="X"*46)], iface="%s")' % (self.dut_rx_interface, self.dut_rx_interface)) @@ -441,7 +441,7 @@ class TestFdir(TestCase, IxiaPacketGenerator): # ipv4 frag # ip-frag only support in fortville - if (self.nic in ["fortville_eagle", "fortville_spirit", "fortville_spirit_single"]): + if (self.nic in ["fortville_eagle", "fortville_spirit", "fortville_spirit_single", "fortpark_TLV"]): self.dut.send_expect("flow_director_filter %s mode IP add flow ipv4-other src 192.168.0.1 dst 192.168.0.2 tos 2 proto 20 ttl 40 vlan 0 flexbytes () drop pf queue %d fd_id %d " % (self.dut_ports[0], 3, 1), "testpmd>") self.dut.send_expect("flow_director_filter %s mode IP add flow ipv4-frag src 192.168.0.1 dst 192.168.0.2 tos 2 proto 20 ttl 40 vlan 0 flexbytes () drop pf queue %d fd_id %d " % (self.dut_ports[0], 2, 1), "testpmd>") self.dut.send_expect("flow_director_filter %s mode IP add flow ipv4-frag src 192.168.0.1 dst 192.168.0.2 tos 2 proto 20 ttl 40 vlan 0 flexbytes () drop pf queue %d fd_id %d " % (self.dut_ports[0], 2, 1), "testpmd>") @@ -460,7 +460,7 @@ class TestFdir(TestCase, IxiaPacketGenerator): def test_fdir_noflexword_drop_ipv6(self): # drop not support signature mode, niantic only can work in signature mode with ipv6 # Niantic is not support in drop ipv6 - if self.nic in ["fortville_eagle", "fortville_spirit", "fortville_spirit_single"]: + if self.nic in ["fortville_eagle", "fortville_spirit", "fortville_spirit_single", "fortpark_TLV"]: # drop command testing self.dut.kill_all() @@ -563,7 +563,7 @@ class TestFdir(TestCase, IxiaPacketGenerator): # ipv4 frag # ip-frag only support fortville - if (self.nic in ["fortville_eagle", "fortville_spirit", "fortville_spirit_single"]): + if (self.nic in ["fortville_eagle", "fortville_spirit", "fortville_spirit_single", "fortpark_TLV"]): self.dut.send_expect("flow_director_filter %s mode IP add flow ipv4-other src 192.168.0.1 dst 192.168.0.2 tos 2 proto 20 ttl 40 vlan 0 flexbytes (%s) fwd pf queue %d fd_id %d " % (self.dut_ports[0], self.flexbytes, 3, 1), "testpmd>") self.dut.send_expect("flow_director_filter %s mode IP add flow ipv4-frag src 192.168.0.1 dst 192.168.0.2 tos 2 proto 20 ttl 40 vlan 0 flexbytes (%s) fwd pf queue %d fd_id %d " % (self.dut_ports[0], self.flexbytes, 2, 1), "testpmd>") self.send_and_verify(True, 'sendp([Ether(src=get_if_hwaddr("%s"), dst="00:1B:21:8E:B2:30")/IP(src="192.168.0.1", dst="192.168.0.2", frag=1, flags="MF")/Raw(load="%s")], iface="%s")' % (self.dut_rx_interface, self.payload, self.dut_rx_interface)) @@ -601,7 +601,7 @@ class TestFdir(TestCase, IxiaPacketGenerator): if self.nic in ["niantic"]: # Niantic ipv6 only support signature mode self.dut.send_expect("./%s/app/testpmd -c %s -n 4 -- -i --portmask=%s --disable-rss --rxq=4 --txq=4 --nb-cores=4 --nb-ports=1 --pkt-filter-mode=signature" % (self.target, self.coreMask, dts.create_mask([self.dut_ports[0]])), "testpmd>", 120) - elif self.nic in ["fortville_eagle", "fortville_spirit", "fortville_spirit_single"]: + elif self.nic in ["fortville_eagle", "fortville_spirit", "fortville_spirit_single", "fortpark_TLV"]: # fortville ipv6 support perfect mode self.dut.send_expect("./%s/app/testpmd -c %s -n 4 -- -i --portmask=%s --disable-rss --rxq=4 --txq=4 --nb-cores=4 --nb-ports=1 --pkt-filter-mode=perfect" % (self.target, self.coreMask, dts.create_mask([self.dut_ports[0]])), "testpmd>", 120) self.dut.send_expect("set verbose 1", "testpmd>") @@ -657,7 +657,7 @@ class TestFdir(TestCase, IxiaPacketGenerator): # ipv6 frag # ip-frag only support fortville - if (self.nic in ["fortville_eagle", "fortville_spirit", "fortville_spirit_single"]): + if (self.nic in ["fortville_eagle", "fortville_spirit", "fortville_spirit_single", "fortpark_TLV"]): self.dut.send_expect("flow_director_filter %s mode IP add flow ipv6-other src FE80:0:0:0:200:1FF:FE00:200 dst 3555:5555:6666:6666:7777:7777:8888:8888 tos 2 proto 20 ttl 40 vlan 0 flexbytes (%s) fwd pf queue %d fd_id %d " % (self.dut_ports[0], self.flexbytes, 3, 1), "testpmd>") self.dut.send_expect("flow_director_filter %s mode IP add flow ipv6-frag src FE80:0:0:0:200:1FF:FE00:200 dst 3555:5555:6666:6666:7777:7777:8888:8888 tos 2 proto 20 ttl 40 vlan 0 flexbytes (%s) fwd pf queue %d fd_id %d " % (self.dut_ports[0], self.flexbytes, 2, 1), "testpmd>") self.send_and_verify(True, 'sendp([Ether(src=get_if_hwaddr("%s"), dst="00:1B:21:8E:B2:30")/IPv6(src="FE80:0:0:0:200:1FF:FE00:200", dst="3555:5555:6666:6666:7777:7777:8888:8888", nh=44)/IPv6ExtHdrFragment()/Raw(load="%s")], iface="%s")' % (self.dut_rx_interface, self.payload, self.dut_rx_interface)) @@ -707,7 +707,7 @@ class TestFdir(TestCase, IxiaPacketGenerator): # ipv4 frag # ip-frag only support fortville - if (self.nic in ["fortville_eagle", "fortville_spirit", "fortville_spirit_single"]): + if (self.nic in ["fortville_eagle", "fortville_spirit", "fortville_spirit_single", "fortpark_TLV"]): self.dut.send_expect("flow_director_filter %s mode IP add flow ipv4-other src 192.168.0.1 dst 192.168.0.2 tos 2 proto 20 ttl 40 vlan 0 flexbytes (%s) drop pf queue %d fd_id %d " % (self.dut_ports[0], self.flexbytes, 3, 1), "testpmd>") self.dut.send_expect("flow_director_filter %s mode IP add flow ipv4-frag src 192.168.0.1 dst 192.168.0.2 tos 2 proto 20 ttl 40 vlan 0 flexbytes (%s) drop pf queue %d fd_id %d " % (self.dut_ports[0], self.flexbytes, 2, 1), "testpmd>") self.dut.send_expect("flow_director_filter %s mode IP add flow ipv4-frag src 192.168.0.1 dst 192.168.0.2 tos 2 proto 20 ttl 40 vlan 0 flexbytes (%s) drop pf queue %d fd_id %d " % (self.dut_ports[0], self.flexbytes, 2, 1), "testpmd>") @@ -726,7 +726,7 @@ class TestFdir(TestCase, IxiaPacketGenerator): def test_fdir_flexword_drop_ipv6(self): # drop not support signature mode, niantic only can work in signature mode with ipv6 # Niantic is not support in drop ipv6 - if (self.nic in ["fortville_eagle", "fortville_spirit", "fortville_spirit_single"]): + if (self.nic in ["fortville_eagle", "fortville_spirit", "fortville_spirit_single", "fortpark_TLV"]): # drop testing with flexword self.dut.send_expect("./%s/app/testpmd -c %s -n 4 -- -i --portmask=%s --disable-rss --rxq=4 --txq=4 --nb-cores=4 --nb-ports=1 --pkt-filter-mode=perfect" % (self.target, self.coreMask, dts.create_mask([self.dut_ports[0]])), "testpmd>", 120) self.dut.send_expect("set verbose 1", "testpmd>") diff --git a/tests/TestSuite_generic_filter.py b/tests/TestSuite_generic_filter.py index 663001c..9f6676c 100644 --- a/tests/TestSuite_generic_filter.py +++ b/tests/TestSuite_generic_filter.py @@ -81,7 +81,7 @@ class TestGeneric_filter(TestCase): """ set port queue mapping, fortville not support this function """ - if self.nic not in ["fortville_eagle", "fortville_spirit", "fortville_spirit_single"]: + if self.nic not in ["fortville_eagle", "fortville_spirit", "fortville_spirit_single", "fortpark_TLV"]: self.dut.send_expect( "set stat_qmap rx %s 0 0" % valports[0], "testpmd> ") self.dut.send_expect( @@ -366,7 +366,7 @@ class TestGeneric_filter(TestCase): self.verify(self.nic in ["niantic", "kawela_4", "bartonhills", "powerville", "fortville_eagle", "fortville_spirit", - "fortville_spirit_single"], "%s nic not support syn filter" % self.nic) + "fortville_spirit_single", "fortpark_TLV"], "%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() @@ -619,7 +619,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"], "%s nic not support this test" % self.nic) + self.verify(self.nic not in ["fortville_eagle", "fortville_spirit", "fortville_spirit_single", "fortpark_TLV"], "%s nic not support this test" % self.nic) 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=9600" % portMask) port = self.tester.get_local_port(valports[0]) diff --git a/tests/TestSuite_nvgre.py b/tests/TestSuite_nvgre.py index 99b1d6b..1da551b 100644 --- a/tests/TestSuite_nvgre.py +++ b/tests/TestSuite_nvgre.py @@ -349,7 +349,7 @@ class TestNvgre(TestCase): nvgre Prerequisites """ # this feature only enable in FVL now - self.verify(self.nic in ["fortville_eagle", "fortville_spirit", "fortville_spirit_single", "sageville", "sagepond"], "NVGRE Only supported by Fortville and Sageville") + self.verify(self.nic in ["fortville_eagle", "fortville_spirit", "fortville_spirit_single", "fortpark_TLV", "sageville", "sagepond"], "NVGRE Only supported by Fortville and Sageville") # Based on h/w type, choose how many ports to use ports = self.dut.get_ports(self.nic) self.portmask = dts.create_mask(self.dut.get_ports(self.nic)) diff --git a/tests/TestSuite_pmdrss_hash.py b/tests/TestSuite_pmdrss_hash.py index e753a17..0cb703b 100644 --- a/tests/TestSuite_pmdrss_hash.py +++ b/tests/TestSuite_pmdrss_hash.py @@ -417,10 +417,10 @@ class TestPmdrssHash(TestCase): """ self.verify(self.nic in ["fortville_eagle", "fortville_spirit", - "fortville_spirit_single", "redrockcanyou", "atwood", "boulderrapid"], + "fortville_spirit_single", "redrockcanyou", "atwood", "boulderrapid", "fortpark_TLV"], "NIC Unsupported: " + str(self.nic)) global reta_num - if self.nic in ["fortville_eagle", "fortville_spirit", "fortville_spirit_single"]: + if self.nic in ["fortville_eagle", "fortville_spirit", "fortville_spirit_single", "fortpark_TLV"]: reta_num = 512 elif self.nic in ["niantic"]: reta_num = 128 diff --git a/tests/TestSuite_pmdrssreta.py b/tests/TestSuite_pmdrssreta.py index 9a0ad2f..6445330 100644 --- a/tests/TestSuite_pmdrssreta.py +++ b/tests/TestSuite_pmdrssreta.py @@ -228,7 +228,7 @@ class TestPmdrssreta(TestCase): self.dut.send_expect("quit", "# ", 30) def test_rss_key_size(self): - nic_rss_key_size = {"fortville_eagle": 52, "fortville_spirit": 52, "fortville_spirit_single": 52, "niantic": 40, "e1000": 40, "redrockcanyou": 40, "atwood": 40, "boulderrapid": 40} + nic_rss_key_size = {"fortville_eagle": 52, "fortville_spirit": 52, "fortville_spirit_single": 52, "niantic": 40, "e1000": 40, "redrockcanyou": 40, "atwood": 40, "boulderrapid": 40, "fortpark_TLV": 52} self.verify(self.nic in nic_rss_key_size.keys(), "Not supporte rss key on %s" % self.nic) dutPorts = self.dut.get_ports(self.nic) diff --git a/tests/TestSuite_scatter.py b/tests/TestSuite_scatter.py index 44a55b6..9a3a10a 100644 --- a/tests/TestSuite_scatter.py +++ b/tests/TestSuite_scatter.py @@ -67,7 +67,7 @@ class TestScatter(TestCase): if self.nic in ["niantic", "sageville", "fortpark", "fortville_eagle", "fortville_spirit", "fortville_spirit_single", "redrockcanyou", "atwood", "boulderrapid", - "ironpond", "twinpond", "springfountain"]: + "ironpond", "twinpond", "springfountain", "fortpark_TLV"]: self.mbsize = 2048 else: self.mbsize = 1024 diff --git a/tests/TestSuite_tso.py b/tests/TestSuite_tso.py index 6e45fdc..32db524 100644 --- a/tests/TestSuite_tso.py +++ b/tests/TestSuite_tso.py @@ -55,7 +55,7 @@ class TestTSO(TestCase): self.verify(self.nic in ["kawela_2", "niantic", "bartonhills", "82545EM", "82540EM", "springfountain", "fortville_eagle", "fortville_spirit", "fortville_spirit_single", - "redrockcanyou", "atwood", "boulderrapid"], + "redrockcanyou", "atwood", "boulderrapid", "fortpark_TLV"], "NIC Unsupported: " + str(self.nic)) # Based on h/w type, choose how many ports to use diff --git a/tests/TestSuite_uni_pkt.py b/tests/TestSuite_uni_pkt.py index ca72e75..429546a 100644 --- a/tests/TestSuite_uni_pkt.py +++ b/tests/TestSuite_uni_pkt.py @@ -93,7 +93,7 @@ class TestUniPacket(TestCase): """ Check whether L2 packet can be detected" """ - self.verify("fortville" in self.nic, + self.verify(("fortville" in self.nic or "fortpark_TLV" in self.nic), "L2 packet detect only support by Fortville") self.L2_types = { "TIMESYNC": "(outer) L2 type: ETHER_Timesync", @@ -115,7 +115,7 @@ class TestUniPacket(TestCase): """ checked that whether L3 and L4 packet can be normally detected. """ - if "fortville" in self.nic.lower(): + if "fortville" in self.nic.lower() or "fortpark_TLV" in self.nic.lower(): outerL4Type = "(outer) L4 type: L4_NONFRAG" elif "niantic" in self.nic.lower() or "i350" in self.nic.lower(): outerL4Type = "(outer) L4 type: Unknown" @@ -132,7 +132,7 @@ class TestUniPacket(TestCase): } # delete the unsupported packet based on nic type - if "fortville" in self.nic.lower(): + if "fortville" in self.nic.lower() or "fortpark_TLV" in self.nic.lower(): pktType.pop("MAC_IPihl_PKT") pktType.pop("MAC_IPihl_SCTP_PKT") elif "niantic" in self.nic.lower() or "i350" in self.nic.lower(): @@ -145,7 +145,7 @@ class TestUniPacket(TestCase): """ checked that whether IPv6 and L4 packet can be normally detected. """ - if "fortville" in self.nic.lower(): + if "fortville" in self.nic.lower() or "fortpark_TLV" in self.nic.lower(): outerL4Type = "(outer) L4 type: L4_NONFRAG" outerL3Type = "(outer) L3 type: IPV6_EXT_UNKNOWN" elif "niantic" in self.nic.lower() or "i350" in self.nic.lower(): @@ -161,7 +161,7 @@ class TestUniPacket(TestCase): } # delete the unsupported packet based on nic type - if "fortville" in self.nic.lower(): + if "fortville" in self.nic.lower() or "fortpark_TLV" in self.nic.lower(): pktType.pop("MAC_IPv6FRAG_PKT_N") elif "niantic" in self.nic.lower() or "i350" in self.nic.lower(): pktType.pop("MAC_IPv6FRAG_PKT_F") @@ -173,7 +173,7 @@ class TestUniPacket(TestCase): checked that whether IP in IPv4 tunnel packet can be normally detected by Fortville. """ - self.verify("fortville" in self.nic, + self.verify(("fortville" in self.nic or "fortpark_TLV" in self.nic), "IP in IPv4 tunnel packet type detect only support by Fortville") pktType = { @@ -216,7 +216,7 @@ class TestUniPacket(TestCase): checked that whether IP in IPv6 tunnel packet can be normally detected by Fortville. """ - self.verify("fortville" in self.nic, + self.verify(("fortville" in self.nic or "fortpark_TLV" in self.nic), "IP in IPv6 tunnel packet type detect only support by Fortville") pktType = { @@ -240,7 +240,7 @@ class TestUniPacket(TestCase): checked that whether NVGRE tunnel packet can be normally detected by Fortville. """ - self.verify("fortville" in self.nic, + self.verify(("fortville" in self.nic or "fortpark_TLV" in self.nic), "NVGRE tunnel packet type detect only support by Fortville") pktType = { @@ -267,7 +267,7 @@ class TestUniPacket(TestCase): checked that whether NVGRE in IPv6 tunnel packet can be normally detected by Fortville. """ - self.verify("fortville" in self.nic, + self.verify(("fortville" in self.nic or "fortpark_TLV" in self.nic), "NVGRE in IPv6 detect only support by Fortville") pkt_types = { @@ -304,7 +304,7 @@ class TestUniPacket(TestCase): """ checked that whether GRE tunnel packet can be normally detected by Fortville. """ - self.verify("fortville" in self.nic, + self.verify(("fortville" in self.nic or "fortpark_TLV" in self.nic), "GRE tunnel packet type detect only support by Fortville") pktType = { @@ -323,7 +323,7 @@ class TestUniPacket(TestCase): checked that whether Vxlan tunnel packet can be normally detected by Fortville. """ - self.verify("fortville" in self.nic, + self.verify(("fortville" in self.nic or "fortpark_TLV" in self.nic), "Vxlan tunnel packet type detect only support by Fortville") self.dut.send_expect("rx_vxlan_port add 4789 0", "testpmd>", 10) diff --git a/tests/TestSuite_vf_vlan.py b/tests/TestSuite_vf_vlan.py index 7d1ec73..e32e5bd 100644 --- a/tests/TestSuite_vf_vlan.py +++ b/tests/TestSuite_vf_vlan.py @@ -367,7 +367,7 @@ class TestVfVlan(TestCase): "received 1 packets" in out, "Not received vlan packet as expected!!!") nic_type = self.vm_dut_0.ports_info[0]['type'] nic_name = get_nic_name(nic_type) - if nic_name in ['fvl10g_vf']: + if nic_name in ['fvl10g_vf', 'fortpark_TLV_vf']: self.verify("VLAN tci=%s" % vlan_hex in out, "Failed to disable strip vlan!!!") else: diff --git a/tests/TestSuite_vlan.py b/tests/TestSuite_vlan.py index ba3741e..bf20455 100644 --- a/tests/TestSuite_vlan.py +++ b/tests/TestSuite_vlan.py @@ -75,7 +75,7 @@ class TestVlan(TestCase): self.dut.send_expect("set verbose 1", "testpmd> ") out = self.dut.send_expect("set fwd mac", "testpmd> ") - if self.nic in ["fortville_eagle", "fortville_spirit", "fortville_spirit_single"]: + if self.nic in ["fortville_eagle", "fortville_spirit", "fortville_spirit_single", "fortpark_TLV"]: self.dut.send_expect("vlan set filter on %s" % dutRxPortId, "testpmd> ") self.dut.send_expect("vlan set strip off %s" % dutRxPortId, "testpmd> ") diff --git a/tests/TestSuite_vxlan.py b/tests/TestSuite_vxlan.py index 4438bb0..e9104f2 100644 --- a/tests/TestSuite_vxlan.py +++ b/tests/TestSuite_vxlan.py @@ -258,7 +258,7 @@ class TestVxlan(TestCase, IxiaPacketGenerator): """ # this feature only enable in FVL now self.verify(self.nic in ["fortville_eagle", "fortville_spirit", - "fortville_spirit_single", "sagepond"], + "fortville_spirit_single", "sagepond","fortpark_TLV"], "Vxlan Only supported by Fortville and Sageville") # Based on h/w type, choose how many ports to use ports = self.dut.get_ports() diff --git a/tests/TestSuite_vxlan_sample.py b/tests/TestSuite_vxlan_sample.py index 13e63c5..189bc38 100644 --- a/tests/TestSuite_vxlan_sample.py +++ b/tests/TestSuite_vxlan_sample.py @@ -87,7 +87,7 @@ class TestVxlanSample(TestCase): # this feature only enable in FVL now self.verify(self.nic in ["fortville_eagle", "fortville_spirit", - "fortville_spirit_single"], + "fortville_spirit_single", "fortpark_TLV"], "Vxlan Only supported by Fortville") # Based on h/w type, choose how many ports to use self.dut_ports = self.dut.get_ports() -- 2.5.0