From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by dpdk.org (Postfix) with ESMTP id 483575949 for ; Tue, 3 Nov 2015 04:07:25 +0100 (CET) Received: from orsmga001.jf.intel.com ([10.7.209.18]) by fmsmga103.fm.intel.com with ESMTP; 02 Nov 2015 19:07:24 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.20,237,1444719600"; d="scan'208";a="810237141" Received: from shvmail01.sh.intel.com ([10.239.29.42]) by orsmga001.jf.intel.com with ESMTP; 02 Nov 2015 19:07:23 -0800 Received: from shecgisg004.sh.intel.com (shecgisg004.sh.intel.com [10.239.29.89]) by shvmail01.sh.intel.com with ESMTP id tA337LCn001067; Tue, 3 Nov 2015 11:07:21 +0800 Received: from shecgisg004.sh.intel.com (localhost [127.0.0.1]) by shecgisg004.sh.intel.com (8.13.6/8.13.6/SuSE Linux 0.8) with ESMTP id tA337Ipq021004; Tue, 3 Nov 2015 11:07:20 +0800 Received: (from yliu84x@localhost) by shecgisg004.sh.intel.com (8.13.6/8.13.6/Submit) id tA337HYO021000; Tue, 3 Nov 2015 11:07:17 +0800 From: Yong Liu To: dts@dpdk.org Date: Tue, 3 Nov 2015 11:07:17 +0800 Message-Id: <1446520037-20968-1-git-send-email-yong.liu@intel.com> X-Mailer: git-send-email 1.7.4.1 Subject: [dts] [PATCH] tests checksum_offload: remove source mac filter 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: Tue, 03 Nov 2015 03:07:26 -0000 From: Marvin Liu testpmd csum forwarding will replace source mac address with port mac. So remove source mac filter from this case. Signed-off-by: Marvin Liu diff --git a/tests/TestSuite_checksum_offload.py b/tests/TestSuite_checksum_offload.py index abfebb6..0f3c8af 100644 --- a/tests/TestSuite_checksum_offload.py +++ b/tests/TestSuite_checksum_offload.py @@ -109,7 +109,7 @@ class TestChecksumOffload(TestCase): self.tester.scapy_append('sys.path.append("./")') self.tester.scapy_append('import sctp') self.tester.scapy_append('from sctp import *') - self.tester.scapy_append('p = sniff(filter="ether src 52:00:00:00:00:00", iface="%s", count=%d)' % (rx_interface, len(packets_sent))) + self.tester.scapy_append('p = sniff(iface="%s", count=%d)' % (rx_interface, len(packets_sent))) self.tester.scapy_append('nr_packets=len(p)') self.tester.scapy_append('reslist = [p[i].sprintf("%IP.chksum%;%TCP.chksum%;%UDP.chksum%;%SCTP.chksum%") for i in range(nr_packets)]') self.tester.scapy_append('import string') @@ -162,16 +162,16 @@ class TestChecksumOffload(TestCase): traffic generator side. """ dmac = self.dut.get_mac_address(self.dut_ports[1]) - pktsChkErr = {'IP/UDP': 'Ether(dst="%s", src="52:00:00:00:00:00")/IP(chksum=0x0)/UDP(chksum=0xf)/("X"*46)' % dmac, - 'IP/TCP': 'Ether(dst="%s", src="52:00:00:00:00:00")/IP(chksum=0x0)/TCP(chksum=0xf)/("X"*46)' % dmac, - 'IP/SCTP': 'Ether(dst="%s", src="52:00:00:00:00:00")/IP(chksum=0x0)/SCTP(chksum=0xf)/("X"*48)' % dmac, - 'IPv6/UDP': 'Ether(dst="%s", src="52:00:00:00:00:00")/IPv6(src="::1")/UDP(chksum=0xf)/("X"*46)' % dmac, - 'IPv6/TCP': 'Ether(dst="%s", src="52:00:00:00:00:00")/IPv6(src="::1")/TCP(chksum=0xf)/("X"*46)' % dmac} - pkts = {'IP/UDP': 'Ether(dst="%s", src="52:00:00:00:00:00")/IP(src="127.0.0.2")/UDP()/("X"*46)' % dmac, - 'IP/TCP': 'Ether(dst="%s", src="52:00:00:00:00:00")/IP(src="127.0.0.2")/TCP()/("X"*46)' % dmac, - 'IP/SCTP': 'Ether(dst="%s", src="52:00:00:00:00:00")/IP(src="127.0.0.2")/SCTP()/("X"*48)' % dmac, - 'IPv6/UDP': 'Ether(dst="%s", src="52:00:00:00:00:00")/IPv6(src="::2")/UDP()/("X"*46)' % dmac, - 'IPv6/TCP': 'Ether(dst="%s", src="52:00:00:00:00:00")/IPv6(src="::2")/TCP()/("X"*46)' % dmac} + pktsChkErr = {'IP/UDP': 'Ether(dst="%s")/IP(chksum=0x0)/UDP(chksum=0xf)/("X"*46)' % dmac, + 'IP/TCP': 'Ether(dst="%s")/IP(chksum=0x0)/TCP(chksum=0xf)/("X"*46)' % dmac, + 'IP/SCTP': 'Ether(dst="%s")/IP(chksum=0x0)/SCTP(chksum=0xf)/("X"*48)' % dmac, + 'IPv6/UDP': 'Ether(dst="%s")/IPv6(src="::1")/UDP(chksum=0xf)/("X"*46)' % dmac, + 'IPv6/TCP': 'Ether(dst="%s")/IPv6(src="::1")/TCP(chksum=0xf)/("X"*46)' % dmac} + pkts = {'IP/UDP': 'Ether(dst="%s")/IP(src="127.0.0.2")/UDP()/("X"*46)' % dmac, + 'IP/TCP': 'Ether(dst="%s")/IP(src="127.0.0.2")/TCP()/("X"*46)' % dmac, + 'IP/SCTP': 'Ether(dst="%s")/IP(src="127.0.0.2")/SCTP()/("X"*48)' % dmac, + 'IPv6/UDP': 'Ether(dst="%s")/IPv6(src="::2")/UDP()/("X"*46)' % dmac, + 'IPv6/TCP': 'Ether(dst="%s")/IPv6(src="::2")/TCP()/("X"*46)' % dmac} self.checksum_enablehw(self.dut_ports[0]) self.checksum_enablehw(self.dut_ports[1]) self.dut.send_expect("start", "testpmd>") @@ -188,17 +188,17 @@ class TestChecksumOffload(TestCase): """ dmac = self.dut.get_mac_address(self.dut_ports[1]) - pkts = {'IP/UDP': 'Ether(dst="%s", src="52:00:00:00:00:00")/IP(chksum=0x0)/UDP(chksum=0xf)/("X"*46)' % dmac, - 'IP/TCP': 'Ether(dst="%s", src="52:00:00:00:00:00")/IP(chksum=0x0)/TCP(chksum=0xf)/("X"*46)' % dmac, - 'IP/SCTP': 'Ether(dst="%s", src="52:00:00:00:00:00")/IP(chksum=0x0)/SCTP(chksum=0xf)/("X"*48)' % dmac, - 'IPv6/UDP': 'Ether(dst="%s", src="52:00:00:00:00:00")/IPv6(src="::1")/UDP(chksum=0xf)/("X"*46)' % dmac, - 'IPv6/TCP': 'Ether(dst="%s", src="52:00:00:00:00:00")/IPv6(src="::1")/TCP(chksum=0xf)/("X"*46)' % dmac} + pkts = {'IP/UDP': 'Ether(dst="%s")/IP(chksum=0x0)/UDP(chksum=0xf)/("X"*46)' % dmac, + 'IP/TCP': 'Ether(dst="%s")/IP(chksum=0x0)/TCP(chksum=0xf)/("X"*46)' % dmac, + 'IP/SCTP': 'Ether(dst="%s")/IP(chksum=0x0)/SCTP(chksum=0xf)/("X"*48)' % dmac, + 'IPv6/UDP': 'Ether(dst="%s")/IPv6(src="::1")/UDP(chksum=0xf)/("X"*46)' % dmac, + 'IPv6/TCP': 'Ether(dst="%s")/IPv6(src="::1")/TCP(chksum=0xf)/("X"*46)' % dmac} - pkts_ref = {'IP/UDP': 'Ether(dst="%s", src="52:00:00:00:00:00")/IP(src="127.0.0.2")/UDP()/("X"*46)' % dmac, - 'IP/TCP': 'Ether(dst="%s", src="52:00:00:00:00:00")/IP(src="127.0.0.2")/TCP()/("X"*46)' % dmac, - 'IP/SCTP': 'Ether(dst="%s", src="52:00:00:00:00:00")/IP(src="127.0.0.2")/SCTP()/("X"*48)' % dmac, - 'IPv6/UDP': 'Ether(dst="%s", src="52:00:00:00:00:00")/IPv6(src="::2")/UDP()/("X"*46)' % dmac, - 'IPv6/TCP': 'Ether(dst="%s", src="52:00:00:00:00:00")/IPv6(src="::2")/TCP()/("X"*46)' % dmac} + pkts_ref = {'IP/UDP': 'Ether(dst="%s")/IP(src="127.0.0.2")/UDP()/("X"*46)' % dmac, + 'IP/TCP': 'Ether(dst="%s")/IP(src="127.0.0.2")/TCP()/("X"*46)' % dmac, + 'IP/SCTP': 'Ether(dst="%s")/IP(src="127.0.0.2")/SCTP()/("X"*48)' % dmac, + 'IPv6/UDP': 'Ether(dst="%s")/IPv6(src="::2")/UDP()/("X"*46)' % dmac, + 'IPv6/TCP': 'Ether(dst="%s")/IPv6(src="::2")/TCP()/("X"*46)' % dmac} self.checksum_enablehw(self.dut_ports[0]) self.checksum_enablehw(self.dut_ports[1]) @@ -221,17 +221,17 @@ class TestChecksumOffload(TestCase): dmac = self.dut.get_mac_address(self.dut_ports[1]) sndIP = '10.0.0.1' sndIPv6 = '::1' - sndPkts = {'IP/UDP': 'Ether(dst="%s", src="52:00:00:00:00:00")/IP(src="%s",chksum=0x0)/UDP(chksum=0xf)/("X"*46)' % (dmac, sndIP), - 'IP/TCP': 'Ether(dst="%s", src="52:00:00:00:00:00")/IP(src="%s",chksum=0x0)/TCP(chksum=0xf)/("X"*46)' % (dmac, sndIP), - 'IPv6/UDP': 'Ether(dst="%s", src="52:00:00:00:00:00")/IPv6(src="%s")/UDP(chksum=0xf)/("X"*46)' % (dmac, sndIPv6), - 'IPv6/TCP': 'Ether(dst="%s", src="52:00:00:00:00:00")/IPv6(src="%s")/TCP(chksum=0xf)/("X"*46)' % (dmac, sndIPv6)} + sndPkts = {'IP/UDP': 'Ether(dst="%s")/IP(src="%s",chksum=0x0)/UDP(chksum=0xf)/("X"*46)' % (dmac, sndIP), + 'IP/TCP': 'Ether(dst="%s")/IP(src="%s",chksum=0x0)/TCP(chksum=0xf)/("X"*46)' % (dmac, sndIP), + 'IPv6/UDP': 'Ether(dst="%s")/IPv6(src="%s")/UDP(chksum=0xf)/("X"*46)' % (dmac, sndIPv6), + 'IPv6/TCP': 'Ether(dst="%s")/IPv6(src="%s")/TCP(chksum=0xf)/("X"*46)' % (dmac, sndIPv6)} expIP = "10.0.0.2" expIPv6 = '::2' - expPkts = {'IP/UDP': 'Ether(dst="%s", src="52:00:00:00:00:00")/IP(src="%s")/UDP()/("X"*46)' % (dmac, expIP), - 'IP/TCP': 'Ether(dst="%s", src="52:00:00:00:00:00")/IP(src="%s")/TCP()/("X"*46)' % (dmac, expIP), - 'IPv6/UDP': 'Ether(dst="%s", src="52:00:00:00:00:00")/IPv6(src="%s")/UDP()/("X"*46)' % (dmac, expIPv6), - 'IPv6/TCP': 'Ether(dst="%s", src="52:00:00:00:00:00")/IPv6(src="%s")/TCP()/("X"*46)' % (dmac, expIPv6)} + expPkts = {'IP/UDP': 'Ether(dst="%s")/IP(src="%s")/UDP()/("X"*46)' % (dmac, expIP), + 'IP/TCP': 'Ether(dst="%s")/IP(src="%s")/TCP()/("X"*46)' % (dmac, expIP), + 'IPv6/UDP': 'Ether(dst="%s")/IPv6(src="%s")/UDP()/("X"*46)' % (dmac, expIPv6), + 'IPv6/TCP': 'Ether(dst="%s")/IPv6(src="%s")/TCP()/("X"*46)' % (dmac, expIPv6)} self.dut.send_expect("start", "testpmd>") result = self.checksum_validate(sndPkts, expPkts) @@ -277,11 +277,11 @@ class TestChecksumOffload(TestCase): """ # sizes = [64, 128, 256, 512, 1024] sizes = [64, 128] - pkts = {'IP/UDP': 'Ether(dst="%s", src="52:00:00:00:00:00")/IP()/UDP()/("X"*(%d-46))', - 'IP/TCP': 'Ether(dst="%s", src="52:00:00:00:00:00")/IP()/TCP()/("X"*(%d-58))', - 'IP/SCTP': 'Ether(dst="%s", src="52:00:00:00:00:00")/IP()/SCTP()/("X"*(%d-50+2))', - 'IPv6/UDP': 'Ether(dst="%s", src="52:00:00:00:00:00")/IPv6()/UDP()/("X"* (lambda x: x - 66 if x > 66 else 0)(%d))', - 'IPv6/TCP': 'Ether(dst="%s", src="52:00:00:00:00:00")/IPv6()/TCP()/("X"* (lambda x: x - 78 if x > 78 else 0)(%d))'} + pkts = {'IP/UDP': 'Ether(dst="%s")/IP()/UDP()/("X"*(%d-46))', + 'IP/TCP': 'Ether(dst="%s")/IP()/TCP()/("X"*(%d-58))', + 'IP/SCTP': 'Ether(dst="%s")/IP()/SCTP()/("X"*(%d-50+2))', + 'IPv6/UDP': 'Ether(dst="%s")/IPv6()/UDP()/("X"* (lambda x: x - 66 if x > 66 else 0)(%d))', + 'IPv6/TCP': 'Ether(dst="%s")/IPv6()/TCP()/("X"* (lambda x: x - 78 if x > 78 else 0)(%d))'} lcore = "1S/2C/1T" portMask = dts.create_mask([self.dut_ports[0], self.dut_ports[1]]) -- 1.9.3