From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by dpdk.org (Postfix) with ESMTP id 1D6DBF04 for ; Wed, 6 Sep 2017 09:08:07 +0200 (CEST) Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga102.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 06 Sep 2017 00:08:06 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.41,483,1498546800"; d="scan'208";a="132206831" Received: from unknown (HELO dpdk-fedora20.icx.intel.com) ([10.240.176.135]) by orsmga002.jf.intel.com with ESMTP; 06 Sep 2017 00:08:06 -0700 From: "xu,gang" To: dts@dpdk.org Cc: "xu,gang" Date: Wed, 6 Sep 2017 15:09:21 +0800 Message-Id: <1504681761-4626-1-git-send-email-gangx.xu@intel.com> X-Mailer: git-send-email 1.9.3 Subject: [dts] [PATCH V1] fix ipv4_reassembly failed 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, 06 Sep 2017 07:08:09 -0000 add the '-e' options for sed command, it need on freebsd Signed-off-by: xu,gang --- tests/TestSuite_ipv4_reassembly.py | 40 +++++++++++++++++++++----------------- 1 file changed, 22 insertions(+), 18 deletions(-) diff --git a/tests/TestSuite_ipv4_reassembly.py b/tests/TestSuite_ipv4_reassembly.py index c730fd6..3135f89 100644 --- a/tests/TestSuite_ipv4_reassembly.py +++ b/tests/TestSuite_ipv4_reassembly.py @@ -52,7 +52,8 @@ class IpReassemblyTestConfig(object): tester_port = self.test_case.tester.get_local_port(dut_port) self.tester_iface = self.test_case.tester.get_interface(tester_port) self.dut_port_mask = utils.create_mask([dut_port]) - self.queue_config = '({},{},{})'.format(dut_port, '0', self.core_list[0]) + self.queue_config = '({},{},{})'.format( + dut_port, '0', self.core_list[0]) def example_app_config(self): self.maxflows = 1024 @@ -91,12 +92,8 @@ class TestIpReassembly(TestCase): """ Changes the maximum number of frames by modifying the example app code. """ - - # sed_command = (r"sed -i 's/\(\s*MAX_FRAG_NUM\s*=\)\s*[[:digit:]]*/\1 %d/' " + - # r"examples/ip_reassembly/ipv4_rsmbl.h") - # self.dut.send_expect("sed -i 's/CONFIG_RTE_LIBRTE_IP_FRAG_MAX_FRAG=.*$/CONFIG_RTE_LIBRTE_IP_FRAG_MAX_FRAG=%s/' ./config/common_linuxapp" %int(num_of_fragments), "# ") - # self.dut.send_expect(sed_command % int(num_of_fragments), '#', 60) - self.dut.send_expect("sed -i 's/CONFIG_RTE_LIBRTE_IP_FRAG_MAX_FRAG=.*$/CONFIG_RTE_LIBRTE_IP_FRAG_MAX_FRAG=%s/' ./config/common_base" % int(num_of_fragments), "# ") + self.dut.send_expect( + "sed -i -e 's/CONFIG_RTE_LIBRTE_IP_FRAG_MAX_FRAG=.*$/CONFIG_RTE_LIBRTE_IP_FRAG_MAX_FRAG=%s/' ./config/common_base" % int(num_of_fragments), "# ") self.dut.send_expect("export RTE_TARGET=" + self.target, "#") self.dut.send_expect("export RTE_SDK=`pwd`", "#") self.dut.send_expect("rm -rf %s" % self.target, "# ", 5) @@ -117,8 +114,6 @@ class TestIpReassembly(TestCase): self.dut.send_expect('rm -rf examples/ip_reassembly/build', '#') out = self.dut.build_dpdk_apps('examples/ip_reassembly') -# self.verify('Error' not in out and 'No such file' not in out, -# 'Compilation error') def execute_example_app(self): """ @@ -128,7 +123,8 @@ class TestIpReassembly(TestCase): command = ('./examples/ip_reassembly/build/ip_reassembly -c {core_mask} ' + '-n {memory_channels} -- -p {dut_port_mask} ' + '--maxflows={maxflows} --flowttl={flowttl} {extra_args}') - self.dut.send_expect(command.format(**self.test_config.__dict__), 'Link Up') + self.dut.send_expect( + command.format(**self.test_config.__dict__), 'Link Up') def tcp_ipv4_fragments(self, src_ip, identifier): """ @@ -210,8 +206,10 @@ class TestIpReassembly(TestCase): the DUT """ - self.tester.scapy_append('pcap = rdpcap("%s")' % self.test_config.pcap_file) - self.tester.scapy_append('sendp(pcap, iface="%s")' % self.test_config.tester_iface) + self.tester.scapy_append( + 'pcap = rdpcap("%s")' % self.test_config.pcap_file) + self.tester.scapy_append( + 'sendp(pcap, iface="%s")' % self.test_config.tester_iface) self.tester.scapy_execute() time.sleep(5) @@ -305,16 +303,20 @@ class TestIpReassembly(TestCase): """ sent_packets = self.number_of_sent_packets(self.test_config.mac_src) - self.logger.info('sent packets: %d - expected: %d' % (sent_packets, expected)) - self.verify(sent_packets == expected, 'Not all fragments have been sent') + self.logger.info('sent packets: %d - expected: %d' % + (sent_packets, expected)) + self.verify(sent_packets == expected, + 'Not all fragments have been sent') def verify_received_packets(self, expected): """ Verifies if the number of received packets is the expected. """ - received_packets = self.number_of_received_packets(self.test_config.tcp_dst_port) - self.logger.info('received packets: %d - expected: %d' % (received_packets, expected)) + received_packets = self.number_of_received_packets( + self.test_config.tcp_dst_port) + self.logger.info('received packets: %d - expected: %d' % + (received_packets, expected)) self.verify(received_packets == expected, 'Not all frames have been forwarded') @@ -323,8 +325,10 @@ class TestIpReassembly(TestCase): Verifies if the number of packets with a valid TCP checksum is the expected. """ - tcp_valid_checksum = self.number_of_tcp_valid_checksum(self.test_config.tcp_dst_port) - self.logger.info('tcp valid: %d - expected: %d' % (tcp_valid_checksum, expected)) + tcp_valid_checksum = self.number_of_tcp_valid_checksum( + self.test_config.tcp_dst_port) + self.logger.info('tcp valid: %d - expected: %d' % + (tcp_valid_checksum, expected)) self.verify(tcp_valid_checksum == expected, 'Not all TCP packets have valid checksum') -- 1.9.3