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 72337A0569; Thu, 12 Mar 2020 09:35:51 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 5E23B1C011; Thu, 12 Mar 2020 09:35:51 +0100 (CET) Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by dpdk.org (Postfix) with ESMTP id 357A81C010 for ; Thu, 12 Mar 2020 09:35:49 +0100 (CET) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga102.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 12 Mar 2020 01:35:48 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.70,544,1574150400"; d="scan'208";a="354079066" Received: from unknown (HELO dpdk-wenjielx-dtspatch135.sh.intel.com) ([10.240.176.135]) by fmsmga001.fm.intel.com with ESMTP; 12 Mar 2020 01:35:46 -0700 From: xizhan4x To: dts@dpdk.org Cc: xizhan4x Date: Thu, 12 Mar 2020 16:41:11 +0800 Message-Id: <1584002471-31650-1-git-send-email-xix.zhang@intel.com> X-Mailer: git-send-email 1.9.3 Subject: [dts] [PATCH V1] dts/add-nic-37d2-fortpark-TLV1-msg 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" add nic fortpark-TLV1 mag Signed-off-by: xizhan4x --- conf/test_case_checklist.json | 20 ++++++++- conf/test_case_supportlist.json | 43 +++++++++++++------ framework/settings.py | 2 + tests/TestSuite_dual_vlan.py | 20 ++++----- tests/TestSuite_fdir.py | 26 +++++------ tests/TestSuite_generic_filter.py | 6 +-- tests/TestSuite_generic_flow_api.py | 32 +++++++------- tests/TestSuite_l2fwd_jobstats.py | 2 +- tests/TestSuite_nvgre.py | 2 +- tests/TestSuite_pmdrss_hash.py | 6 +-- tests/TestSuite_pmdrssreta.py | 2 +- tests/TestSuite_ptype_mapping.py | 2 +- tests/TestSuite_queue_region.py | 8 ++-- tests/TestSuite_rss_to_rte_flow.py | 24 +++++------ ...stSuite_runtime_vf_queue_number_maxinum.py | 6 +-- tests/TestSuite_rxtx_offload.py | 10 ++--- tests/TestSuite_scatter.py | 2 +- tests/TestSuite_uni_pkt.py | 24 +++++------ tests/TestSuite_vf_interrupt_pmd.py | 4 +- tests/TestSuite_vf_rss.py | 2 +- tests/TestSuite_vm_hotplug.py | 2 +- tests/TestSuite_vxlan.py | 2 +- tests/TestSuite_vxlan_sample.py | 2 +- 23 files changed, 142 insertions(+), 107 deletions(-) diff --git a/conf/test_case_checklist.json b/conf/test_case_checklist.json index 5c84004..dcf2f71 100644 --- a/conf/test_case_checklist.json +++ b/conf/test_case_checklist.json @@ -19,6 +19,7 @@ "cavium_a034", "cavium_a011", "fortpark_TLV", + "fortpark_TLV1", "carlsville" ], "Target": [ @@ -67,6 +68,7 @@ "cavium_a034", "cavium_a011", "fortpark_TLV", + "fortpark_TLV1", "carlsville" ], "Target": [ @@ -95,6 +97,7 @@ "cavium_a034", "cavium_a011", "fortpark_TLV", + "fortpark_TLV1", "carlsville" ], "Target": [ @@ -116,6 +119,7 @@ "fortville_25g", "springville", "fortpark_TLV", + "fortpark_TLV1", "carlsville" ], "Target": [ @@ -145,6 +149,7 @@ "cavium_a034", "cavium_a011", "fortpark_TLV", + "fortpark_TLV1", "carlsville" ], "Target": [ @@ -172,6 +177,7 @@ "cavium_a034", "cavium_a011", "fortpark_TLV", + "fortpark_TLV1", "carlsville" ], "Target": [ @@ -198,6 +204,7 @@ "cavium_a034", "cavium_a011", "fortpark_TLV", + "fortpark_TLV1", "carlsville" ], "Target": [ @@ -224,6 +231,7 @@ "cavium_a034", "cavium_a011", "fortpark_TLV", + "fortpark_TLV1", "carlsville" ], "Target": [ @@ -252,6 +260,7 @@ "cavium_a034", "cavium_a011", "fortpark_TLV", + "fortpark_TLV1", "carlsville" ], "Target": [ @@ -275,6 +284,7 @@ "springville", "fortville_25g", "fortpark_TLV", + "fortpark_TLV1", "cavium_a063", "cavium_a064", "carlsville", @@ -299,6 +309,7 @@ "fortville_spirit_single", "fortville_25g", "fortpark_TLV", + "fortpark_TLV1", "cavium_a063", "cavium_a064", "carlsville", @@ -405,7 +416,8 @@ "springville", "cavium_a034", "cavium_0011", - "fortpark_TLV" + "fortpark_TLV", + "fortpark_TLV1" ], "Target": [ "ALL" @@ -442,6 +454,7 @@ "springville", "cavium_a034", "cavium_0011", + "fortpark_TLV1", "fortpark_TLV" ], "Target": [ @@ -517,6 +530,7 @@ "fortville_spirit_single", "fortville_25g", "fortpark_TLV", + "fortpark_TLV1", "sagepond", "sageville", "carlsville", @@ -541,6 +555,7 @@ "fortville_spirit_single", "fortville_25g", "fortpark_TLV", + "fortpark_TLV1", "sagepond", "sageville", "carlsville", @@ -1999,6 +2014,7 @@ "fortville_25g", "fortpark", "fortpark_TLV", + "fortpark_TLV1", "fortpark_TLV_vf" ], "Target": [ @@ -2163,6 +2179,7 @@ "cavium_a063", "fortville_25g", "fortpark_TLV", + "fortpark_TLV1", "cavium_a064", "carlsville" ], @@ -2255,6 +2272,7 @@ "fortville_25g", "fortpark", "fortpark_TLV", + "fortpark_TLV1", "cavium_a063", "fortpark_TLV_vf", "cavium_a064", diff --git a/conf/test_case_supportlist.json b/conf/test_case_supportlist.json index 8d30513..9a6de8d 100644 --- a/conf/test_case_supportlist.json +++ b/conf/test_case_supportlist.json @@ -179,8 +179,9 @@ "fortville_eagle", "fortville_spirit", "fortville_spirit_single", - "fortpark_TLV", - "carlsville", + "fortpark_TLV", + "fortpark_TLV1", + "carlsville", "columbiaville_25g", "columbiaville_100g" ], @@ -582,6 +583,7 @@ "fortville_25g", "fortpark", "fortpark_TLV", + "fortpark_TLV1", "fortpark_TLV_vf", "fvl10g_vf", "carlsville" @@ -603,7 +605,8 @@ "fortville_spirit", "fortville_spirit_single", "fortville_25g", - "fortpark_TLV" + "fortpark_TLV", + "fortpark_TLV1" ], "Target": [ "ALL" @@ -622,7 +625,8 @@ "fortville_spirit", "fortville_spirit_single", "fortville_25g", - "fortpark_TLV" + "fortpark_TLV", + "fortpark_TLV1" ], "Target": [ "ALL" @@ -641,7 +645,8 @@ "fortville_spirit", "fortville_spirit_single", "fortville_25g", - "fortpark_TLV" + "fortpark_TLV", + "fortpark_TLV1" ], "Target": [ "ALL" @@ -660,7 +665,8 @@ "fortville_spirit", "fortville_spirit_single", "fortville_25g", - "fortpark_TLV" + "fortpark_TLV", + "fortpark_TLV1" ], "Target": [ "ALL" @@ -698,7 +704,8 @@ "fortville_spirit_single", "fortville_25g", "fortpark", - "fortpark_TLV" + "fortpark_TLV", + "fortpark_TLV1" ], "Target": [ "ALL" @@ -716,7 +723,8 @@ "fortville_eagle", "fortville_spirit", "fortville_spirit_single", - "fortpark_TLV" + "fortpark_TLV", + "fortpark_TLV1" ], "Target": [ "ALL" @@ -806,7 +814,8 @@ "fortville_eagle", "fortville_spirit", "fortville_spirit_single", - "fortpark_TLV" + "fortpark_TLV", + "fortpark_TLV1" ], "Target": [ "ALL" @@ -824,7 +833,8 @@ "fortville_eagle", "fortville_spirit", "fortville_spirit_single", - "fortpark_TLV" + "fortpark_TLV", + "fortpark_TLV1" ], "Target": [ "ALL" @@ -846,7 +856,8 @@ "fortville_eagle", "fortville_spirit", "fortville_spirit_single", - "fortpark_TLV" + "fortpark_TLV", + "fortpark_TLV1" ], "Target": [ "ALL" @@ -881,7 +892,8 @@ "fortville_eagle", "fortville_spirit", "fortville_spirit_single", - "fortpark_TLV" + "fortpark_TLV", + "fortpark_TLV1" ], "Target": [ "ALL" @@ -908,6 +920,7 @@ "fortville_spirit", "fortville_spirit_single", "fortpark_TLV", + "fortpark_TLV1", "carlsville" ], "Target": [ @@ -962,7 +975,8 @@ "fortville_eagle", "fortville_spirit", "fortville_spirit_single", - "fortpark_TLV" + "fortpark_TLV", + "fortpark_TLV1" ], "Target": [ "ALL" @@ -980,7 +994,8 @@ "fortville_eagle", "fortville_spirit", "fortville_spirit_single", - "fortpark_TLV" + "fortpark_TLV", + "fortpark_TLV1" ], "Target": [ "ALL" diff --git a/framework/settings.py b/framework/settings.py index d322c00..4aacd1d 100644 --- a/framework/settings.py +++ b/framework/settings.py @@ -85,6 +85,7 @@ NICS = { 'fortpark': '8086:374c', 'fortpark_1g': '8086:37d1', 'fortpark_TLV': '8086:37d0', + 'fortpark_TLV1': '8086:37d2', 'fortpark_TLV_vf': '8086:37cd', 'fvl10g_vf': '8086:154c', 'atwood': '8086:15d5', @@ -148,6 +149,7 @@ DRIVERS = { 'fortpark': 'i40e', 'fortpark_1g': 'i40e', 'fortpark_TLV': 'i40e', + 'fortpark_TLV1': 'i40e', 'fortpark_TLV_vf': 'i40evf', 'fvl10g_vf': 'i40evf', 'atwood': 'fm10k', diff --git a/tests/TestSuite_dual_vlan.py b/tests/TestSuite_dual_vlan.py index 8f22d98..f6bb078 100644 --- a/tests/TestSuite_dual_vlan.py +++ b/tests/TestSuite_dual_vlan.py @@ -104,7 +104,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", "fortville_25g", "fortpark_TLV", "carlsville"]: + if self.nic in ["fortville_eagle", "fortville_spirit", "fortville_spirit_single", "fortville_25g", "fortpark_TLV", "carlsville","fortpark_TLV1",]: self.dut.send_expect("vlan set filter on all", "testpmd> ") self.dut.send_expect("set promisc all off", "testpmd> ") @@ -149,7 +149,7 @@ class TestDualVlan(TestCase): """ for mode in modeName: - if self.nic in ["fortville_eagle", "fortville_spirit", "fortville_spirit_single", "fortville_25g", "fortpark_TLV", "carlsville"]: + if self.nic in ["fortville_eagle", "fortville_spirit", "fortville_spirit_single", "fortville_25g", "fortpark_TLV", "carlsville","fortpark_TLV1"]: # fortville NIC vlan filter can't close, if want close need remove rx_vlan if mode == "filter": if modeName[mode] == "off": @@ -166,7 +166,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", "fortville_25g","fortpark_TLV", "carlsville"]: + if self.nic in ["fortville_eagle", "fortville_spirit", "fortville_spirit_single", "fortville_25g","fortpark_TLV", "carlsville","fortpark_TLV1",]: # fortville NIC vlan filter can't close, if want close need remove rx_vlan if mode == "filter": if modeName[mode] == "off": @@ -286,7 +286,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 ["columbiaville_25g", "columbiaville_100g", "fortville_eagle", "fortville_spirit", "fortville_spirit_single", "fortville_25g", "fortpark_TLV", "carlsville"]: + if self.nic not in ["columbiaville_25g", "columbiaville_100g", "fortville_eagle", "fortville_spirit", "fortville_spirit_single", "fortville_25g", "fortpark_TLV", "carlsville","fortpark_TLV1"]: self.mode_config(filter="off") self.vlan_send_packet(outvlan) out = self.get_tcpdump_package() @@ -325,7 +325,7 @@ class TestDualVlan(TestCase): self.mode_config(filter="off") self.mode_config(extend="off") self.mode_config(strip="on") - if self.nic in [ "columbiaville_25g", "columbiaville_100g", "fortville_eagle", "fortville_spirit", "fortville_spirit_single", "fortville_25g", "fortpark_TLV", "carlsville"]: + if self.nic in [ "columbiaville_25g", "columbiaville_100g", "fortville_eagle", "fortville_spirit", "fortville_spirit_single", "fortville_25g", "fortpark_TLV", "carlsville","fortpark_TLV1"]: self.dut.send_expect('rx_vlan add %s %s' % (outvlan, dutRxPortId), "testpmd> ") self.vlan_send_packet(outvlan) out = self.get_tcpdump_package() @@ -335,20 +335,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 ["columbiaville_25g", "columbiaville_100g", "fortville_eagle", "fortville_spirit", "fortville_spirit_single", "fortville_25g", "fortpark_TLV", "carlsville"]: + if self.nic in ["columbiaville_25g", "columbiaville_100g", "fortville_eagle", "fortville_spirit", "fortville_spirit_single", "fortville_25g", "fortpark_TLV", "carlsville","fortpark_TLV1"]: 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 ["columbiaville_25g", "columbiaville_100g", "fortville_eagle", "fortville_spirit", "fortville_spirit_single", "fortville_25g", "fortpark_TLV", "cavium_a063", "cavium_a064", "carlsville"], "%s NIC not support queue vlan strip " % self.nic) + self.verify(self.nic not in ["columbiaville_25g", "columbiaville_100g", "fortville_eagle", "fortville_spirit", "fortville_spirit_single", "fortville_25g", "fortpark_TLV","fortpark_TLV1", "cavium_a063", "cavium_a064", "carlsville"], "%s NIC not support queue vlan strip " % self.nic) self.mode_config(filter="off") self.mode_config(extend="off") self.mode_config(strip="off") self.mode_config(stripq="off") - if self.nic in ["fortville_eagle", "fortville_spirit", "fortville_spirit_single", "fortville_25g", "fortpark_TLV", "carlsville"]: + if self.nic in ["fortville_eagle", "fortville_spirit", "fortville_spirit_single", "fortville_25g", "fortpark_TLV", "fortpark_TLV1","carlsville"]: self.dut.send_expect('rx_vlan add %s %s' % (outvlan, dutRxPortId), "testpmd> ") self.vlan_send_packet(outvlan) out = self.get_tcpdump_package() @@ -364,7 +364,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 ["columbiaville_25g", "columbiaville_100g", "fortville_eagle", "fortville_spirit", "fortville_spirit_single", "fortville_25g", "fortpark_TLV", "carlsville"]: + if self.nic in ["columbiaville_25g", "columbiaville_100g", "fortville_eagle", "fortville_spirit", "fortville_spirit_single", "fortville_25g", "fortpark_TLV","fortpark_TLV1" "carlsville"]: self.dut.send_expect('rx_vlan rm %s %s' % (outvlan, dutRxPortId), "testpmd> ") def test_vlan_insert_config(self): @@ -404,7 +404,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", "hartwell", "carlsville"], "%s NIC not support tcpid " % self.nic) + self.verify(self.nic not in ["columbiaville_25g", "columbiaville_100g", "fortville_eagle", "fortville_spirit", "fortville_spirit_single", "fortville_25g", "fortpark_TLV","fortpark_TLV1" ,"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_fdir.py b/tests/TestSuite_fdir.py index aa46637..b74ae28 100644 --- a/tests/TestSuite_fdir.py +++ b/tests/TestSuite_fdir.py @@ -90,7 +90,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", "fortpark_TLV", "fortville_25g", "carlsville"]): + if(self.nic in ["kawela", "niantic", "fortville_eagle", "fortville_spirit", "fortville_spirit_single", "fortpark_TLV","fortpark_TLV1", "fortville_25g", "carlsville"]): if ("fwd" == self.fdir_type): if condition: self.queue = 2 @@ -219,7 +219,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", "fortpark_TLV", "fortville_25g", "carlsville"]): + if(self.nic in ["fortville_eagle", "fortville_spirit", "fortville_spirit_single", "fortpark_TLV","fortpark_TLV1", "fortville_25g", "carlsville"]): 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>") @@ -235,7 +235,7 @@ class TestFdir(TestCase, IxiaPacketGenerator): Fdir get flexbytes and payload according NIC """ - if(self.nic in ["fortville_eagle", "fortville_spirit", "fortville_spirit_single", "fortpark_TLV", "fortville_25g", "carlsville"]): + if(self.nic in ["fortville_eagle", "fortville_spirit", "fortville_spirit_single", "fortpark_TLV", "fortpark_TLV1","fortville_25g", "carlsville"]): if not sctp: self.flexbytes = "0x11,0x11,0x22,0x22,0x33,0x33,0x44,0x44,0x55,0x55,0x66,0x66,0x77,0x77,0x77,0x77" else: @@ -313,7 +313,7 @@ class TestFdir(TestCase, IxiaPacketGenerator): # ipv4 frag # ip-frag only support in fortville - if (self.nic in ["fortville_eagle", "fortville_spirit", "fortville_spirit_single", "fortpark_TLV", "fortville_25g", "carlsville"]): + if (self.nic in ["fortville_eagle", "fortville_spirit", "fortville_spirit_single", "fortpark_TLV","fortpark_TLV1", "fortville_25g", "carlsville"]): 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)) @@ -332,7 +332,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, utils.create_mask([self.dut_ports[0]])), "testpmd>", 120) - elif self.nic in ["fortville_eagle", "fortville_spirit", "fortville_spirit_single", "fortpark_TLV", "fortville_25g", "carlsville"]: + elif self.nic in ["fortville_eagle", "fortville_spirit", "fortville_spirit_single", "fortpark_TLV", "fortpark_TLV1","fortville_25g", "carlsville"]: # 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, utils.create_mask([self.dut_ports[0]])), "testpmd>", 120) self.dut.send_expect("set verbose 1", "testpmd>") @@ -389,7 +389,7 @@ class TestFdir(TestCase, IxiaPacketGenerator): # ipv6 frag # ip-frag only support in fortville - if (self.nic in ["fortville_eagle", "fortville_spirit", "fortville_spirit_single", "fortpark_TLV", "fortville_25g", "carlsville"]): + if (self.nic in ["fortville_eagle", "fortville_spirit", "fortville_spirit_single", "fortpark_TLV","fortpark_TLV1", "fortville_25g", "carlsville"]): 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)) @@ -457,7 +457,7 @@ class TestFdir(TestCase, IxiaPacketGenerator): # ipv4 frag # ip-frag only support in fortville - if (self.nic in ["fortville_eagle", "fortville_spirit", "fortville_spirit_single", "fortpark_TLV", "fortville_25g", "carlsville"]): + if (self.nic in ["fortville_eagle", "fortville_spirit", "fortville_spirit_single", "fortpark_TLV","fortpark_TLV1", "fortville_25g", "carlsville"]): 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>") @@ -476,7 +476,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", "fortpark_TLV", "fortville_25g", "carlsville"]: + if self.nic in ["fortville_eagle", "fortville_spirit", "fortville_spirit_single", "fortpark_TLV", "fortpark_TLV1","fortville_25g", "carlsville"]: # drop command testing self.dut.kill_all() @@ -579,7 +579,7 @@ class TestFdir(TestCase, IxiaPacketGenerator): # ipv4 frag # ip-frag only support fortville - if (self.nic in ["fortville_eagle", "fortville_spirit", "fortville_spirit_single", "fortpark_TLV", "fortville_25g", "carlsville"]): + if (self.nic in ["fortville_eagle", "fortville_spirit", "fortville_spirit_single", "fortpark_TLV", "fortpark_TLV1","fortville_25g", "carlsville"]): 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)) @@ -617,7 +617,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, utils.create_mask([self.dut_ports[0]])), "testpmd>", 120) - elif self.nic in ["fortville_eagle", "fortville_spirit", "fortville_spirit_single", "fortpark_TLV", "fortville_25g", "carlsville"]: + elif self.nic in ["fortville_eagle", "fortville_spirit", "fortville_spirit_single", "fortpark_TLV","fortpark_TLV1", "fortville_25g", "carlsville"]: # 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, utils.create_mask([self.dut_ports[0]])), "testpmd>", 120) self.dut.send_expect("set verbose 1", "testpmd>") @@ -673,7 +673,7 @@ class TestFdir(TestCase, IxiaPacketGenerator): # ipv6 frag # ip-frag only support fortville - if (self.nic in ["fortville_eagle", "fortville_spirit", "fortville_spirit_single", "fortpark_TLV", "fortville_25g", "carlsville"]): + if (self.nic in ["fortville_eagle", "fortville_spirit", "fortville_spirit_single", "fortpark_TLV","fortpark_TLV1", "fortville_25g", "carlsville"]): 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)) @@ -723,7 +723,7 @@ class TestFdir(TestCase, IxiaPacketGenerator): # ipv4 frag # ip-frag only support fortville - if (self.nic in ["fortville_eagle", "fortville_spirit", "fortville_spirit_single", "fortpark_TLV", "fortville_25g", "carlsville"]): + if (self.nic in ["fortville_eagle", "fortville_spirit", "fortville_spirit_single", "fortpark_TLV","fortpark_TLV1", "fortville_25g", "carlsville"]): 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>") @@ -742,7 +742,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", "fortpark_TLV", "fortville_25g", "carlsville"]): + if (self.nic in ["fortville_eagle", "fortville_spirit", "fortville_spirit_single", "fortpark_TLV", "fortpark_TLV1","fortville_25g", "carlsville"]): # 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, utils.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 8d674ee..782983d 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", "fortville_25g", "fortpark_TLV", "carlsville"]: + if self.nic not in ["fortville_eagle", "fortville_spirit", "fortville_spirit_single", "fortville_25g", "fortpark_TLV","fortpark_TLV1", "carlsville"]: self.dut.send_expect( "set stat_qmap rx %s 0 0" % valports[0], "testpmd> ") self.dut.send_expect( @@ -372,7 +372,7 @@ class TestGeneric_filter(TestCase): self.verify(self.nic in ["niantic", "kawela_4", "bartonhills", "powerville", "fortville_eagle", "fortville_spirit", - "fortville_spirit_single", "fortpark_TLV", "fortville_25g","cavium_a063", "carlsville"], "%s nic not support syn filter" % self.nic) + "fortville_spirit_single", "fortpark_TLV","fortpark_TLV1", "fortville_25g","cavium_a063", "carlsville"], "%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() @@ -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", "carlsville"], "%s nic not support this test" % self.nic) + self.verify(self.nic not in ["fortville_eagle", "fortville_spirit", "fortville_spirit_single", "fortville_25g", "fortpark_TLV","fortpark_TLV1", "carlsville"], "%s nic not support this test" % self.nic) if (self.nic in ["cavium_a063", "cavium_a064"]): 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 bb42bf7..df44c46 100644 --- a/tests/TestSuite_generic_flow_api.py +++ b/tests/TestSuite_generic_flow_api.py @@ -287,12 +287,12 @@ class TestGeneric_flow_api(TestCase): if "validate" in flow_cmd: # ethertype invalid or queue id exceeds max queue number. 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", + if self.nic in ["fortville_eagle", "fortville_spirit", "fortville_spirit_single", "fortpark_TLV","fortpark_TLV1", "niantic", "kawela_4", "kawela", "bartonhills", "twinville", "sagepond", "sageville", "powerville"]: 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"]: + if self.nic in ["fortville_eagle", "fortville_spirit", "fortville_spirit_single", "fortpark_TLV","fortpark_TLV1"]: 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 ( @@ -304,12 +304,12 @@ class TestGeneric_flow_api(TestCase): elif "create" in flow_cmd: # ethertype invalid or queue id exceeds max queue number. 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", + if self.nic in ["fortville_eagle", "fortville_spirit", "fortville_spirit_single", "fortpark_TLV","fortpark_TLV1", "niantic", "kawela_4", "kawela", "bartonhills", "twinville", "sagepond", "sageville", "powerville"]: 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"]: + if self.nic in ["fortville_eagle", "fortville_spirit", "fortville_spirit_single", "fortpark_TLV","fortpark_TLV1"]: 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 ( @@ -772,7 +772,7 @@ class TestGeneric_flow_api(TestCase): """ self.verify(self.nic in ["niantic", "columbiaville_25g","columbiaville_100g","kawela_4", "kawela", "bartonhills", "twinville", "sagepond", "sageville", "powerville", "fortville_eagle", "fortville_spirit", - "fortville_spirit_single", "fortpark_TLV"], "%s nic not support ethertype filter" % self.nic) + "fortville_spirit_single", "fortpark_TLV","fortpark_TLV1"], "%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) self.dut.send_expect("set fwd rxonly", "testpmd> ", 120) @@ -782,7 +782,7 @@ class TestGeneric_flow_api(TestCase): # i40e,ixgbe and igb support different packet types. if (self.nic in ["fortville_eagle", "fortville_spirit", - "fortville_spirit_single", "fortpark_TLV","columbiaville_25g","columbiaville_100g"]): + "fortville_spirit_single", "fortpark_TLV","fortpark_TLV1","columbiaville_25g","columbiaville_100g"]): basic_flow_actions = [ {'create': 'validate', 'flows': ['ether', 'arp'], 'actions': ['queue']}, @@ -868,7 +868,7 @@ class TestGeneric_flow_api(TestCase): only supported by i40e """ self.verify(self.nic in ["fortville_eagle", "fortville_spirit", - "fortville_spirit_single", "fortpark_TLV"], "%s nic not support fdir L2 payload filter" % self.nic) + "fortville_spirit_single", "fortpark_TLV","fortpark_TLV1"], "%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) self.dut.send_expect("set fwd rxonly", "testpmd> ", 120) @@ -889,7 +889,7 @@ class TestGeneric_flow_api(TestCase): only supported by i40e """ self.verify(self.nic in ["fortville_eagle", "fortville_spirit", - "fortville_spirit_single", "fortpark_TLV"], "%s nic not support fdir vlan filter" % self.nic) + "fortville_spirit_single", "fortpark_TLV","fortpark_TLV1"], "%s nic not support fdir vlan filter" % self.nic) 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) @@ -981,11 +981,11 @@ class TestGeneric_flow_api(TestCase): """ self.verify(self.nic in ["niantic", "columbiaville_25g","columbiaville_100g","twinville", "sagepond", "sageville", "fortville_eagle", "fortville_spirit", - "fortville_spirit_single", "fortpark_TLV"], + "fortville_spirit_single", "fortpark_TLV","fortpark_TLV1"], "%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"]): + "fortville_spirit_single", "fortpark_TLV","fortpark_TLV1"]): 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) @@ -1090,11 +1090,11 @@ class TestGeneric_flow_api(TestCase): """ self.verify(self.nic in ["niantic", "twinville", "sagepond", "sageville","columbiaville_25g","columbiaville_100g", "fortville_eagle", "fortville_spirit", - "fortville_spirit_single", "fortpark_TLV"], + "fortville_spirit_single", "fortpark_TLV","fortpark_TLV1"], "%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"]): + "fortville_spirit_single", "fortpark_TLV","fortpark_TLV1"]): 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) @@ -1210,11 +1210,11 @@ class TestGeneric_flow_api(TestCase): """ self.verify(self.nic in ["niantic", "twinville", "sagepond", "sageville", "fortville_eagle", "fortville_spirit", - "fortville_spirit_single", "fortpark_TLV"], + "fortville_spirit_single", "fortpark_TLV","fortpark_TLV1"], "%s nic not support fdir flexbytes filter" % self.nic) # i40e if (self.nic in ["fortville_eagle", "fortville_spirit", - "fortville_spirit_single", "fortpark_TLV"]): + "fortville_spirit_single", "fortpark_TLV","fortpark_TLV1"]): 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) self.dut.send_expect("set verbose 1", "testpmd> ", 120) @@ -1538,7 +1538,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"], + "fortville_spirit_single", "fortpark_TLV","fortpark_TLV1"], "%s nic not support tunnel vxlan filter" % self.nic) self.setup_env() @@ -1602,7 +1602,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"], + "fortville_spirit_single", "fortpark_TLV","fortpark_TLV1"], "%s nic not support tunnel nvgre filter" % self.nic) self.setup_env() diff --git a/tests/TestSuite_l2fwd_jobstats.py b/tests/TestSuite_l2fwd_jobstats.py index 0881d05..7a7b48b 100644 --- a/tests/TestSuite_l2fwd_jobstats.py +++ b/tests/TestSuite_l2fwd_jobstats.py @@ -48,7 +48,7 @@ class TestL2fwdJobstats(TestCase): """ self.verify(self.nic not in ["fortville_eagle", "fortville_spirit", - "fortville_spirit_single", "fortville_25g", "fortpark_TLV"], + "fortville_spirit_single", "fortville_25g", "fortpark_TLV","fortpark_TLV1"], "NIC Unsupported: " + str(self.nic)) self.dut_ports = self.dut.get_ports(self.nic) self.verify(len(self.dut_ports) >= 2, "Insufficient ports") diff --git a/tests/TestSuite_nvgre.py b/tests/TestSuite_nvgre.py index a841e85..17d3074 100644 --- a/tests/TestSuite_nvgre.py +++ b/tests/TestSuite_nvgre.py @@ -361,7 +361,7 @@ class TestNvgre(TestCase): nvgre Prerequisites """ # this feature only enable in FVL now - if self.nic in ["fortville_eagle", "fortville_spirit", "fortville_spirit_single", "fortville_25g", "fortpark_TLV", "cavium_a063", "cavium_a064", "carlsville"]: + if self.nic in ["fortville_eagle", "fortville_spirit", "fortville_spirit_single", "fortville_25g", "fortpark_TLV","fortpark_TLV1", "cavium_a063", "cavium_a064", "carlsville"]: self.compile_switch = 'CONFIG_RTE_LIBRTE_I40E_INC_VECTOR' elif self.nic in ["sageville", "sagepond"]: self.compile_switch = 'CONFIG_RTE_IXGBE_INC_VECTOR' diff --git a/tests/TestSuite_pmdrss_hash.py b/tests/TestSuite_pmdrss_hash.py index e160364..f7a035b 100644 --- a/tests/TestSuite_pmdrss_hash.py +++ b/tests/TestSuite_pmdrss_hash.py @@ -415,12 +415,12 @@ class TestPmdrssHash(TestCase): self.verify(self.nic in ["columbiaville_25g", "columbiaville_100g","fortville_eagle", "fortville_spirit", "fortville_spirit_single", "redrockcanyou", "atwood", - "boulderrapid", "fortpark_TLV", "fortville_25g", "niantic", "carlsville"], + "boulderrapid", "fortpark_TLV", "fortpark_TLV1","fortville_25g", "niantic", "carlsville"], "NIC Unsupported: " + str(self.nic)) global reta_num global iptypes - if self.nic in ["fortville_eagle", "fortville_spirit", "fortville_spirit_single", "fortpark_TLV", "fortville_25g", "carlsville"]: + if self.nic in ["fortville_eagle", "fortville_spirit", "fortville_spirit_single", "fortpark_TLV", "fortpark_TLV1","fortville_25g", "carlsville"]: reta_num = 512 elif self.nic in ["niantic"]: reta_num = 128 @@ -614,7 +614,7 @@ class TestPmdrssHash(TestCase): # setup testpmd and finish bond config self.verify(self.nic in ["columbiaville_25g", "columbiaville_100g","fortville_eagle", "fortville_spirit", - "fortpark_TLV", "fortville_25g", "carlsville"], + "fortpark_TLV","fortpark_TLV1", "fortville_25g", "carlsville"], "NIC Unsupported: " + str(self.nic)) self.dut.send_expect("./%s/app/testpmd -c %s -n %d -- -i" % (self.target, self.coremask, self.dut.get_memory_channels()), "testpmd> ", 120) diff --git a/tests/TestSuite_pmdrssreta.py b/tests/TestSuite_pmdrssreta.py index 05e4e42..0c93277 100644 --- a/tests/TestSuite_pmdrssreta.py +++ b/tests/TestSuite_pmdrssreta.py @@ -259,7 +259,7 @@ class TestPmdrssreta(TestCase): self.dut.send_expect("quit", "# ", 30) def test_rss_key_size(self): - nic_rss_key_size = {"columbiaville_25g": 52, "columbiaville_100g": 52, "fortville_eagle": 52, "fortville_spirit": 52, "fortville_spirit_single": 52, "fortville_25g": 52, "niantic": 40, "e1000": 40, "redrockcanyou": 40, "atwood": 40, "boulderrapid": 40, "fortpark_TLV": 52, "hi1822": 40, "cavium_a063": 48, "cavium_a064": 48, "carlsville": 52, "sagepond": 40, "sageville": 40} + nic_rss_key_size = {"columbiaville_25g": 52, "columbiaville_100g": 52, "fortville_eagle": 52, "fortville_spirit": 52, "fortville_spirit_single": 52, "fortville_25g": 52, "niantic": 40, "e1000": 40, "redrockcanyou": 40, "atwood": 40, "boulderrapid": 40, "fortpark_TLV": 52,"fortpark_TLV1": 52, "hi1822": 40, "cavium_a063": 48, "cavium_a064": 48, "carlsville": 52, "sagepond": 40, "sageville": 40} self.verify(self.nic in list(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_ptype_mapping.py b/tests/TestSuite_ptype_mapping.py index f9e6ec6..44fe635 100644 --- a/tests/TestSuite_ptype_mapping.py +++ b/tests/TestSuite_ptype_mapping.py @@ -45,7 +45,7 @@ class TestPtype_Mapping(TestCase): Run at the start of each test suite. """ self.verify(self.nic in ['fortville_eagle', 'fortville_spirit', - 'fortville_spirit_single', 'fortville_25g', 'fortpark_TLV', 'carlsville', 'cavium_a063', 'cavium_a064'], + 'fortville_spirit_single', 'fortville_25g', 'fortpark_TLV', "fortpark_TLV1",'carlsville', 'cavium_a063', 'cavium_a064'], 'ptype mapping test can not support %s nic' % self.nic) ports = self.dut.get_ports() self.verify(len(ports) >= 1, "Insufficient ports for testing") diff --git a/tests/TestSuite_queue_region.py b/tests/TestSuite_queue_region.py index 518a050..36279d7 100644 --- a/tests/TestSuite_queue_region.py +++ b/tests/TestSuite_queue_region.py @@ -58,7 +58,7 @@ class TestQueue_region(TestCase): Queue region Prerequisites """ self.verify(self.nic in ["fortville_eagle", "fortville_spirit","fortville_25g", - "fortville_spirit_single", "fortpark_TLV", "carlsville"], "NIC Unsupported: " + str(self.nic)) + "fortville_spirit_single", "fortpark_TLV", "fortpark_TLV1","carlsville"], "NIC Unsupported: " + str(self.nic)) # Based on h/w type, choose how many ports to use self.dut_ports = self.dut.get_ports(self.nic) @@ -217,7 +217,7 @@ class TestQueue_region(TestCase): self.dut.send_expect("set port 0 queue-region region_id 2 flowtype 33", "testpmd> ") self.dut.send_expect("set port 0 queue-region region_id 4 flowtype 35", "testpmd> ") self.dut.send_expect("set port 0 queue-region region_id 6 flowtype 36", "testpmd> ") - if self.nic in ["fortpark_TLV"]: + if self.nic in ["fortpark_TLV","fortpark_TLV1"]: self.dut.send_expect("set port 0 queue-region region_id 2 flowtype 39", "testpmd> ") else: self.dut.send_expect("set port 0 queue-region region_id 2 flowtype 41", "testpmd> ") @@ -242,7 +242,7 @@ class TestQueue_region(TestCase): queue_udp = self.send_and_check(queue_region, mac=self.pf_mac, pkt_type="udp") # fortville can't parse the TCP SYN type packet, fortpark can parse it. - if(self.nic in ["fortpark_TLV"]): + if(self.nic in ["fortpark_TLV","fortpark_TLV1"]): queue_region = ["3", "4"] self.send_and_check(queue_region, mac=self.pf_mac, pkt_type="tcp", flags="S") else: @@ -265,7 +265,7 @@ class TestQueue_region(TestCase): # fortville can't parse the TCP SYN type packet, fortpark can parse it. # default is SYN mode. # not assign ipv4-tcp SYN packet to any queue region, the packet to queue region 0. - if(self.nic in ["fortpark_TLV"]): + if(self.nic in ["fortpark_TLV","fortpark_TLV1"]): queue_region = ["1"] queue_ipv6tcp = self.send_and_check(queue_region, mac=self.pf_mac, pkt_type="ipv6_tcp", flags="S") else: diff --git a/tests/TestSuite_rss_to_rte_flow.py b/tests/TestSuite_rss_to_rte_flow.py index 593d694..a450189 100644 --- a/tests/TestSuite_rss_to_rte_flow.py +++ b/tests/TestSuite_rss_to_rte_flow.py @@ -176,7 +176,7 @@ class TestRSS_to_Rteflow(TestCase): # Show port default RSS functions if (self.nic in ["fortville_eagle", "fortville_spirit", - "fortville_spirit_single", "fortpark_TLV", "fortville_25g"]): + "fortville_spirit_single", "fortpark_TLV","fortpark_TLV1", "fortville_25g"]): self.dut.send_expect( "show port 0 rss-hash", "ipv4-frag ipv4-other ipv6-frag ipv6-other ip") else: @@ -202,7 +202,7 @@ class TestRSS_to_Rteflow(TestCase): self.dut.send_expect( "flow create 0 ingress pattern end actions rss types all end / end", "created") if (self.nic in ["fortville_eagle", "fortville_spirit", - "fortville_spirit_single", "fortpark_TLV", "fortville_25g"]): + "fortville_spirit_single", "fortpark_TLV","fortpark_TLV1", "fortville_25g"]): self.dut.send_expect( "show port 0 rss-hash", "all ipv4-frag ipv4-tcp ipv4-udp ipv4-sctp ipv4-other ipv6-frag ipv6-tcp ipv6-udp ipv6-sctp ipv6-other l2-payload ip udp tcp sctp") else: @@ -225,7 +225,7 @@ class TestRSS_to_Rteflow(TestCase): # Show port default RSS fucntions if (self.nic in ["fortville_eagle", "fortville_spirit", - "fortville_spirit_single", "fortpark_TLV", "fortville_25g"]): + "fortville_spirit_single", "fortpark_TLV","fortpark_TLV1", "fortville_25g"]): self.dut.send_expect( "show port 0 rss-hash", "ipv4-frag ipv4-other ipv6-frag ipv6-other ip") else: @@ -239,7 +239,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", - "fortville_spirit_single", "fortpark_TLV", "fortville_25g"]): + "fortville_spirit_single", "fortpark_TLV","fortpark_TLV1", "fortville_25g"]): self.check_packet_queue("0", out) else: self.check_packet_queue("all", out) @@ -277,7 +277,7 @@ class TestRSS_to_Rteflow(TestCase): # ipv4-other and ipv6-other is enabled by default. # i40e if (self.nic in ["fortville_eagle", "fortville_spirit", - "fortville_spirit_single", "fortpark_TLV", "fortville_25g"]): + "fortville_spirit_single", "fortpark_TLV","fortpark_TLV1", "fortville_25g"]): rss_queue = ["1", "4", "7"] self.send_and_check(self.pkt4, rss_queue) self.send_and_check(self.pkt8, rss_queue) @@ -310,7 +310,7 @@ class TestRSS_to_Rteflow(TestCase): "flow create 0 ingress pattern end actions rss queues 3 end / end", "created") # Send the packets and verify the results if (self.nic in ["fortville_eagle", "fortville_spirit", - "fortville_spirit_single", "fortpark_TLV", "fortville_25g"]): + "fortville_spirit_single", "fortpark_TLV","fortpark_TLV1", "fortville_25g"]): rss_queue = ["3"] self.send_and_check(self.pkt4, rss_queue) self.send_and_check(self.pkt8, rss_queue) @@ -355,7 +355,7 @@ class TestRSS_to_Rteflow(TestCase): "flow create 0 ingress pattern end actions rss types udp ipv4-tcp ipv6-sctp ipv4-other end queues 1 4 7 end / end", "created") # send the packets and verify the results if (self.nic in ["fortville_eagle", "fortville_spirit", - "fortville_spirit_single", "fortpark_TLV", "fortville_25g"]): + "fortville_spirit_single", "fortpark_TLV","fortpark_TLV1", "fortville_25g"]): rss_queue = ["1", "4", "7"] self.send_and_check(self.pkt2, rss_queue) self.send_and_check(self.pkt3, rss_queue) @@ -393,7 +393,7 @@ class TestRSS_to_Rteflow(TestCase): """ # Only supported by i40e self.verify(self.nic in ["fortville_eagle", "fortville_spirit", - "fortville_spirit_single", "fortpark_TLV", "fortville_25g"], "NIC Unsupported: " + str(self.nic)) + "fortville_spirit_single", "fortpark_TLV","fortpark_TLV1", "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 pkt3 = "Ether(dst='%s')/IP(src='0.0.0.0',dst='4.0.0.0')/UDP(sport=101, dport=201)/('X'*48)" % self.pf_mac @@ -493,7 +493,7 @@ class TestRSS_to_Rteflow(TestCase): "flow create 0 ingress pattern end actions rss types ipv6-tcp ipv4-udp sctp ipv6-other end queues 5 6 7 end / end", "created") # send the packets and verify the results if (self.nic in ["fortville_eagle", "fortville_spirit", - "fortville_spirit_single", "fortpark_TLV", "fortville_25g"]): + "fortville_spirit_single", "fortpark_TLV","fortpark_TLV1", "fortville_25g"]): rss_queue = ["5", "6", "7"] self.send_and_check(self.pkt1, rss_queue) self.send_and_check(self.pkt2, rss_queue) @@ -569,7 +569,7 @@ class TestRSS_to_Rteflow(TestCase): Set RSS queue rule with queue region API. """ self.verify(self.nic in ["fortville_eagle", "fortville_spirit", - "fortville_spirit_single", "fortpark_TLV", "fortville_25g"], "NIC Unsupported: " + str(self.nic)) + "fortville_spirit_single", "fortpark_TLV","fortpark_TLV1", "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) self.dut.send_expect("set verbose 1", "testpmd> ", 120) @@ -613,7 +613,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", - "fortville_spirit_single", "fortpark_TLV", "fortville_25g"], "NIC Unsupported: " + str(self.nic)) + "fortville_spirit_single", "fortpark_TLV","fortpark_TLV1", "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) self.dut.send_expect("set verbose 1", "testpmd> ", 120) @@ -639,7 +639,7 @@ class TestRSS_to_Rteflow(TestCase): The queue region is priority to RSS queue rule. """ self.verify(self.nic in ["fortville_eagle", "fortville_spirit", - "fortville_spirit_single", "fortpark_TLV", "fortville_25g"], "NIC Unsupported: " + str(self.nic)) + "fortville_spirit_single", "fortpark_TLV","fortpark_TLV1", "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("port config all rss all", "testpmd> ", 120) self.dut.send_expect("set fwd rxonly", "testpmd> ", 120) diff --git a/tests/TestSuite_runtime_vf_queue_number_maxinum.py b/tests/TestSuite_runtime_vf_queue_number_maxinum.py index ae41944..2649e7f 100644 --- a/tests/TestSuite_runtime_vf_queue_number_maxinum.py +++ b/tests/TestSuite_runtime_vf_queue_number_maxinum.py @@ -47,7 +47,7 @@ class TestRuntimeVfQnMaxinum(TestCase): max_white_per_testpmd = 18 def set_up_all(self): - self.verify(self.nic in ["fortville_eagle", "fortville_spirit", "fortville_25g", "fortpark_TLV"], + self.verify(self.nic in ["fortville_eagle", "fortville_spirit", "fortville_25g", "fortpark_TLV","fortpark_TLV1"], "Only supported by Fortville") self.dut_ports = self.dut.get_ports(self.nic) self.verify(len(self.dut_ports) >= 1, 'Insufficient ports') @@ -72,7 +72,7 @@ class TestRuntimeVfQnMaxinum(TestCase): """ if self.nic in ['fortville_eagle']: self.dut.generate_sriov_vfs_by_port(self.used_dut_port, 32, driver=driver) - elif self.nic in ['fortville_25g', 'fortville_spirit', 'fortpark_TLV']: + elif self.nic in ['fortville_25g', 'fortville_spirit', 'fortpark_TLV',"fortpark_TLV1"]: self.dut.generate_sriov_vfs_by_port(self.used_dut_port, 64, driver=driver) self.sriov_vfs_port_0 = self.dut.ports_info[self.used_dut_port]['vfs_port'] @@ -156,7 +156,7 @@ class TestRuntimeVfQnMaxinum(TestCase): left_queues = 384 - 65 - 32 * 4 vf1_white_index = left_queues / 16 vf2_queue_number = left_queues % 16 - elif self.nic in ['fortville_25g', 'fortville_spirit', 'fortpark_TLV']: + elif self.nic in ['fortville_25g', 'fortville_spirit', 'fortpark_TLV',"fortpark_TLV1"]: left_queues = 768 - 65 - 64 * 4 vf1_white_index = left_queues / 16 vf2_queue_number = left_queues % 16 diff --git a/tests/TestSuite_rxtx_offload.py b/tests/TestSuite_rxtx_offload.py index 7facbf2..5237bec 100644 --- a/tests/TestSuite_rxtx_offload.py +++ b/tests/TestSuite_rxtx_offload.py @@ -89,7 +89,7 @@ class TestRxTx_Offload(TestCase): """ # Support i40e/ixgbe NICs self.verify(self.nic in ["fortville_eagle", "fortville_spirit","fortville_25g", - "fortville_spirit_single", "fortpark_TLV", + "fortville_spirit_single", "fortpark_TLV","fortpark_TLV1", "niantic", "twinpond", "sagepond", "sageville"], "NIC Unsupported: " + str(self.nic)) # Based on h/w type, choose how many ports to use self.dut_ports = self.dut.get_ports(self.nic) @@ -502,7 +502,7 @@ class TestRxTx_Offload(TestCase): self.dut.send_expect("set fwd txonly", "testpmd> ") self.dut.send_expect("set verbose 1", "testpmd> ") if (self.nic in ["fortville_eagle", "fortville_spirit","fortville_25g", - "fortville_spirit_single", "fortpark_TLV"]): + "fortville_spirit_single", "fortpark_TLV","fortpark_TLV1"]): self.dut.send_expect("port stop 0", "testpmd> ") self.dut.send_expect("port config 0 tx_offload mbuf_fast_free off", "testpmd> ") self.check_port_config("tx", "NULL") @@ -542,7 +542,7 @@ class TestRxTx_Offload(TestCase): self.dut.send_expect("set fwd txonly", "testpmd> ") self.dut.send_expect("set verbose 1", "testpmd> ") if (self.nic in ["fortville_eagle", "fortville_spirit","fortville_25g", - "fortville_spirit_single", "fortpark_TLV"]): + "fortville_spirit_single", "fortpark_TLV","fortpark_TLV1"]): self.dut.send_expect("port stop 0", "testpmd> ") self.dut.send_expect("port config 0 tx_offload mbuf_fast_free off", "testpmd> ") offload = ["vlan_insert"] @@ -657,7 +657,7 @@ class TestRxTx_Offload(TestCase): capabilities = self.check_port_capability("tx") # Disable per queue capability first, if it is FVL/Fortpark. if (self.nic in ["fortville_eagle", "fortville_spirit","fortville_25g", - "fortville_spirit_single", "fortpark_TLV"]): + "fortville_spirit_single", "fortpark_TLV","fortpark_TLV1"]): self.dut.send_expect("port stop 0", "testpmd> ") self.dut.send_expect("port config 0 tx_offload mbuf_fast_free off", "testpmd> ") self.dut.send_expect("port start 0", "testpmd> ") @@ -676,7 +676,7 @@ class TestRxTx_Offload(TestCase): """ # Only support i40e NICs self.verify(self.nic in ["fortville_eagle", "fortville_spirit","fortville_25g", - "fortville_spirit_single", "fortpark_TLV"], "%s nic not support rx offload setting by queue." % self.nic) + "fortville_spirit_single", "fortpark_TLV","fortpark_TLV1"], "%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") offload = ["mbuf_fast_free"] diff --git a/tests/TestSuite_scatter.py b/tests/TestSuite_scatter.py index c2af5f2..394459c 100644 --- a/tests/TestSuite_scatter.py +++ b/tests/TestSuite_scatter.py @@ -66,7 +66,7 @@ class TestScatter(TestCase): if self.nic in ["magnolia_park", "niantic", "sageville", "fortpark", "fortville_eagle", "fortville_spirit", "fortville_spirit_single", "fortville_25g", "x722_37d2", "redrockcanyou", "atwood", "boulderrapid", - "ironpond", "twinpond", "springfountain", "fortpark_TLV", "sagepond", "carlsville"]: + "ironpond", "twinpond", "springfountain", "fortpark_TLV","fortpark_TLV1", "sagepond", "carlsville"]: self.mbsize = 2048 else: self.mbsize = 1024 diff --git a/tests/TestSuite_uni_pkt.py b/tests/TestSuite_uni_pkt.py index fbca8df..9088ca8 100644 --- a/tests/TestSuite_uni_pkt.py +++ b/tests/TestSuite_uni_pkt.py @@ -96,7 +96,7 @@ class TestUniPacket(TestCase): """ Check whether L2 packet can be detected" """ - self.verify(("fortville" in self.nic or "fortpark_TLV" in self.nic or "carlsville" in self.nic or "columbiaville" in self.nic), + self.verify(("fortville" in self.nic or "fortpark_TLV" in self.nic or "carlsville" in self.nic or "columbiaville" in self.nic or "fortpark_TLV1" in self.nic), "L2 packet detect only support by Fortville") #Change this code start for DPDK-15109, the share code doest not support TIMESYNC, once /supported then will enable if "columbiaville" in self.nic: @@ -128,7 +128,7 @@ class TestUniPacket(TestCase): """ if "fortville" in self.nic or "fortpark_TLV" in self.nic or \ "carlsville" in self.nic or "columbiaville" in self.nic or \ - "x722" in self.nic: + "x722" in self.nic or "fortpark_TLV1" in self.nic : outerL4Type = "L4_NONFRAG" ipv4_default_packet_type = ["L2_ETHER", "L3_IPV4_EXT_UNKNOWN"] elif "niantic" in self.nic.lower() or "powerville" in self.nic.lower() or "cavium" in self.nic.lower() or "twinpond" in self.nic.lower() or "twinville" in self.nic.lower() or "sageville" in self.nic.lower() or "sagepond" in self.nic.lower() or "springville" in self.nic.lower(): @@ -148,7 +148,7 @@ class TestUniPacket(TestCase): # delete the unsupported packet based on nic type if "fortville" in self.nic or "fortpark_TLV" in self.nic or \ "carlsville" in self.nic or "columbiaville" in self.nic or \ - "x722" in self.nic: + "x722" in self.nic or "fortpark_TLV1" in self.nic: pktType.pop("MAC_IPihl_PKT") pktType.pop("MAC_IPihl_SCTP_PKT") elif "niantic" in self.nic.lower() or "powerville" in self.nic.lower() or "cavium" in self.nic.lower() or "twinpond" in self.nic.lower() or "twinville" in self.nic.lower() or "sageville" in self.nic.lower() or "sagepond" in self.nic.lower() or "springville" in self.nic.lower(): @@ -163,7 +163,7 @@ class TestUniPacket(TestCase): """ if "fortville" in self.nic or "fortpark_TLV" in self.nic or \ "carlsville" in self.nic or "columbiaville" in self.nic or \ - "x722" in self.nic: + "x722" in self.nic or "fortpark_TLV1" in self.nic: outerL4Type = "L4_NONFRAG" ipv6_default_packet_type = ["L2_ETHER", "L3_IPV6_EXT_UNKNOWN"] elif "niantic" in self.nic.lower() or "powerville" in self.nic.lower() or "cavium" in self.nic.lower() or "twinpond" in self.nic.lower() or "twinville" in self.nic.lower() or "sageville" in self.nic.lower() or "sagepond" in self.nic.lower() or "springville" in self.nic.lower(): @@ -181,7 +181,7 @@ class TestUniPacket(TestCase): # delete the unsupported packet based on nic type if "fortville" in self.nic or "fortpark_TLV" in self.nic or \ "carlsville" in self.nic or "columbiaville" in self.nic or \ - "x722" in self.nic: + "x722" in self.nic or "fortpark_TLV1" in self.nic: pktType.pop("MAC_IPv6FRAG_PKT_N") elif "niantic" in self.nic.lower() or "powerville" in self.nic.lower() or "cavium" in self.nic.lower() or "twinpond" in self.nic.lower() or "twinville" in self.nic.lower() or "sageville" in self.nic.lower() or "sagepond" in self.nic.lower() or "springville" in self.nic.lower(): pktType.pop("MAC_IPv6FRAG_PKT_F") @@ -193,7 +193,7 @@ class TestUniPacket(TestCase): checked that whether IP in IPv4 tunnel packet can be normally detected by Fortville. """ - self.verify(("fortville" in self.nic or "fortpark_TLV" in self.nic or "carlsville" in self.nic or "columbiaville" in self.nic), + self.verify(("fortville" in self.nic or "fortpark_TLV" in self.nic or "carlsville" in self.nic or "columbiaville" in self.nic or "fortpark_TLV1" in self.nic), "IP in IPv4 tunnel packet type detect only support by Fortville") ipv4_in_ipv4_packet_type = ["L2_ETHER", "L3_IPV4_EXT_UNKNOWN", "TUNNEL_IP", "INNER_L3_IPV4_EXT_UNKNOWN"] ipv6_in_ipv4_packet_type = ["L2_ETHER", "L3_IPV4_EXT_UNKNOWN", "TUNNEL_IP", "INNER_L3_IPV6_EXT_UNKNOWN"] @@ -220,7 +220,7 @@ class TestUniPacket(TestCase): checked that whether IPv4 in IPv6 tunnel packet can be normally detected. """ - self.verify(self.nic in ["columbiaville_25g", "columbiaville_100g", "niantic", "fortville_eagle", "fortville_spirit","powerville", "fortpark_TLV", + self.verify(self.nic in ["columbiaville_25g", "columbiaville_100g", "niantic", "fortville_eagle", "fortville_spirit","powerville", "fortpark_TLV","fortpark_TLV1", "fortville_25g", "fortville_spirit_single", "carlsville"], "not support %s" % self.nic) pktType = { "MAC_IP_IPv6_PKT": ["L2_ETHER", "L3_IPV4", "TUNNEL_IP", "INNER_L3_IPV6"], @@ -237,7 +237,7 @@ class TestUniPacket(TestCase): checked that whether IP in IPv6 tunnel packet can be normally detected by Fortville. """ - self.verify(("fortville" in self.nic or "fortpark_TLV" in self.nic or "carlsville" in self.nic or "columbiaville" in self.nic), + self.verify(("fortville" in self.nic or "fortpark_TLV" in self.nic or "carlsville" in self.nic or "columbiaville" in self.nic or "fortpark_TLV1" in self.nic), "IP in IPv6 tunnel packet type detect only support by Fortville") ipv4_in_ipv6_packet_type = ["L2_ETHER", "L3_IPV4_EXT_UNKNOWN", "TUNNEL_IP", "INNER_L3_IPV4_EXT_UNKNOWN"] ipv6_in_ipv6_packet_type = ["L2_ETHER", "L3_IPV4_EXT_UNKNOWN", "TUNNEL_IP", "INNER_L3_IPV6_EXT_UNKNOWN"] @@ -263,7 +263,7 @@ class TestUniPacket(TestCase): checked that whether NVGRE tunnel packet can be normally detected by Fortville. """ - self.verify(("fortville" in self.nic or "fortpark_TLV" in self.nic or "carlsville" in self.nic or "columbiaville" in self.nic), + self.verify(("fortville" in self.nic or "fortpark_TLV" in self.nic or "carlsville" in self.nic or "columbiaville" in self.nic or "fortpark_TLV1" in self.nic), "NVGRE tunnel packet type detect only support by Fortville") nvgre_base_packet_type = ["L2_ETHER", "L3_IPV4_EXT_UNKNOWN", "TUNNEL_GRENAT"] # INNER IPV4 not with vlan @@ -300,7 +300,7 @@ class TestUniPacket(TestCase): checked that whether NVGRE in IPv6 tunnel packet can be normally detected by Fortville. """ - self.verify(("fortville" in self.nic or "fortpark_TLV" in self.nic or "carlsville" in self.nic or "columbiaville" in self.nic), + self.verify(("fortville" in self.nic or "fortpark_TLV" in self.nic or "carlsville" in self.nic or "columbiaville" in self.nic or "fortpark_TLV1" in self.nic), "NVGRE in IPv6 detect only support by Fortville") nvgre_base_packet_type = ["L2_ETHER", "L3_IPV6_EXT_UNKNOWN", "TUNNEL_GRENAT"] # INNER IPV4 not with vlan @@ -371,7 +371,7 @@ class TestUniPacket(TestCase): """ checked that whether GRE tunnel packet can be normally detected by Fortville. """ - self.verify(("fortville" in self.nic or "fortpark_TLV" in self.nic or "carlsville" in self.nic or "columbiaville" in self.nic), + self.verify(("fortville" in self.nic or "fortpark_TLV" in self.nic or "carlsville" in self.nic or "columbiaville" in self.nic or "fortpark_TLV1" in self.nic), "GRE tunnel packet type detect only support by Fortville") base_packet_type = [" L2_ETHER", " L3_IPV4_EXT_UNKNOWN", "TUNNEL_GRENAT"] pktType = { @@ -390,7 +390,7 @@ class TestUniPacket(TestCase): checked that whether Vxlan tunnel packet can be normally detected by Fortville. """ - self.verify(("fortville" in self.nic or "fortpark_TLV" in self.nic or "carlsville" in self.nic or "columbiaville" in self.nic), + self.verify(("fortville" in self.nic or "fortpark_TLV" in self.nic or "carlsville" in self.nic or "columbiaville" in self.nic or "fortpark_TLV1" 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_interrupt_pmd.py b/tests/TestSuite_vf_interrupt_pmd.py index 00aa2c6..386e07c 100644 --- a/tests/TestSuite_vf_interrupt_pmd.py +++ b/tests/TestSuite_vf_interrupt_pmd.py @@ -319,7 +319,7 @@ class TestVfInterruptPmd(TestCase): """ Check Interrupt for VF with vfio driver, need test with i40e driver """ - self.verify(self.nic in ['fortville_eagle', 'fortville_spirit', 'fortville_spirit_single', 'fortpark_TLV'], '%s nic port not support vf multi-queues interrupt' % str(self.nic)) + self.verify(self.nic in ['fortville_eagle', 'fortville_spirit', 'fortville_spirit_single', 'fortpark_TLV',"fortpark_TLV1"], '%s nic port not support vf multi-queues interrupt' % str(self.nic)) self.queues = 4 self.prepare_l3fwd_power(self.dut) self.set_NIC_link() @@ -349,7 +349,7 @@ class TestVfInterruptPmd(TestCase): """ Check for interrupts within the VM, need test with i40e driver """ - self.verify(self.nic in ['fortville_eagle', 'fortville_spirit', 'fortville_spirit_single', 'fortpark_TLV'], '%s nic port not support vf multi-queues interrupt' % str(self.nic)) + self.verify(self.nic in ['fortville_eagle', 'fortville_spirit', 'fortville_spirit_single','fortpark_TLV', 'fortpark_TLV1'], '%s nic port not support vf multi-queues interrupt' % str(self.nic)) self.setup_vm_env() self.vm0_dut.send_expect("ip link set %s vf 0 mac %s" % (self.host_intf0, self.vf0_mac), "# ") diff --git a/tests/TestSuite_vf_rss.py b/tests/TestSuite_vf_rss.py index 002c37e..78cc39e 100644 --- a/tests/TestSuite_vf_rss.py +++ b/tests/TestSuite_vf_rss.py @@ -234,7 +234,7 @@ class TestVfRss(TestCase): self.verify( self.nic in ["redrockcanyou", "atwood", "boulderrapid", "fortville_eagle", "fortville_spirit", - "fortville_spirit_single", "fortville_25g", "sageville", "sagepond", "fortpark_TLV"], + "fortville_spirit_single", "fortville_25g", "sageville", "sagepond", "fortpark_TLV","fortpark_TLV1"], "NIC Unsupported: " + str(self.nic)) self.dut_ports = self.dut.get_ports(self.nic) self.verify(len(self.dut_ports) >= 1, "Not enough ports available") diff --git a/tests/TestSuite_vm_hotplug.py b/tests/TestSuite_vm_hotplug.py index 3b79417..d313f35 100644 --- a/tests/TestSuite_vm_hotplug.py +++ b/tests/TestSuite_vm_hotplug.py @@ -280,7 +280,7 @@ class TestVmHotplug(TestCase): time.sleep(1) sign = 'Connection' lis1 = ['fortville_spirit', 'fortville_eagle'] - lis2 = ['fortpark_TLV', 'fortville_25g'] + lis2 = ['fortpark_TLV', 'fortville_25g',"fortpark_TLV1"] if self.nic in lis1: sign = 'Ethernet' elif self.nic in lis2: diff --git a/tests/TestSuite_vxlan.py b/tests/TestSuite_vxlan.py index 1aa98c6..de24888 100644 --- a/tests/TestSuite_vxlan.py +++ b/tests/TestSuite_vxlan.py @@ -257,7 +257,7 @@ class TestVxlan(TestCase, IxiaPacketGenerator): vxlan Prerequisites """ # this feature only enable in FVL now - if self.nic in ["fortville_eagle", "fortville_spirit", "fortville_spirit_single", "fortville_25g", "fortpark_TLV", "carlsville"]: + if self.nic in ["fortville_eagle", "fortville_spirit", "fortville_spirit_single", "fortville_25g", "fortpark_TLV","fortpark_TLV1", "carlsville"]: self.compile_switch = 'CONFIG_RTE_LIBRTE_I40E_INC_VECTOR' elif self.nic in ["sageville", "sagepond"]: self.compile_switch = 'CONFIG_RTE_IXGBE_INC_VECTOR' diff --git a/tests/TestSuite_vxlan_sample.py b/tests/TestSuite_vxlan_sample.py index 4ab9f18..63638f9 100644 --- a/tests/TestSuite_vxlan_sample.py +++ b/tests/TestSuite_vxlan_sample.py @@ -78,7 +78,7 @@ class TestVxlanSample(TestCase): # this feature only enable in FVL now self.verify(self.nic in ["fortville_eagle", "fortville_spirit", - "fortville_spirit_single", "fortpark_TLV", "fortville_25g"], + "fortville_spirit_single", "fortpark_TLV","fortpark_TLV1", "fortville_25g"], "Vxlan Only supported by Fortville") # Based on h/w type, choose how many ports to use self.dut_ports = self.dut.get_ports() -- 2.17.2