diff options
| author |   Yaroslav Brustinov <ybrustin@cisco.com> | 2016-06-23 10:37:04 +0300 |
|---|---|---|
| committer | Yaroslav Brustinov <ybrustin@cisco.com> | 2016-06-23 10:37:04 +0300 |
| commit | f2320939a5deec2db2948788479199931e1f9176 (patch) | |
| tree | fc1b12908503d5b7d67cefe34e0c5fb0f908d2a6 /scripts/automation/trex_control_plane/stl/examples | |
| parent | 1eed7e59f23d3ab9b957d9822eefe72877e291da (diff) | |
| parent | d04442ab671f768a1b645fb887d4a9cd575c7852 (diff) | |
Merge branch 'master' into cpu_per_core
Conflicts:
scripts/automation/trex_control_plane/server/singleton_daemon.py
Diffstat (limited to 'scripts/automation/trex_control_plane/stl/examples')
| -rw-r--r-- | scripts/automation/trex_control_plane/stl/examples/stl_flow_latency_stats.py | 2 | ||||
| -rw-r--r-- | scripts/automation/trex_control_plane/stl/examples/stl_pcap.py | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/scripts/automation/trex_control_plane/stl/examples/stl_flow_latency_stats.py b/scripts/automation/trex_control_plane/stl/examples/stl_flow_latency_stats.py index 86b91728..ac0e212b 100644 --- a/scripts/automation/trex_control_plane/stl/examples/stl_flow_latency_stats.py +++ b/scripts/automation/trex_control_plane/stl/examples/stl_flow_latency_stats.py @@ -114,7 +114,7 @@ def rx_iteration (c, tx_port, rx_port, total_pkts, pkt_len, bw): else: print("TX pkts match - {0}".format(tx_pkts)) - if tx_bytes != (total_pkts * pkt_len): + if tx_bytes != (total_pkts * (pkt_len + 4)): # +4 for ethernet CRC print("TX bytes mismatch - got: {0}, expected: {1}".format(tx_bytes, (total_pkts * pkt_len))) pprint.pprint(flow_stats) return False diff --git a/scripts/automation/trex_control_plane/stl/examples/stl_pcap.py b/scripts/automation/trex_control_plane/stl/examples/stl_pcap.py index eae0f18b..98af6134 100644 --- a/scripts/automation/trex_control_plane/stl/examples/stl_pcap.py +++ b/scripts/automation/trex_control_plane/stl/examples/stl_pcap.py @@ -39,14 +39,12 @@ def inject_pcap (pcap_file, server, port, loop_count, ipg_usec, use_vm, remove_f c.reset(ports = [port]) c.clear_stats() - d = c.push_pcap(pcap_file, + c.push_pcap(pcap_file, ipg_usec = ipg_usec, count = loop_count, vm = vm, packet_hook = packet_hook) - STLSim().run(d, outfile = 'test.cap') - c.wait_on_traffic() |