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 4D1C6A09FF; Tue, 29 Dec 2020 02:48:57 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 272DCC9D8; Tue, 29 Dec 2020 02:48:56 +0100 (CET) Received: from mga06.intel.com (mga06.intel.com [134.134.136.31]) by dpdk.org (Postfix) with ESMTP id 404A64C8F for ; Tue, 29 Dec 2020 02:48:53 +0100 (CET) IronPort-SDR: +JiaiIs6iKaObaHx+1qiv31QcHXvCdmS+clSo6smQ0XvsIX5CgA+kRIONnUIle7yMuT1X/9mP4 0N+vjIG8be1w== X-IronPort-AV: E=McAfee;i="6000,8403,9848"; a="237997098" X-IronPort-AV: E=Sophos;i="5.78,456,1599548400"; d="scan'208";a="237997098" Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 28 Dec 2020 17:48:49 -0800 IronPort-SDR: XuSIkrzjDqN+j6fQSUVniYKSmmgzoD/t6O0cWSySFZMH5HFdGERRHR3J3Ft3QCD+pP8sRZc1us 6Y3i4DtJ/NNA== X-IronPort-AV: E=Sophos;i="5.78,456,1599548400"; d="scan'208";a="347199565" Received: from unknown (HELO localhost.localdomain) ([10.240.183.80]) by fmsmga008-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 28 Dec 2020 17:48:48 -0800 From: Xie wei To: dts@dpdk.org Cc: Xie wei Date: Tue, 29 Dec 2020 09:51:04 +0800 Message-Id: <20201229015104.5348-2-weix.xie@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201229015104.5348-1-weix.xie@intel.com> References: <20201229015104.5348-1-weix.xie@intel.com> Subject: [dts] [dst][PATCH V1 2/2] tests/TestSuite_kernelpf_iavf:modify script to match i40e driver updated 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" Update i40e driver to 2.13.10. vf_add_pvid: remove vlan, the pkts with random vlan id 1-4095 shall not be received. vf_vlan_rx: remove vlan, the pkts with vlan 1 shall not be received. vf_vlan_strip: disable strip, the pkts with random vlan tag shall not be received. vf_vlan_filter: disable filter, the pkts with random vlan tag shall not be received. vf_vlan_promisc: disable filter and strip, the pkts with random vlan tag shall not be received. Signed-off-by: Xie wei --- tests/TestSuite_kernelpf_iavf.py | 32 ++++++++++++++++++++++++++------ 1 file changed, 26 insertions(+), 6 deletions(-) diff --git a/tests/TestSuite_kernelpf_iavf.py b/tests/TestSuite_kernelpf_iavf.py index 0420cfa1..68f16096 100644 --- a/tests/TestSuite_kernelpf_iavf.py +++ b/tests/TestSuite_kernelpf_iavf.py @@ -94,6 +94,10 @@ class TestKernelpfIavf(TestCase): self.tester_intf1 = self.tester.get_interface(tester_port1) self.l3fwdpower_name = self.dut.apps_name['l3fwd-power'].strip().split('/')[-1] + # get driver version + out = self.dut.send_expect("ethtool -i %s | awk -F':' 'NR==2{print $2}'" % self.host_intf, "# ") + self.driver_version = out.replace(" ", "") + def set_up(self): if self.running_case == "test_vf_mac_filter": @@ -416,8 +420,12 @@ class TestKernelpfIavf(TestCase): out = self.send_and_getout(vlan=random_vlan, pkt_type="VLAN_UDP") tcpdump_out = self.get_tcpdump_package() receive_pkt = re.findall('vlan %s' % random_vlan, tcpdump_out) - self.verify(len(receive_pkt) == 2, "fail to tester received vlan packet!!!") - self.verify(self.vf_mac in out, "Failed to received vlan packet!!!") + if self.driver_version < "2.13.10" or self.kdriver == 'ice': + self.verify(len(receive_pkt) == 2, "fail to tester received vlan packet!!!") + self.verify(self.vf_mac in out, "Failed to received vlan packet!!!") + else: + self.verify(len(receive_pkt) == 1, "fail to tester received vlan packet!!!") + self.verify(self.vf_mac not in out, "Received vlan packet!!!") def send_and_getout(self, vlan=0, pkt_type="UDP"): @@ -481,7 +489,10 @@ class TestKernelpfIavf(TestCase): # send vlan 1 packet, vf can receive packet out = self.send_and_getout(vlan=1, pkt_type="VLAN_UDP") - self.verify(self.vf_mac in out, "received vlan 1 packet!!!") + if self.driver_version < "2.13.10" or self.kdriver == 'ice': + self.verify(self.vf_mac in out, "received vlan 1 packet!!!") + else: + self.verify(self.vf_mac not in out, "Received vlan 1 packet!!!") def test_vf_vlan_insertion(self): self.vm_testpmd.start_testpmd("all") @@ -526,7 +537,10 @@ class TestKernelpfIavf(TestCase): self.send_and_getout(vlan=random_vlan, pkt_type="VLAN_UDP") tcpdump_out = self.get_tcpdump_package() receive_pkt = re.findall('vlan %s' % random_vlan, tcpdump_out) - self.verify(len(receive_pkt) == 2, 'Failed to not received vlan packet!!!') + if self.driver_version < "2.13.10" or self.kdriver == 'ice': + self.verify(len(receive_pkt) == 2, 'Failed to not received vlan packet!!!') + else: + self.verify(len(receive_pkt) == 1, 'Failed to not received vlan packet!!!') def test_vf_vlan_filter(self): random_vlan = random.randint(2, MAX_VLAN) @@ -560,7 +574,10 @@ class TestKernelpfIavf(TestCase): time.sleep(1) tcpdump_out = self.get_tcpdump_package() receive_pkt = re.findall('vlan %s' % random_vlan, tcpdump_out) - self.verify(len(receive_pkt) == 2, 'Failed to received vlan packet!!!') + if self.driver_version < "2.13.10" or self.kdriver == 'ice': + self.verify(len(receive_pkt) == 2, 'Failed to received vlan packet!!!') + else: + self.verify(len(receive_pkt) == 1, 'Failed to received vlan packet!!!') def test_vf_without_jumboframe(self): self.tester.send_expect('ifconfig %s mtu %s' % (self.tester_intf, ETHER_JUMBO_FRAME_MTU), '#') @@ -911,7 +928,10 @@ class TestKernelpfIavf(TestCase): self.scapy_send_packet(self.vf_mac, self.tester_intf, vlan_flags=True, count=10) out = self.vm_dut.get_session_output() packets = len(re.findall('received 1 packets', out)) - self.verify(packets == 10, "Not receive expected packet") + if self.driver_version < "2.13.10" or self.kdriver == 'ice': + self.verify(packets == 10, "Not receive expected packet") + else: + self.verify(packets == 0, "Receive expected packet") # send 10 untagged packets, and check 10 untagged packets received self.scapy_send_packet(self.vf_mac, self.tester_intf, count=10) -- 2.17.1