From: zhaomeijuan <meijuanx.zhao@intel.com>
To: dts@dpdk.org
Cc: zhaomeijuan <meijuanx.zhao@intel.com>
Subject: [dts] [next][PATCH V1 2/7] tests/distributor
Date: Sun, 28 Apr 2019 10:47:13 +0000 [thread overview]
Message-ID: <20190428104718.9143-2-meijuanx.zhao@intel.com> (raw)
In-Reply-To: <20190428104718.9143-1-meijuanx.zhao@intel.com>
*.remove old or unused module and code
which replace it with pktgen API
*.overwrite ip method
Signed-off-by: zhaomeijuan <meijuanx.zhao@intel.com>
---
tests/TestSuite_distributor.py | 60 +++++++++++++++++++++-------------
1 file changed, 37 insertions(+), 23 deletions(-)
diff --git a/tests/TestSuite_distributor.py b/tests/TestSuite_distributor.py
index a900f5e..30d5d76 100644
--- a/tests/TestSuite_distributor.py
+++ b/tests/TestSuite_distributor.py
@@ -34,20 +34,21 @@ DPDK Test suite.
"""
import re
import utils
+import os
from test_case import TestCase
-from etgen import IxiaPacketGenerator
+from pktgen import PacketGeneratorHelper
+class TestDistributor(TestCase):
-class TestDistributor(TestCase, IxiaPacketGenerator):
def set_up_all(self):
"""
Run at the start of each test suite.
"""
self.tester.extend_external_packet_generator(TestDistributor, self)
- out = self.dut.send_expect("make -C test -j", "#")
- self.verify("Error" not in out, "Compilation error")
- self.verify("No such" not in out, "Compilation error")
+ #out = self.dut.send_expect("make -C test -j", "#")
+ #self.verify("Error" not in out, "Compilation error")
+ #self.verify("No such" not in out, "Compilation error")
# reduce tx queues for enable many workers
self.dut.send_expect("sed -i -e 's/.*txRings = .*/\\tconst uint16_t rxRings = 1, txRings = 1;/' ./examples/distributor/main.c", "#")
@@ -57,6 +58,15 @@ class TestDistributor(TestCase, IxiaPacketGenerator):
self.dut_ports = self.dut.get_ports()
self.app = "./examples/distributor/build/distributor_app"
+ # get dts output path
+ if self.logger.log_path.startswith(os.sep):
+ self.output_path = self.logger.log_path
+ else:
+ cur_path = os.path.dirname(
+ os.path.dirname(os.path.realpath(__file__)))
+ self.output_path = os.sep.join([cur_path, self.logger.log_path])
+ # create an instance to set stream field setting
+ self.pktgen_helper = PacketGeneratorHelper()
def set_up(self):
"""
@@ -106,13 +116,16 @@ class TestDistributor(TestCase, IxiaPacketGenerator):
# output port is calculated from overall ports number
cmd_fmt = "%s -c %s -n %d -w %s -- -p 0x1"
socket = self.dut.get_numa_id(self.dut_ports[0])
-
- self.tester.scapy_append('wrpcap("distributor.pcap", [Ether()/IP()/("X"*26)])')
+
+ pcap = os.sep.join([self.output_path, "distributor.pcap"])
+ self.tester.scapy_append('wrpcap("%s", [Ether()/IP()/("X"*26)])' % pcap)
self.tester.scapy_execute()
tgen_input = []
rx_port = self.tester.get_local_port(self.dut_ports[0])
tx_port = self.tester.get_local_port(self.dut_ports[0])
- tgen_input.append((tx_port, rx_port, "distributor.pcap"))
+
+ pcap = os.sep.join([self.output_path, "distributor.pcap"])
+ tgen_input.append((tx_port, rx_port, pcap))
self.result_table_create(table_header)
for worker_num in workers:
@@ -128,8 +141,14 @@ class TestDistributor(TestCase, IxiaPacketGenerator):
self.dut.send_expect(cmd, "doing packet RX", timeout=30)
- self.tester.ixia_packet_gen.hook_transmission_func = self.hook_transmission_func
- _, pps = self.tester.traffic_generator_throughput(tgen_input, delay=2)
+ self.app_output = self.dut.session.get_session_before(timeout=2)
+
+ # clear streams before add new streams
+ self.tester.pktgen.clear_streams()
+ # run packet generator
+ streams = self.pktgen_helper.prepare_stream_from_tginput(tgen_input, 100,
+ None, self.tester.pktgen)
+ _, pps = self.tester.pktgen.measure_throughput(stream_ids=streams)
self.dut.send_expect("^C", "#")
@@ -255,19 +274,14 @@ class TestDistributor(TestCase, IxiaPacketGenerator):
cycles = lines[2].split()[3]
return int(cycles)
- def ip(self, port, frag, src, proto, tos, dst, chksum, len, options, version, flags, ihl, ttl, id):
- self.add_tcl_cmd("protocol config -name ip")
- self.add_tcl_cmd('ip config -sourceIpAddr "%s"' % src)
- self.add_tcl_cmd("ip config -sourceIpAddrMode ipIdle")
- self.add_tcl_cmd('ip config -destIpAddr "%s"' % dst)
- self.add_tcl_cmd("ip config -destIpAddrMode ipRandom")
- self.add_tcl_cmd("ip config -ttl %d" % ttl)
- self.add_tcl_cmd("ip config -totalLength %d" % len)
- self.add_tcl_cmd("ip config -fragment %d" % frag)
- self.add_tcl_cmd("ip config -ipProtocol ipV4ProtocolReserved255")
- self.add_tcl_cmd("ip config -identifier %d" % id)
- self.add_tcl_cmd("stream config -framesize %d" % (len + 18))
- self.add_tcl_cmd("ip set %d %d %d" % (self.chasId, port['card'], port['port']))
+ def set_fields(self):
+ ''' set ip protocol field behavior '''
+ fields_config = {
+ 'ip': {
+ 'dst': {'mask': '255.240.0.0', 'action': 'inc'}
+ },}
+
+ return fields_config
def tear_down(self):
"""
--
2.17.1
next prev parent reply other threads:[~2019-04-28 2:46 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-04-28 10:47 [dts] [next][PATCH V1 1/7] tests/checksum_offload zhaomeijuan
2019-04-28 10:47 ` zhaomeijuan [this message]
2019-04-28 10:47 ` [dts] [next][PATCH V1 3/7] tests/efd zhaomeijuan
2019-04-28 10:47 ` [dts] [next][PATCH V1 4/7] tests/fm10k_perf zhaomeijuan
2019-04-28 10:47 ` [dts] [next][PATCH V1 5/7] tests/ipfrag zhaomeijuan
2019-04-28 10:47 ` [dts] [next][PATCH V1 6/7] tests/kni zhaomeijuan
2019-04-28 10:47 ` [dts] [next][PATCH V1 7/7] tests/l2fwd zhaomeijuan
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190428104718.9143-2-meijuanx.zhao@intel.com \
--to=meijuanx.zhao@intel.com \
--cc=dts@dpdk.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).