[dts] [next][PATCH V1 4/7] tests/fm10k_perf
zhaomeijuan
meijuanx.zhao at intel.com
Sun Apr 28 12:47:15 CEST 2019
*.remove old or unuse module and code
which replace it with pktgen API
*.fix syntax error
*.overwrite ip method
Signed-off-by: zhaomeijuan <meijuanx.zhao at intel.com>
---
tests/TestSuite_fm10k_perf.py | 134 ++++++++++++++++++++++++----------
1 file changed, 96 insertions(+), 38 deletions(-)
diff --git a/tests/TestSuite_fm10k_perf.py b/tests/TestSuite_fm10k_perf.py
index b358f8a..e6b672a 100644
--- a/tests/TestSuite_fm10k_perf.py
+++ b/tests/TestSuite_fm10k_perf.py
@@ -1,6 +1,6 @@
# BSD LICENSE
#
-# Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
+# Copyright(c) 2010-2019 Intel Corporation. All rights reserved.
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
@@ -37,13 +37,14 @@ Layer-3 forwarding test script.
import utils
import string
import re
+import os
from test_case import TestCase
from exception import VerifyFailure
from settings import HEADER_SIZE
-from etgen import IxiaPacketGenerator
from utils import *
+from pktgen import PacketGeneratorHelper
-class TestFM10kL3fwd(TestCase, IxiaPacketGenerator):
+class TestFM10kL3fwd(TestCase):
path = "./examples/l3fwd/build/"
@@ -139,6 +140,16 @@ class TestFM10kL3fwd(TestCase, IxiaPacketGenerator):
'data': []}
self.rebuild_l3fwd()
+
+ # 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 rebuild_l3fwd(self):
pat = re.compile("P([0123])")
@@ -288,20 +299,33 @@ class TestFM10kL3fwd(TestCase, IxiaPacketGenerator):
header_row = ["Frame", "mode", "S/C/T", "Mpps", "% linerate", "latency_max(us)", "latency_min(us)", "latency_avg(us)"]
self.l3fwd_test_results['header'] = header_row
- utils.result_table_create(header_row)
+ self.result_table_create(header_row)
self.l3fwd_test_results['data'] = []
- mac = ["02:00:00:00:00:00", "02:00:00:00:00:01"]
+ mac = ["02:00:00:00:00:00", "02:00:00:00:00:01"]
for frame_size in TestFM10kL3fwd.frame_sizes:
# Prepare traffic flow
payload_size = frame_size - \
HEADER_SIZE['ip'] - HEADER_SIZE['eth']
+ flows = []
+ pcaps = {}
for _port in range(2):
dmac = self.dut.get_mac_address(valports[_port])
- flows = ['Ether(dst="%s", src="%s")/%s/("X"*%d)' % (dmac, mac[_port], flow, payload_size) for flow in self.flows()[_port *2:(_port +1)*2]]
- self.tester.scapy_append('wrpcap("dst%d.pcap", [%s])' %(valports[_port],string.join(flows,',')))
- self.tester.scapy_execute()
+ cnt = 0
+ for layer in self.flows()[_port *2:(_port +1)*2]:
+ flow = 'Ether(dst="%s", src="%s")/%s/("X"*%d)' % (
+ dmac, mac[_port], flow, payload_size)
+ flows.append(flow)
+ pcap = os.sep.join([
+ self.output_path,
+ "dst{0}_{1}.pcap".format(valports[_port], cnt)])
+ self.tester.scapy_append('wrpcap("%s", [%s])' %(pcap, flow))
+ self.tester.scapy_execute()
+ if valports[_port] not in pcaps:
+ pcaps[valports[_port]] = []
+ pcaps[valports[_port]].append(pcap)
+ cnt += 1
self.rst_report("Flows for 2 ports, %d frame size.\n" % (frame_size),
annex=True)
@@ -365,17 +389,34 @@ class TestFM10kL3fwd(TestCase, IxiaPacketGenerator):
txIntf = self.tester.get_local_port(valports[rxPort - 1])
rxIntf = self.tester.get_local_port(valports[rxPort])
- if rxPort % 2 == 0:
- tgenInput.append((txIntf, rxIntf, "dst%d.pcap" %valports[rxPort+1]))
- else:
- tgenInput.append((txIntf, rxIntf, "dst%d.pcap" %valports[rxPort-1]))
+ port_id = valports[rxPort+1] if rxPort % 2 == 0 else \
+ valports[rxPort-1]
+ for pcap in pcaps[port_id]:
+ tgenInput.append((txIntf, rxIntf, pcap))
+
+
+ vm_config = self.set_fields()
+ # clear streams before add new streams
+ self.tester.pktgen.clear_streams()
+ # run packet generator
+ streams = self.pktgen_helper.prepare_stream_from_tginput(tgenInput, 100,
+ vm_config, self.tester.pktgen)
+ _, pps = self.tester.pktgen.measure_throughput(stream_ids=streams)
+
- _, pps = self.tester.traffic_generator_throughput(tgenInput)
self.verify(pps > 0, "No traffic detected")
pps /= 1000000.0
linerate = self.wirespeed(self.nic, frame_size, 2)
pct = pps * 100 / linerate
- latencys = self.tester.traffic_generator_latency(tgenInput)
+
+
+ # clear streams before add new streams
+ self.tester.pktgen.clear_streams()
+ # run packet generator
+ streams = self.pktgen_helper.prepare_stream_from_tginput(tgenInput, 100,
+ vm_config, self.tester.pktgen)
+ latencys = self.tester.pktgen.measure_latency(stream_ids=streams)
+
index += 1
@@ -403,11 +444,26 @@ class TestFM10kL3fwd(TestCase, IxiaPacketGenerator):
# Prepare traffic flow
payload_size = frame_size - \
HEADER_SIZE['ip'] - HEADER_SIZE['eth']
+ pcaps = {}
+ flows = []
for _port in range(2):
- dmac = self.dut.get_mac_address(valports[_port])
- flows = ['Ether(dst="%s")/%s/("X"*%d)' % (dmac, flow, payload_size) for flow in self.flows()[_port *2:(_port +1)*2]]
- self.tester.scapy_append('wrpcap("dst%d.pcap", [%s])' %(valports[_port],string.join(flows,',')))
- self.tester.scapy_execute()
+ index = valports[_port]
+ dmac = self.dut.get_mac_address(index)
+ cnt = 0
+ for layer in self.flows()[_port *2:(_port +1)*2]:
+ flow = 'Ether(dst="%s")/%s/("X"*%d)' % (
+ dmac, layer, payload_size)
+ flows.append(flow)
+ pcap = os.sep.join([
+ self.output_path,
+ "dst{0}_{1}.pcap".format(index, cnt)])
+ self.tester.scapy_append('wrpcap("%s", [%s])' % (
+ pcap, flow))
+ self.tester.scapy_execute()
+ if index not in pcaps:
+ pcaps[index] = []
+ pcaps[index].append(pcap)
+ cnt += 1
self.rst_report("Flows for 2 ports, %d frame size.\n" % (frame_size),
annex=True)
@@ -472,12 +528,23 @@ class TestFM10kL3fwd(TestCase, IxiaPacketGenerator):
txIntf = self.tester.get_local_port(valports[rxPort - 1])
rxIntf = self.tester.get_local_port(valports[rxPort])
- if rxPort % 2 == 0:
- tgenInput.append((txIntf, rxIntf, "dst%d.pcap" %valports[rxPort+1]))
- else:
- tgenInput.append((txIntf, rxIntf, "dst%d.pcap" %valports[rxPort-1]))
-
- zero_loss_rate, tx_pkts, rx_pkts = self.tester.run_rfc2544(tgenInput, delay=5, permit_loss_rate=0.01)
+
+ port_id = valports[rxPort+1] if rxPort % 2 == 0 else \
+ valports[rxPort-1]
+ for pcap in pcaps[port_id]:
+ tgenInput.append((txIntf, rxIntf, pcap))
+
+
+ vm_config = self.set_fields()
+ # clear streams before add new streams
+ self.tester.pktgen.clear_streams()
+ # run packet generator
+ streams = self.pktgen_helper.prepare_stream_from_tginput(tgenInput,
+ 100, vm_config, self.tester.pktgen)
+ # set traffic option
+ traffic_opt = {'pdr': 0.01, 'duration': 5}
+ zero_loss_rate, tx_pkts, rx_pkts = self.tester.pktgen.measure_rfc2544(stream_ids=streams, options=traffic_opt)
+
loss_pkts = tx_pkts - rx_pkts
self.dut.send_expect("^C", "#")
@@ -539,20 +606,11 @@ class TestFM10kL3fwd(TestCase, IxiaPacketGenerator):
# remove setting for scatter
self.dut.send_expect("sed -i -e '/.enable_scatter= .*$/d' %s" % self.main_file, "# ")
-
- 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 ipRandom")
- self.add_tcl_cmd('ip config -destIpAddr "%s"' % dst)
- self.add_tcl_cmd("ip config -destIpAddrMode ipIdle")
- 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': {'src': {'action': 'random'}},}
+ return fields_config
def tear_down(self):
"""
--
2.17.1
More information about the dts
mailing list