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 7B2F6C31C for ; Wed, 15 Jun 2016 10:20:08 +0200 (CEST) Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga103.fm.intel.com with ESMTP; 15 Jun 2016 01:20:07 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.26,475,1459839600"; d="scan'208";a="987807173" Received: from shvmail01.sh.intel.com ([10.239.29.42]) by fmsmga001.fm.intel.com with ESMTP; 15 Jun 2016 01:20:07 -0700 Received: from shecgisg003.sh.intel.com (shecgisg003.sh.intel.com [10.239.29.90]) by shvmail01.sh.intel.com with ESMTP id u5F8K55K006007; Wed, 15 Jun 2016 16:20:05 +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 u5F8K3oD015988; Wed, 15 Jun 2016 16:20:05 +0800 Received: (from hengdinx@localhost) by shecgisg003.sh.intel.com (8.13.6/8.13.6/Submit) id u5F8K3Ho015984; Wed, 15 Jun 2016 16:20:03 +0800 From: Ding Heng To: dts@dpdk.org Cc: Ding Heng Date: Wed, 15 Jun 2016 16:20:01 +0800 Message-Id: <1465978801-15951-1-git-send-email-hengx.ding@intel.com> X-Mailer: git-send-email 1.7.4.1 Subject: [dts] test suite:fix some performance case bug 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:20:09 -0000 l2fwd: expected string should be "====" instead of "memory mapped" tso: adjust the order of testpmd command to avoid different packet size affect each other. vxlan: no self.dut_port in this class, should be dut_port. Signed-off-by: Ding Heng diff --git a/tests/TestSuite_l2fwd.py b/tests/TestSuite_l2fwd.py index 10a86ca..383cb61 100644 --- a/tests/TestSuite_l2fwd.py +++ b/tests/TestSuite_l2fwd.py @@ -180,7 +180,8 @@ class TestL2fwd(TestCase): (self.dut.get_memory_channels(), core_mask, str(queues['queues']), port_mask) - self.dut.send_expect(command_line, "memory mapped", 60) + #self.dut.send_expect(command_line, "memory mapped", 60) + self.dut.send_expect(command_line, "========", 60) info = "Executing l2fwd using %s queues, frame size %d and %s setup.\n" % \ (queues['queues'], frame_size, self.core_config) diff --git a/tests/TestSuite_tso.py b/tests/TestSuite_tso.py index 6e45fdc..b1d5b7a 100644 --- a/tests/TestSuite_tso.py +++ b/tests/TestSuite_tso.py @@ -309,19 +309,19 @@ class TestTSO(TestCase): self.dut.send_expect("csum parse_tunnel on %d" % self.dut_ports[1], "testpmd> ", 120) self.dut.send_expect("tso set 800 %d" % self.dut_ports[1], "testpmd> ", 120) self.dut.send_expect("set fwd csum", "testpmd> ", 120) - self.dut.send_expect("start", "testpmd> ") for frame_size in self.frame_sizes: + self.dut.send_expect("start", "testpmd> ") wirespeed = self.wirespeed(self.nic, frame_size, 2) # create pcap file self.logger.info("Running with frame size %d " % frame_size) payload_size = frame_size - self.headers_size - for _port in range(2): - mac = self.dut.get_mac_address(self.dut_ports[_port]) - self.tester.scapy_append('wrpcap("dst%d.pcap", [Ether(dst="%s",src="52:00:00:00:00:01")/IP(src="192.168.1.1",dst="192.168.1.2")/TCP(sport=1021,dport=1021)/("X"*%d)])' % (_port, mac, payload_size)) - tgen_input.append((self.tester.get_local_port(self.dut_ports[_port]), - self.tester.get_local_port(self.dut_ports[1-_port]), "dst%d.pcap") % _port) - self.tester.scapy_execute() + for _port in range(2): + mac = self.dut.get_mac_address(self.dut_ports[_port]) + self.tester.scapy_append('wrpcap("dst%d.pcap", [Ether(dst="%s",src="52:00:00:00:00:01")/IP(src="192.168.1.1",dst="192.168.1.2")/TCP(sport=1021,dport=1021)/("X"*%d)])' % (_port, mac, payload_size)) + tgen_input.append((self.tester.get_local_port(self.dut_ports[_port]), + self.tester.get_local_port(self.dut_ports[1-_port]), "dst%d.pcap" % _port)) + self.tester.scapy_execute() # run traffic generator _, pps = self.tester.traffic_generator_throughput(tgen_input) @@ -330,14 +330,14 @@ class TestTSO(TestCase): test_cycle['Mpps'][frame_size] = pps test_cycle['pct'][frame_size] = pps * 100 / wirespeed - self.dut.send_expect("stop", "testpmd> ") - self.dut.send_expect("quit", "# ", 30) - time.sleep(5) + self.dut.send_expect("stop", "testpmd> ") + time.sleep(5) - for n in range(len(self.test_cycles)): - for frame_size in self.frame_sizes: - self.verify(self.test_cycles[n]['Mpps'][ - frame_size] > 0, "No traffic detected") + for n in range(len(self.test_cycles)): + for frame_size in self.frame_sizes: + self.verify(self.test_cycles[n]['Mpps'][ + frame_size] > 0, "No traffic detected") + self.dut.send_expect("quit", "# ", 30) # Print results dts.results_table_add_header(self.table_header) diff --git a/tests/TestSuite_vxlan.py b/tests/TestSuite_vxlan.py index 4438bb0..30f5657 100644 --- a/tests/TestSuite_vxlan.py +++ b/tests/TestSuite_vxlan.py @@ -842,7 +842,7 @@ class TestVxlan(TestCase, IxiaPacketGenerator): self.enable_vxlan(dut_port) if tun_filter != 'None': - args = [self.dut_port, config.outer_mac_dst, + args = [dut_port, config.outer_mac_dst, config.inner_mac_dst, config.inner_ip_dst, config.inner_vlan, tun_filter, config.vni, 0] -- 1.9.3