X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=resources%2Ftools%2Ftrex%2Ftrex_stateless_profile.py;h=b888bcdea9f07332bcf31e64f75c04d596581ee1;hb=43e969af97832930a122aca538ef271e714838b5;hp=e77c1365a42a7981c19cdd5a36a4439a22ea62ea;hpb=66d62a7020a69f7a7c4d274b7bdd9e91de41aa1a;p=csit.git diff --git a/resources/tools/trex/trex_stateless_profile.py b/resources/tools/trex/trex_stateless_profile.py index e77c1365a4..b888bcdea9 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,28 +18,29 @@ 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.54/scripts/automation/" +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): +def fmt_latency(lat_min, lat_avg, lat_max, hdrh): """Return formatted, rounded latency. :param lat_min: Min latency :param lat_avg: Average latency :param lat_max: Max latency - :type lat_min: string - :type lat_avg: string - :type lat_max: string - :return: Formatted and rounded output "min/avg/max" - :rtype: string + :param hdrh: Base64 encoded compressed HDRHistogram object. + :type lat_min: str + :type lat_avg: str + :type lat_max: str + :type hdrh: str + :return: Formatted and rounded output (hdrh unchanged) "min/avg/max/hdrh". + :rtype: str """ - try: t_min = int(round(float(lat_min))) except ValueError: @@ -53,11 +54,11 @@ def fmt_latency(lat_min, lat_avg, lat_max): except ValueError: t_max = int(-1) - return "/".join(str(tmp) for tmp in (t_min, t_avg, t_max)) + return "/".join(str(tmp) for tmp in (t_min, t_avg, t_max, hdrh)) 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: @@ -84,7 +85,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 @@ -94,16 +95,15 @@ 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 lost_a = 0 lost_b = 0 - lat_a = "-1/-1/-1" - lat_b = "-1/-1/-1" + lat_a = "-1/-1/-1/" + lat_b = "-1/-1/-1/" # Read the profile: try: @@ -128,17 +128,17 @@ def simple_burst(profile_file, duration, framesize, rate, warmup_time, port_0, 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 @@ -147,7 +147,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: @@ -168,16 +168,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)) @@ -189,7 +188,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) @@ -201,25 +207,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_obj = stats["latency"][0]["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(lat_obj["total_min"]), str(lat_obj["average"]), + str(lat_obj["total_max"]), str(lat_obj["hdrh"])) + if traffic_directions > 1: + lat_obj = stats["latency"][1]["latency"] 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(lat_obj["total_min"]), str(lat_obj["average"]), + str(lat_obj["total_max"]), str(lat_obj["hdrh"])) - if not unidirection: + if traffic_directions > 1: total_sent = stats[0]["opackets"] + stats[1]["opackets"] total_rcvd = stats[0]["ipackets"] + stats[1]["ipackets"] else: @@ -228,12 +235,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: @@ -243,10 +250,6 @@ def simple_burst(profile_file, duration, framesize, rate, warmup_time, port_0, else: if client: client.disconnect() - if isinstance(rate, unicode): - rate = rate.encode("utf-8") - if isinstance(duration, unicode): - duration = duration.encode("utf-8") print("rate={0!r}, totalReceived={1}, totalSent={2}, " "frameLoss={3}, latencyStream0(usec)={4}, " "latencyStream1(usec)={5}, targetDuration={d!r}". @@ -260,7 +263,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, @@ -288,7 +290,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.") @@ -296,10 +298,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() @@ -316,8 +318,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__':