X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=resources%2Ftools%2Ftrex%2Ftrex_stateless_profile.py;h=15a02259117fb122ce562f4a0f2016d54ebcfaf9;hb=bab0b570345ceb6ffeaec9e47a50e62d7303387e;hp=61b244e21ac7a083de8add4851e7d1f33f4e67fd;hpb=3a066cb1f1b79c6fb14cb1e9c7871d0b19bb06a2;p=csit.git diff --git a/resources/tools/trex/trex_stateless_profile.py b/resources/tools/trex/trex_stateless_profile.py index 61b244e21a..15a0225911 100755 --- a/resources/tools/trex/trex_stateless_profile.py +++ b/resources/tools/trex/trex_stateless_profile.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python3 # Copyright (c) 2019 Cisco and/or its affiliates. # Licensed under the Apache License, Version 2.0 (the "License"); @@ -18,14 +18,13 @@ the profile and sends the traffic. At the end, it measures the packet loss and latency. """ -import sys import argparse import json +import sys -sys.path.insert(0, "/opt/trex-core-2.35/scripts/automation/" - "trex_control_plane/stl/") - -from trex_stl_lib.api import * +sys.path.insert(0, "/opt/trex-core-2.61/scripts/automation/" + "trex_control_plane/interactive/") +from trex.stl.api import * def fmt_latency(lat_min, lat_avg, lat_max): @@ -40,7 +39,6 @@ def fmt_latency(lat_min, lat_avg, lat_max): :return: Formatted and rounded output "min/avg/max" :rtype: string """ - try: t_min = int(round(float(lat_min))) except ValueError: @@ -58,7 +56,7 @@ def fmt_latency(lat_min, lat_avg, lat_max): def simple_burst(profile_file, duration, framesize, rate, warmup_time, port_0, - port_1, latency, async_start=False, unidirection=False): + port_1, latency, async_start=False, traffic_directions=2): """Send traffic and measure packet loss and latency. Procedure: @@ -85,7 +83,7 @@ def simple_burst(profile_file, duration, framesize, rate, warmup_time, port_0, :param port_1: Port 1 on the traffic generator. :param latency: With latency stats. :param async_start: Start the traffic and exit. - :param unidirection: Traffic is unidirectional. + :param traffic_directions: Bidirectional (2) or unidirectional (1) traffic. :type profile_file: str :type framesize: int or str :type duration: float @@ -95,9 +93,8 @@ def simple_burst(profile_file, duration, framesize, rate, warmup_time, port_0, :type port_1: int :type latency: bool :type async_start: bool - :type unidirection: bool + :type traffic_directions: int """ - client = None total_rcvd = 0 total_sent = 0 @@ -118,7 +115,7 @@ def simple_burst(profile_file, duration, framesize, rate, warmup_time, port_0, try: # Create the client: - client = STLClient(verbose_level=LoggerApi.VERBOSE_QUIET) + client = STLClient() # Connect to server: client.connect() # Prepare our ports (the machine has 0 <--> 1 with static route): @@ -126,21 +123,20 @@ def simple_burst(profile_file, duration, framesize, rate, warmup_time, port_0, client.remove_all_streams(ports=[port_0, port_1]) if "macsrc" in profile_file: - client.set_port_attr(ports=[port_0, port_1], promiscuous=True, - resolve=False) + client.set_port_attr(ports=[port_0, port_1], promiscuous=True) if isinstance(framesize, int): client.add_streams(streams[0], ports=[port_0]) - if not unidirection: + if traffic_directions > 1: client.add_streams(streams[1], ports=[port_1]) elif isinstance(framesize, str): client.add_streams(streams[0:3], ports=[port_0]) - if not unidirection: + if traffic_directions > 1: client.add_streams(streams[3:6], ports=[port_1]) if latency: try: if isinstance(framesize, int): client.add_streams(streams[2], ports=[port_0]) - if not unidirection: + if traffic_directions > 1: client.add_streams(streams[3], ports=[port_1]) elif isinstance(framesize, str): latency = False @@ -149,7 +145,7 @@ def simple_burst(profile_file, duration, framesize, rate, warmup_time, port_0, print("##### FAILED to add latency streams #####") latency = False ports = [port_0] - if not unidirection: + if traffic_directions > 1: ports.append(port_1) # Warm-up phase: if warmup_time > 0: @@ -170,16 +166,15 @@ def simple_burst(profile_file, duration, framesize, rate, warmup_time, port_0, stats = client.get_stats() print("##### Warmup statistics #####") - print(json.dumps(stats, indent=4, separators=(',', ': '), - sort_keys=True)) + print(json.dumps(stats, indent=4, separators=(',', ': '))) lost_a = stats[port_0]["opackets"] - stats[port_1]["ipackets"] - if not unidirection: + if traffic_directions > 1: lost_b = stats[port_1]["opackets"] - stats[port_0]["ipackets"] print("\npackets lost from {p_0} --> {p_1}: {v} pkts".format( p_0=port_0, p_1=port_1, v=lost_a)) - if not unidirection: + if traffic_directions > 1: print("packets lost from {p_1} --> {p_0}: {v} pkts".format( p_0=port_0, p_1=port_1, v=lost_b)) @@ -191,7 +186,14 @@ def simple_burst(profile_file, duration, framesize, rate, warmup_time, port_0, # Choose rate and start traffic: client.start(ports=ports, mult=rate, duration=duration) - if not async_start: + if async_start: + # For async stop, we need to export the current snapshot. + xsnap0 = client.ports[0].get_xstats().reference_stats + print("Xstats snapshot 0: {s!r}".format(s=xsnap0)) + if traffic_directions > 1: + xsnap1 = client.ports[1].get_xstats().reference_stats + print("Xstats snapshot 1: {s!r}".format(s=xsnap1)) + else: # Block until done: client.wait_on_traffic(ports=ports, timeout=duration+30) @@ -203,25 +205,26 @@ def simple_burst(profile_file, duration, framesize, rate, warmup_time, port_0, stats = client.get_stats() print("##### Statistics #####") - print(json.dumps(stats, indent=4, separators=(',', ': '), - sort_keys=True)) + print(json.dumps(stats, indent=4, separators=(',', ': '))) lost_a = stats[port_0]["opackets"] - stats[port_1]["ipackets"] - if not unidirection: + if traffic_directions > 1: lost_b = stats[port_1]["opackets"] - stats[port_0]["ipackets"] + # Stats index is not a port number, but "pgid". + # TODO: Find out what "pgid" means. if latency: lat_a = fmt_latency( - str(stats["latency"][port_0]["latency"]["total_min"]), - str(stats["latency"][port_0]["latency"]["average"]), - str(stats["latency"][port_0]["latency"]["total_max"])) - if not unidirection: + str(stats["latency"][0]["latency"]["total_min"]), + str(stats["latency"][0]["latency"]["average"]), + str(stats["latency"][0]["latency"]["total_max"])) + if traffic_directions > 1: lat_b = fmt_latency( - str(stats["latency"][port_1]["latency"]["total_min"]), - str(stats["latency"][port_1]["latency"]["average"]), - str(stats["latency"][port_1]["latency"]["total_max"])) + str(stats["latency"][1]["latency"]["total_min"]), + str(stats["latency"][1]["latency"]["average"]), + str(stats["latency"][1]["latency"]["total_max"])) - if not unidirection: + if traffic_directions > 1: total_sent = stats[0]["opackets"] + stats[1]["opackets"] total_rcvd = stats[0]["ipackets"] + stats[1]["ipackets"] else: @@ -230,12 +233,12 @@ def simple_burst(profile_file, duration, framesize, rate, warmup_time, port_0, print("\npackets lost from {p_0} --> {p_1}: {v} pkts".format( p_0=port_0, p_1=port_1, v=lost_a)) - if not unidirection: + if traffic_directions > 1: print("packets lost from {p_1} --> {p_0}: {v} pkts".format( - p_0=port_0, p_1=port_1, v=lost_b)) + p_0=port_0, p_1=port_1, v=lost_b)) - except STLError as err: - sys.stderr.write("{0}\n".format(err)) + except STLError as ex_error: + print(ex_error, file=sys.stderr) sys.exit(1) finally: @@ -245,11 +248,11 @@ def simple_burst(profile_file, duration, framesize, rate, warmup_time, port_0, else: if client: client.disconnect() - print("rate={0}, totalReceived={1}, totalSent={2}, " + print("rate={0!r}, totalReceived={1}, totalSent={2}, " "frameLoss={3}, latencyStream0(usec)={4}, " - "latencyStream1(usec)={5}". + "latencyStream1(usec)={5}, targetDuration={d!r}". format(rate, total_rcvd, total_sent, lost_a + lost_b, - lat_a, lat_b)) + lat_a, lat_b, d=duration)) def main(): @@ -258,7 +261,6 @@ def main(): It verifies the given command line arguments and runs "simple_burst" function. """ - parser = argparse.ArgumentParser() parser.add_argument("-p", "--profile", required=True, @@ -286,7 +288,7 @@ def main(): required=True, type=int, help="Port 1 on the traffic generator.") - parser.add_argument("--async", + parser.add_argument("--async_start", action="store_true", default=False, help="Non-blocking call of the script.") @@ -294,10 +296,10 @@ def main(): action="store_true", default=False, help="Add latency stream.") - parser.add_argument("--unidirection", - action="store_true", - default=False, - help="Send unidirection traffic.") + parser.add_argument("--traffic_directions", + type=int, + default=2, + help="Send bi- (2) or uni- (1) directional traffic.") args = parser.parse_args() @@ -314,8 +316,8 @@ def main(): port_0=args.port_0, port_1=args.port_1, latency=args.latency, - async_start=args.async, - unidirection=args.unidirection) + async_start=args.async_start, + traffic_directions=args.traffic_directions) if __name__ == '__main__':