T-Rex: Add advanced stateful mode

- provide base routines to run T-Rex in advanced stateful mode

Change-Id: Ib0dc5f2919c370753335f6446860683dc4b12d93
Signed-off-by: Jan Gelety <jgelety@cisco.com>

66 files changed, 1306 insertions, 255 deletions

diff --git a/GPL/tools/trex/trex_astf_assert.py b/GPL/tools/trex/trex_astf_assert.py
new file mode 100644
index 0000000000..0e148f0435
--- /dev/null
+++ b/GPL/tools/trex/trex_astf_assert.py
@@ -0,0 +1,53 @@
+#!/usr/bin/python3
+
+# Copyright (c) 2020 Cisco and/or its affiliates.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at:
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+"""This script uses T-Rex advanced stateful (astf) API to drive T-Rex instance.
+
+Requirements:
+- T-Rex: https://github.com/cisco-system-traffic-generator/trex-core
+ - compiled and running T-Rex process (eg. ./t-rex-64 -i)
+ - trex.astf.api library
+- Script must be executed on a node with T-Rex instance.
+
+Functionality:
+1. Verify the API functionality and get server information.
+"""
+
+import sys
+
+sys.path.insert(
+    0, u"/opt/trex-core-2.73/scripts/automation/trex_control_plane/interactive/"
+)
+from trex.astf.api import *
+
+
+def main():
+    """Check server info and quit."""
+    client = ASTFClient()
+    try:
+        # connect to server
+        client.connect()
+
+        # get server info
+        print(client.get_server_system_info())
+    except TRexError as ex_error:
+        print(ex_error, file=sys.stderr)
+        sys.exit(1)
+    finally:
+        client.disconnect()
+
+
+if __name__ == u"__main__":
+    main()
diff --git a/GPL/tools/trex/trex_astf_profile.py b/GPL/tools/trex/trex_astf_profile.py
new file mode 100644
index 0000000000..ed0b8fc0b3
--- /dev/null
+++ b/GPL/tools/trex/trex_astf_profile.py
@@ -0,0 +1,391 @@
+#!/usr/bin/python3
+
+# Copyright (c) 2020 Cisco and/or its affiliates.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at:
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+"""This module gets T-Rex advanced stateful (astf) traffic profile together
+with other parameters, reads the profile and sends the traffic. At the end, it
+measures the packet loss and latency.
+"""
+
+import argparse
+import json
+import sys
+import time
+
+sys.path.insert(
+    0, u"/opt/trex-core-2.73/scripts/automation/trex_control_plane/interactive/"
+)
+from trex.astf.api import *
+
+
+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
+    :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:
+        t_min = int(-1)
+    try:
+        t_avg = int(round(float(lat_avg)))
+    except ValueError:
+        t_avg = int(-1)
+    try:
+        t_max = int(round(float(lat_max)))
+    except ValueError:
+        t_max = int(-1)
+
+    return u"/".join(str(tmp) for tmp in (t_min, t_avg, t_max, hdrh))
+
+
+def simple_burst(
+        profile_file, duration, framesize, mult, warmup_time, port_0, port_1,
+        latency, async_start=False, traffic_directions=2):
+    """Send traffic and measure packet loss and latency.
+
+    Procedure:
+     - reads the given traffic profile with streams,
+     - connects to the T-rex astf client,
+     - resets the ports,
+     - removes all existing streams,
+     - adds streams from the traffic profile to the ports,
+     - if the warm-up time is more than 0, sends the warm-up traffic, reads the
+       statistics,
+     - clears the statistics from the client,
+     - starts the traffic,
+     - waits for the defined time (or runs forever if async mode is defined),
+     - stops the traffic,
+     - reads and displays the statistics and
+     - disconnects from the client.
+
+    :param profile_file: A python module with T-rex traffic profile.
+    :param duration: Duration of traffic run in seconds (-1=infinite).
+    :param framesize: Frame size.
+    :param mult: Multiplier of profile CPS.
+    :param warmup_time: Traffic warm-up time in seconds, 0 = disable.
+    :param port_0: Port 0 on the traffic generator.
+    :param port_1: Port 1 on the traffic generator.
+    :param latency: With latency stats.
+    :param async_start: Start the traffic and exit.
+    :param traffic_directions: Bidirectional (2) or unidirectional (1) traffic.
+    :type profile_file: str
+    :type duration: float
+    :type framesize: int or str
+    :type mult: int
+    :type warmup_time: float
+    :type port_0: int
+    :type port_1: int
+    :type latency: bool
+    :type async_start: bool
+    :type traffic_directions: int
+    """
+    client = None
+    total_rcvd = 0
+    total_sent = 0
+    lost_a = 0
+    lost_b = 0
+    lat_a = u"-1/-1/-1/"
+    lat_b = u"-1/-1/-1/"
+    lat_a_hist = u""
+    lat_b_hist = u""
+    l7_data = u""
+    stats = dict()
+    stats_sampling = 1.0
+    approximated_duration = 0
+
+    # Read the profile.
+    try:
+        # TODO: key-values pairs to the profile file
+        #  - ips ?
+        print(f"### Profile file:\n{profile_file}")
+        profile = ASTFProfile.load(profile_file, framesize=framesize)
+    except TRexError:
+        print(f"Error while loading profile '{profile_file}'!")
+        raise
+
+    try:
+        # Create the client.
+        client = ASTFClient()
+        # Connect to server
+        client.connect()
+        # Acquire ports, stop the traffic, remove loaded traffic and clear
+        # stats.
+        client.reset()
+        # Load the profile.
+        client.load_profile(profile)
+
+        ports = [port_0]
+        if traffic_directions > 1:
+            ports.append(port_1)
+
+        # Warm-up phase.
+        if warmup_time > 0:
+            # Clear the stats before injecting.
+            client.clear_stats()
+            # Choose CPS and start traffic.
+            client.start(mult=mult, duration=warmup_time)
+            time_start = time.monotonic()
+
+            # Read the stats after the warmup duration (no sampling needed).
+            time.sleep(warmup_time)
+            stats[time.monotonic()-time_start] = client.get_stats()
+
+            if client.get_warnings():
+                for warning in client.get_warnings():
+                    print(warning)
+
+            client.reset()
+
+            print(u"##### Warmup Statistics #####")
+            print(json.dumps(stats, indent=4, separators=(u",", u": ")))
+
+            # TODO: check stats format
+            stats = stats[sorted(stats.keys())[-1]]
+            lost_a = stats[port_0][u"opackets"] - stats[port_1][u"ipackets"]
+            if traffic_directions > 1:
+                lost_b = stats[port_1][u"opackets"] - stats[port_0][u"ipackets"]
+
+            print(f"packets lost from {port_0} --> {port_1}: {lost_a} pkts")
+            if traffic_directions > 1:
+                print(f"packets lost from {port_1} --> {port_0}: {lost_b} pkts")
+
+        # Clear the stats before injecting.
+        lost_a = 0
+        lost_b = 0
+        stats = dict()
+
+        # Choose CPS and start traffic.
+        client.start(
+            mult=mult, duration=duration, nc=True,
+            latency_pps=mult if latency else 0, client_mask=2**len(ports)-1
+        )
+        time_start = time.monotonic()
+
+        if async_start:
+            # For async stop, we need to export the current snapshot.
+            xsnap0 = client.ports[port_0].get_xstats().reference_stats
+            print(f"Xstats snapshot 0: {xsnap0!r}")
+            if traffic_directions > 1:
+                xsnap1 = client.ports[port_1].get_xstats().reference_stats
+                print(f"Xstats snapshot 1: {xsnap1!r}")
+        else:
+            # Do not block until done.
+            while client.is_traffic_active(ports=ports):
+                time.sleep(
+                    stats_sampling if stats_sampling < duration else duration
+                )
+                # Sample the stats.
+                stats[time.monotonic()-time_start] = client.get_stats(
+                    ports=ports
+                )
+            else:
+                # Read the stats after the test
+                stats[time.monotonic()-time_start] = client.get_stats(
+                    ports=ports
+                )
+
+            if client.get_warnings():
+                for warning in client.get_warnings():
+                    print(warning)
+
+            client.reset()
+
+            print(u"##### Statistics #####")
+            print(json.dumps(stats, indent=4, separators=(u",", u": ")))
+
+            approximated_duration = list(sorted(stats.keys()))[-1]
+            stats = stats[sorted(stats.keys())[-1]]
+            lost_a = stats[port_0][u"opackets"] - stats[port_1][u"ipackets"]
+            if traffic_directions > 1:
+                lost_b = stats[port_1][u"opackets"] - stats[port_0][u"ipackets"]
+
+            # TODO: Latency measurement not used at this phase. This part will
+            #  be aligned in another commit.
+            # Stats index is not a port number, but "pgid".
+            if latency:
+                lat_obj = stats[u"latency"][0][u"hist"]
+                # TODO: Latency histogram is dictionary in astf mode,
+                #  needs additional processing
+                lat_a = fmt_latency(
+                    str(lat_obj[u"min_usec"]), str(lat_obj[u"s_avg"]),
+                    str(lat_obj[u"max_usec"]), u"-")
+                lat_a_hist = str(lat_obj[u"histogram"])
+                if traffic_directions > 1:
+                    lat_obj = stats[u"latency"][1][u"hist"]
+                    lat_b = fmt_latency(
+                        str(lat_obj[u"min_usec"]), str(lat_obj[u"s_avg"]),
+                        str(lat_obj[u"max_usec"]), u"-")
+                    lat_b_hist = str(lat_obj[u"histogram"])
+
+            if traffic_directions > 1:
+                total_sent = \
+                    stats[port_0][u"opackets"] + stats[port_1][u"opackets"]
+                total_rcvd = \
+                    stats[port_0][u"ipackets"] + stats[port_1][u"ipackets"]
+                client_stats = stats[u"traffic"][u"client"]
+                server_stats = stats[u"traffic"][u"server"]
+                # Active and established flows UDP/TCP
+                # Client
+                c_act_flows = client_stats[u"m_active_flows"]
+                c_est_flows = client_stats[u"m_est_flows"]
+                l7_data = f"client_active_flows={c_act_flows}, "
+                l7_data += f"client_established_flows={c_est_flows}, "
+                # Server
+                s_act_flows = server_stats[u"m_active_flows"]
+                s_est_flows = server_stats[u"m_est_flows"]
+                l7_data += f"server_active_flows={s_act_flows}, "
+                l7_data += f"server_established_flows={s_est_flows}, "
+                # Some zero counters are not sent
+                if u"udp" in profile_file:
+                    # Client
+                    # Established connections
+                    c_udp_connects = client_stats.get(u"udps_connects", 0)
+                    l7_data += f"client_udp_connects={c_udp_connects}, "
+                    # Closed connections
+                    c_udp_closed = client_stats.get(u"udps_closed", 0)
+                    l7_data += f"client_udp_closed={c_udp_closed}, "
+                    # Server
+                    # Accepted connections
+                    s_udp_accepts = server_stats.get(u"udps_accepts", 0)
+                    l7_data += f"server_udp_accepts={s_udp_accepts}, "
+                    # Closed connections
+                    s_udp_closed = server_stats.get(u"udps_closed", 0)
+                    l7_data += f"server_udp_closed={s_udp_closed}, "
+                elif u"tcp" in profile_file:
+                    # Client
+                    # Initiated connections
+                    c_tcp_connatt = client_stats.get(u"tcps_connattempt", 0)
+                    l7_data += f"client_tcp_connect_inits={c_tcp_connatt}, "
+                    # Established connections
+                    c_tcp_connects = client_stats.get(u"tcps_connects", 0)
+                    l7_data += f"client_tcp_connects={c_tcp_connects}, "
+                    # Closed connections
+                    c_tcp_closed = client_stats.get(u"tcps_closed", 0)
+                    l7_data += f"client_tcp_closed={c_tcp_closed}, "
+                    # Server
+                    # Accepted connections
+                    s_tcp_accepts = server_stats.get(u"tcps_accepts", 0)
+                    l7_data += f"server_tcp_accepts={s_tcp_accepts}, "
+                    # Established connections
+                    s_tcp_connects = server_stats.get(u"tcps_connects", 0)
+                    l7_data += f"server_tcp_connects={s_tcp_connects}, "
+                    # Closed connections
+                    s_tcp_closed = server_stats.get(u"tcps_closed", 0)
+                    l7_data += f"server_tcp_closed={s_tcp_closed}, "
+            else:
+                total_sent = stats[port_0][u"opackets"]
+                total_rcvd = stats[port_1][u"ipackets"]
+
+            print(f"packets lost from {port_0} --> {port_1}: {lost_a} pkts")
+            if traffic_directions > 1:
+                print(f"packets lost from {port_1} --> {port_0}: {lost_b} pkts")
+
+    except TRexError:
+        print(u"T-Rex ASTF runtime error!", file=sys.stderr)
+        raise
+
+    finally:
+        if client:
+            if async_start:
+                client.disconnect(stop_traffic=False, release_ports=True)
+            else:
+                client.clear_profile()
+                client.disconnect()
+                print(
+                    f"cps={mult!r}, total_received={total_rcvd}, "
+                    f"total_sent={total_sent}, frame_loss={lost_a + lost_b}, "
+                    f"approximated_duration={approximated_duration}, "
+                    f"latency_stream_0(usec)={lat_a}, "
+                    f"latency_stream_1(usec)={lat_b}, "
+                    f"latency_hist_stream_0={lat_a_hist}, "
+                    f"latency_hist_stream_1={lat_b_hist}, "
+                    f"{l7_data}"
+                )
+
+
+def main():
+    """Main function for the traffic generator using T-rex.
+
+    It verifies the given command line arguments and runs "simple_burst"
+    function.
+    """
+    parser = argparse.ArgumentParser()
+    parser.add_argument(
+        u"-p", u"--profile", required=True, type=str,
+        help=u"Python traffic profile."
+    )
+    parser.add_argument(
+        u"-d", u"--duration", required=True, type=float,
+        help=u"Duration of traffic run."
+    )
+    parser.add_argument(
+        u"-s", u"--frame_size", required=True,
+        help=u"Size of a Frame without padding and IPG."
+    )
+    parser.add_argument(
+        u"-m", u"--mult", required=True, type=int,
+        help=u"Multiplier of profile CPS."
+    )
+    parser.add_argument(
+        u"-w", u"--warmup_time", type=float, default=5.0,
+        help=u"Traffic warm-up time in seconds, 0 = disable."
+    )
+    parser.add_argument(
+        u"--port_0", required=True, type=int,
+        help=u"Port 0 on the traffic generator."
+    )
+    parser.add_argument(
+        u"--port_1", required=True, type=int,
+        help=u"Port 1 on the traffic generator."
+    )
+    parser.add_argument(
+        u"--async_start", action=u"store_true", default=False,
+        help=u"Non-blocking call of the script."
+    )
+    parser.add_argument(
+        u"--latency", action=u"store_true", default=False,
+        help=u"Add latency stream."
+    )
+    parser.add_argument(
+        u"--traffic_directions", type=int, default=2,
+        help=u"Send bi- (2) or uni- (1) directional traffic."
+    )
+
+    args = parser.parse_args()
+
+    try:
+        framesize = int(args.frame_size)
+    except ValueError:
+        framesize = args.frame_size
+
+    simple_burst(
+        profile_file=args.profile, duration=args.duration, framesize=framesize,
+        mult=args.mult, warmup_time=args.warmup_time, port_0=args.port_0,
+        port_1=args.port_1, latency=args.latency, async_start=args.async_start,
+        traffic_directions=args.traffic_directions
+    )
+
+
+if __name__ == u"__main__":
+    main()
diff --git a/GPL/tools/trex/trex_astf_stop.py b/GPL/tools/trex/trex_astf_stop.py
new file mode 100644
index 0000000000..be13e8ed42
--- /dev/null
+++ b/GPL/tools/trex/trex_astf_stop.py
@@ -0,0 +1,154 @@
+#!/usr/bin/python3
+
+# Copyright (c) 2020 Cisco and/or its affiliates.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at:
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+"""This script uses T-REX advanced stateful API to drive t-rex instance.
+
+Requirements:
+- T-REX: https://github.com/cisco-system-traffic-generator/trex-core
+ - compiled and running T-REX process (eg. ./t-rex-64 -i)
+ - trex.astf.api library
+- Script must be executed on a node with T-REX instance
+
+Functionality:
+1. Stop any running traffic
+2. Optionally restore reference counter values.
+3. Return conter differences.
+"""
+
+import argparse
+import json
+import sys
+
+from collections import OrderedDict  # Needed to parse xstats representation.
+
+sys.path.insert(
+    0, u"/opt/trex-core-2.73/scripts/automation/trex_control_plane/interactive/"
+)
+from trex.astf.api import *
+
+
+def main():
+    """Stop traffic if any is running. Report xstats."""
+    parser = argparse.ArgumentParser()
+    parser.add_argument(
+        u"--xstat0", type=str, default=u"",
+        help=u"Reference xstat object if any."
+    )
+    parser.add_argument(
+        u"--xstat1", type=str, default=u"",
+        help=u"Reference xstat object if any."
+    )
+    args = parser.parse_args()
+
+    client = ASTFClient()
+    try:
+        # connect to server
+        client.connect()
+
+        client.acquire(force=True)
+        client.stop()
+
+        # Read the stats after the test,
+        # we need to update values before the last trial started.
+        if args.xstat0:
+            snapshot = eval(args.xstat0)
+            client.ports[0].get_xstats().reference_stats = snapshot
+        if args.xstat1:
+            snapshot = eval(args.xstat1)
+            client.ports[1].get_xstats().reference_stats = snapshot
+        # Now we can call the official method to get differences.
+        xstats0 = client.get_xstats(0)
+        xstats1 = client.get_xstats(1)
+
+    # If TRexError happens, let the script fail with stack trace.
+    finally:
+        client.clear_profile()
+        client.disconnect()
+
+    # TODO: check xstats format
+    print(u"##### statistics port 0 #####")
+    print(json.dumps(xstats0, indent=4, separators=(u",", u": ")))
+    print(u"##### statistics port 1 #####")
+    print(json.dumps(xstats1, indent=4, separators=(u",", u": ")))
+
+    tx_0, rx_0 = xstats0[u"tx_good_packets"], xstats0[u"rx_good_packets"]
+    tx_1, rx_1 = xstats1[u"tx_good_packets"], xstats1[u"rx_good_packets"]
+    lost_a, lost_b = tx_0 - rx_1, tx_1 - rx_0
+
+    client_stats = xstats0[u"traffic"][u"client"]
+    server_stats = xstats1[u"traffic"][u"server"]
+    # Active and established flows UDP/TCP
+    # Client
+    c_act_flows = client_stats[u"m_active_flows"]
+    c_est_flows = client_stats[u"m_est_flows"]
+    l7_data = f"client_active_flows={c_act_flows}, "
+    l7_data += f"client_established_flows={c_est_flows}, "
+    # Server
+    s_act_flows = server_stats[u"m_active_flows"]
+    s_est_flows = server_stats[u"m_est_flows"]
+    l7_data += f"server_active_flows={s_act_flows}, "
+    l7_data += f"server_established_flows={s_est_flows}, "
+    # Some zero counters are not sent
+    # Client
+    # Established connections
+    c_udp_connects = client_stats.get(u"udps_connects", 0)
+    l7_data += f"client_udp_connects={c_udp_connects}, "
+    # Closed connections
+    c_udp_closed = client_stats.get(u"udps_closed", 0)
+    l7_data += f"client_udp_closed={c_udp_closed}, "
+    # Server
+    # Accepted connections
+    s_udp_accepts = server_stats.get(u"udps_accepts", 0)
+    l7_data += f"server_udp_accepts={s_udp_accepts}, "
+    # Closed connections
+    s_udp_closed = server_stats.get(u"udps_closed", 0)
+    # Client
+    # Initiated connections
+    c_tcp_connatt = client_stats.get(u"tcps_connattempt", 0)
+    l7_data += f"client_tcp_connect_inits={c_tcp_connatt}, "
+    # Established connections
+    c_tcp_connects = client_stats.get(u"tcps_connects", 0)
+    l7_data += f"client_tcp_connects={c_tcp_connects}, "
+    # Closed connections
+    c_tcp_closed = client_stats.get(u"tcps_closed", 0)
+    l7_data += f"client_tcp_closed={c_tcp_closed}, "
+    # Server
+    # Accepted connections
+    s_tcp_accepts = server_stats.get(u"tcps_accepts", 0)
+    l7_data += f"server_tcp_accepts={s_tcp_accepts}, "
+    # Established connections
+    s_tcp_connects = server_stats.get(u"tcps_connects", 0)
+    l7_data += f"server_tcp_connects={s_tcp_connects}, "
+    # Closed connections
+    s_tcp_closed = server_stats.get(u"tcps_closed", 0)
+    l7_data += f"server_tcp_closed={s_tcp_closed}, "
+
+    print(f"packets lost from 0 --> 1:   {lost_a} pkts")
+    print(f"packets lost from 1 --> 0:   {lost_b} pkts")
+
+    total_rcvd, total_sent = rx_0 + rx_1, tx_0 + tx_1
+    total_lost = total_sent - total_rcvd
+    # TODO: Add latency.
+    print(
+        f"cps='unknown', total_received={total_rcvd}, total_sent={total_sent}, "
+        f"frame_loss={total_lost}, "
+        f"latency_stream_0(usec)=-1/-1/-1, latency_stream_1(usec)=-1/-1/-1, "
+        u"latency_hist_stream_0={}, latency_hist_stream_1={}, "
+        f"{l7_data}"
+    )
+
+
+if __name__ == u"__main__":
+    main()
diff --git a/GPL/tools/trex/trex_server_info.py b/GPL/tools/trex/trex_stl_assert.py
index 8423801285..835d009b26 100644
--- a/GPL/tools/trex/trex_server_info.py
+++ b/GPL/tools/trex/trex_stl_assert.py
@@ -13,17 +13,16 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-"""This script uses T-REX stateless API to drive t-rex instance.
+"""This script uses T-Rex stateless API to drive T-Rex instance.
 
 Requirements:
 - T-REX: https://github.com/cisco-system-traffic-generator/trex-core
- - compiled and running T-REX process (eg. ./t-rex-64 -i)
+ - compiled and running T-Rex process (eg. ./t-rex-64 -i)
  - trex.stl.api library
-- Script must be executed on a node with T-REX instance
+- Script must be executed on a node with T-Rex instance.
 
 Functionality:
-1. Verify the API functionality and get server information
-
+1. Verify the API functionality and get server information.
 """
 
 import sys
diff --git a/GPL/tools/trex/trex_stateless_profile.py b/GPL/tools/trex/trex_stl_profile.py
index 7d83936266..64b8342e57 100644
--- a/GPL/tools/trex/trex_stateless_profile.py
+++ b/GPL/tools/trex/trex_stl_profile.py
@@ -120,9 +120,9 @@ def simple_burst(
             rate=rate
         )
         streams = profile.get_streams()
-    except STLError as err:
-        print(f"Error while loading profile '{profile_file}' {err!r}")
-        sys.exit(1)
+    except STLError:
+        print(f"Error while loading profile '{profile_file}'!")
+        raise
 
     try:
         # Create the client:
@@ -168,8 +168,9 @@ def simple_burst(
             client.clear_stats()
 
             # Choose rate and start traffic:
-            client.start(ports=ports, mult=rate, duration=warmup_time,
-                         force=force)
+            client.start(
+                ports=ports, mult=rate, duration=warmup_time, force=force
+            )
 
             # Block until done:
             time_start = time.monotonic()
@@ -258,9 +259,9 @@ def simple_burst(
             if traffic_directions > 1:
                 print(f"packets lost from {port_1} --> {port_0}: {lost_b} pkts")
 
-    except STLError as ex_error:
-        print(ex_error, file=sys.stderr)
-        sys.exit(1)
+    except STLError:
+        print(u"T-Rex STL runtime error!", file=sys.stderr)
+        raise
 
     finally:
         if async_start:
@@ -270,12 +271,13 @@ def simple_burst(
             if client:
                 client.disconnect()
             print(
-                f"rate={rate!r}, totalReceived={total_rcvd}, "
-                f"totalSent={total_sent}, frameLoss={lost_a + lost_b}, "
-                f"targetDuration={duration!r}, "
-                f"approximatedDuration={approximated_duration!r}, "
-                f"approximatedRate={approximated_rate}, "
-                f"latencyStream0(usec)={lat_a}, latencyStream1(usec)={lat_b}, "
+                f"rate={rate!r}, total_received={total_rcvd}, "
+                f"total_sent={total_sent}, frame_loss={lost_a + lost_b}, "
+                f"target_duration={duration!r}, "
+                f"approximated_duration={approximated_duration!r}, "
+                f"approximated_rate={approximated_rate}, "
+                f"latency_stream_0(usec)={lat_a}, "
+                f"latency_stream_1(usec)={lat_b}, "
             )
 
 
@@ -300,7 +302,7 @@ def main():
     )
     parser.add_argument(
         u"-r", u"--rate", required=True,
-        help=u"Traffic rate with included units (%, pps)."
+        help=u"Traffic rate with included units (pps)."
     )
     parser.add_argument(
         u"-w", u"--warmup_time", type=float, default=5.0,
diff --git a/GPL/tools/trex/trex_stateless_stop.py b/GPL/tools/trex/trex_stl_stop.py
index 5e8721d28c..28a9de9421 100644
--- a/GPL/tools/trex/trex_stateless_stop.py
+++ b/GPL/tools/trex/trex_stl_stop.py
@@ -93,10 +93,11 @@ def main():
     total_lost = total_sent - total_rcvd
     # TODO: Add latency.
     print(
-        f"rate='unknown', totalReceived={total_rcvd}, totalSent={total_sent}, "
-        f"frameLoss={total_lost}, targetDuration='manual', "
-        f"approximatedDuration='manual', approximatedRate='unknown', "
-        f"latencyStream0(usec)=-1/-1/-1, latencyStream1(usec)=-1/-1/-1"
+        f"rate='unknown', total_received={total_rcvd}, "
+        f"total_sent={total_sent}, frame_loss={total_lost}, "
+        f"target_duration='manual', approximated_duration='manual', "
+        f"approximated_rate='unknown', "
+        f"latency_stream_0(usec)=-1/-1/-1, latency_stream_1(usec)=-1/-1/-1"
     )
 
 
diff --git a/GPL/traffic_profiles/trex/profile_trex_astf_base_class.py b/GPL/traffic_profiles/trex/profile_trex_astf_base_class.py
new file mode 100644
index 0000000000..ed28ccbb78
--- /dev/null
+++ b/GPL/traffic_profiles/trex/profile_trex_astf_base_class.py
@@ -0,0 +1,129 @@
+# Copyright (c) 2020 Cisco and/or its affiliates.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at:
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+"""Base class for profiles for T-rex advanced stateful (astf) traffic generator.
+"""
+
+from random import choices
+from string import ascii_letters
+
+from trex.astf.api import *
+
+
+class TrafficProfileBaseClass:
+    """Base class for profiles for T-rex astf traffic generator."""
+
+    STREAM_TABLE = {
+        u"IMIX_v4": [
+            {u"size": 60, u"pps": 28, u"isg": 0},
+            {u"size": 590, u"pps": 20, u"isg": 0.1},
+            {u"size": 1514, u"pps": 4, u"isg": 0.2}
+        ],
+        'IMIX_v4_1': [
+            {u"size": 64, u"pps": 28, u"isg": 0},
+            {u"size": 570, u"pps": 16, u"isg": 0.1},
+            {u"size": 1518, u"pps": 4, u"isg": 0.2}
+        ]
+    }
+
+    def __init__(self):
+        # Default values of required parameters; can be overwritten in
+        # "get_profile" method.
+        self.framesize = 64
+        self._pcap_dir = u""
+
+        # If needed, add your own parameters.
+
+    @property
+    def pcap_dir(self):
+        """Pcap file directory.
+
+        If needed, implement your own algorithm.
+
+        :returns: Pcap file directory.
+        :rtype: str
+        """
+        return self._pcap_dir
+
+    def _gen_padding(self, current_length, required_length=0):
+        """Generate padding.
+
+        If needed, implement your own algorithm.
+
+        :param current_length: Current length of the packet.
+        :param required_length: Required length of the packet. If set to 0 then
+        self.framesize value is used.
+        :type current_length: int
+        :type required_length: int
+        :returns: The generated padding.
+        :rtype: str
+        """
+        # TODO: Add support for IMIX frame size;
+        #  use random.randrange(0, len(self.STREAM_TABLE[self.framesize])) ?
+        if not required_length:
+           required_length = self.framesize
+
+        return str(choices(ascii_letters, k=required_length - current_length))
+
+    def define_profile(self):
+        """Define profile to be used by T-Rex astf traffic generator.
+
+        This method MUST return:
+
+            return ip_gen, templates, cap_list
+
+            templates or cap_list CAN be None.
+
+        :returns: IP generator and profile templates or list of pcap files for
+        traffic generator.
+        :rtype: tuple
+        """
+        raise NotImplementedError
+
+    def create_profile(self):
+        """Create traffic profile.
+
+        Implement your own traffic profiles.
+
+        :returns: Traffic profile.
+        :rtype: trex.astf.trex_astf_profile.ASTFProfile
+        """
+        ip_gen, templates, cap_list = self.define_profile()
+
+        # In most cases you will not have to change the code below:
+
+        # profile
+        profile = ASTFProfile(
+            default_ip_gen=ip_gen,
+            templates=templates,
+            cap_list=cap_list
+        )
+
+        return profile
+
+    def get_profile(self, **kwargs):
+        """Get traffic profile created by "create_profile" method.
+
+        If needed, add your own parameters.
+
+        :param kwargs: Key-value pairs used by "create_profile" method while
+        creating the profile.
+        :returns: Traffic profile.
+        :rtype: trex.astf.trex_astf_profile.ASTFProfile
+        """
+        self.framesize = kwargs[u"framesize"]
+        self._pcap_dir = kwargs.get(
+            u"pcap_dir",u"/opt/trex-core-2.73/scripts/avl"
+        )
+
+        return self.create_profile()
diff --git a/GPL/traffic_profiles/trex/trex-astf-ethip4udp-1024h.py b/GPL/traffic_profiles/trex/trex-astf-ethip4udp-1024h.py
new file mode 100644
index 0000000000..a010fe1613
--- /dev/null
+++ b/GPL/traffic_profiles/trex/trex-astf-ethip4udp-1024h.py
@@ -0,0 +1,117 @@
+# Copyright (c) 2020 Cisco and/or its affiliates.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at:
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+"""Traffic profile for T-rex advanced stateful (astf) traffic generator.
+
+Traffic profile:
+ - Two streams sent in directions 0 --> 1 (client -> server, requests) and
+   1 --> 0 (server -> client, responses) at the same time.
+ - Packet: ETH / IP / UDP
+ - Direction 0 --> 1:
+   - Source IP address range:      192.168.0.0 - 192.168.3.255
+   - Destination IP address range: 20.0.0.0 - 20.0.3.255
+ - Direction 1 --> 0:
+   - Source IP address range:      destination IP address from packet received
+     on port 1
+   - Destination IP address range: source IP address from packet received
+     on port 1
+"""
+
+from trex.astf.api import *
+
+from profile_trex_astf_base_class import TrafficProfileBaseClass
+
+
+class TrafficProfile(TrafficProfileBaseClass):
+    """Traffic profile."""
+
+    def __init__(self):
+        """Initialization and setting of profile parameters."""
+
+        super(TrafficProfileBaseClass, self).__init__()
+
+        # IPs used in packet headers.
+        self.p1_src_start_ip = u"192.168.0.0"
+        self.p1_src_end_ip = u"192.168.3.255"
+        self.p1_dst_start_ip = u"20.0.0.0"
+        self.p1_dst_end_ip = u"20.0.3.255"
+
+        # UDP messages
+        self.udp_req = u"GET"
+        self.udp_res = u"ACK"
+
+        # Headers length
+        self.headers_size = 42  # 14B l2 + 20B ipv4 + 8B udp
+
+    def define_profile(self):
+        """Define profile to be used by advanced stateful traffic generator.
+
+        This method MUST return:
+            return ip_gen, templates, None
+
+        :returns: IP generator and profile templates ASTFProfile().
+        :rtype: tuple
+        """
+        self.udp_req += self._gen_padding(self.headers_size + len(self.udp_req))
+        self.udp_res += self._gen_padding(self.headers_size + len(self.udp_res))
+
+        # client commands
+        prog_c = ASTFProgram(stream=False)
+        prog_c.send_msg(self.udp_req)  # size and fill not supported in v2.73
+        prog_c.recv_msg(1)
+
+        # server commands
+        prog_s = ASTFProgram(stream=False)
+        prog_s.recv_msg(1)
+        prog_s.send_msg(self.udp_res)
+
+        # ip generators
+        ip_gen_c = ASTFIPGenDist(
+            ip_range=[self.p1_src_start_ip, self.p1_src_end_ip],
+            distribution=u"seq"
+        )
+        ip_gen_s = ASTFIPGenDist(
+            ip_range=[self.p1_dst_start_ip, self.p1_dst_end_ip],
+            distribution=u"seq"
+        )
+        ip_gen = ASTFIPGen(
+            glob=ASTFIPGenGlobal(ip_offset=u"0.0.0.1"),
+            dist_client=ip_gen_c,
+            dist_server=ip_gen_s
+        )
+
+        # server association
+        s_assoc = ASTFAssociation(rules=ASTFAssociationRule(port=8080))
+
+        # template
+        temp_c = ASTFTCPClientTemplate(
+            program=prog_c,
+            ip_gen=ip_gen,
+            limit=64512,  # TODO: set via input parameter ?
+            port=8080
+        )
+        temp_s = ASTFTCPServerTemplate(program=prog_s, assoc=s_assoc)
+        template = ASTFTemplate(client_template=temp_c, server_template=temp_s)
+
+        return ip_gen, template, None
+
+
+def register():
+    """Register this traffic profile to T-Rex.
+
+    Do not change this function.
+
+    :return: Traffic Profiles.
+    :rtype: Object
+    """
+    return TrafficProfile()
diff --git a/resources/libraries/python/MLRsearch/MultipleLossRatioSearch.py b/resources/libraries/python/MLRsearch/MultipleLossRatioSearch.py
index a4e387441f..2db65ef755 100644
--- a/resources/libraries/python/MLRsearch/MultipleLossRatioSearch.py
+++ b/resources/libraries/python/MLRsearch/MultipleLossRatioSearch.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2019 Cisco and/or its affiliates.
+# Copyright (c) 2020 Cisco and/or its affiliates.
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at:
@@ -135,7 +135,7 @@ class MultipleLossRatioSearch(AbstractSearchAlgorithm):
         :type measurer: AbstractMeasurer.AbstractMeasurer
         :type final_relative_width: float
         :type final_trial_duration: float
-        :type initial_trial_duration: int
+        :type initial_trial_duration: float
         :type number_of_intermediate_phases: int
         :type timeout: float
         :type doublings: int
diff --git a/resources/libraries/python/TrafficGenerator.py b/resources/libraries/python/TrafficGenerator.py
index c5192e263d..1f753bdcaf 100644
--- a/resources/libraries/python/TrafficGenerator.py
+++ b/resources/libraries/python/TrafficGenerator.py
@@ -48,7 +48,7 @@ def check_subtype(node):
     """
     if node.get(u"type") is None:
         msg = u"Node type is not defined"
-    elif node['type'] != NodeType.TG:
+    elif node[u"type"] != NodeType.TG:
         msg = f"Node type is {node[u'type']!r}, not a TG"
     elif node.get(u"subtype") is None:
         msg = u"TG subtype is not defined"
@@ -127,23 +127,27 @@ class TGDropRateSearchImpl(DropRateSearch):
         return tg_instance.get_latency_int()
 
 
+class TrexMode:
+    """Defines mode of T-Rex traffic generator."""
+    # Advanced stateful mode
+    ASTF = u"ASTF"
+    # Stateless mode
+    STL = u"STL"
+
+
 # TODO: Pylint says too-many-instance-attributes.
-# A fix is developed in https://gerrit.fd.io/r/c/csit/+/22221
 class TrafficGenerator(AbstractMeasurer):
-    """Traffic Generator.
-
-    FIXME: Describe API."""
+    """Traffic Generator."""
 
-    # TODO: Decrease friction between various search and rate provider APIs.
     # TODO: Remove "trex" from lines which could work with other TGs.
 
     # Use one instance of TrafficGenerator for all tests in test suite
     ROBOT_LIBRARY_SCOPE = u"TEST SUITE"
 
     def __init__(self):
-        # TODO: Number of fields will be reduced with CSIT-1378.
         self._node = None
-        # T-REX interface order mapping
+        self._mode = None
+        # TG interface order mapping
         self._ifaces_reordered = False
         # Result holding fields, to be removed.
         self._result = None
@@ -153,6 +157,7 @@ class TrafficGenerator(AbstractMeasurer):
         self._received = None
         self._approximated_rate = None
         self._approximated_duration = None
+        self._l7_data = None
         # Measurement input fields, needed for async stop result.
         self._start_time = None
         self._rate = None
@@ -164,7 +169,7 @@ class TrafficGenerator(AbstractMeasurer):
         self.negative_loss = None
         # Transient data needed for async measurements.
         self._xstats = (None, None)
-        # TODO: Rename "xstats" to something opaque, so TRex is not privileged?
+        # TODO: Rename "xstats" to something opaque, so T-Rex is not privileged?
 
     @property
     def node(self):
@@ -208,14 +213,35 @@ class TrafficGenerator(AbstractMeasurer):
         return self._latency
 
     def get_approximated_rate(self):
-        """Return approximated rate computed as ratio of transmited packets over
-        duration of trial.
+        """Return approximated rate computed as ratio of transmitted packets
+        over duration of trial.
 
         :returns: Approximated rate.
         :rtype: str
         """
         return self._approximated_rate
 
+    def get_l7_data(self):
+        """Return L7 data.
+
+        :returns: Number of received packets.
+        :rtype: dict
+        """
+        return self._l7_data
+
+    def check_mode(self, expected_mode):
+        """Check TG mode.
+
+        :param expected_mode: Expected traffic generator mode.
+        :type expected_mode: object
+        :raises RuntimeError: In case of unexpected TG mode.
+        """
+        if self._mode == expected_mode:
+            return
+        raise RuntimeError(
+            f"{self._node[u'subtype']} not running in {expected_mode} mode!"
+        )
+
     # TODO: pylint says disable=too-many-locals.
     # A fix is developed in https://gerrit.fd.io/r/c/csit/+/22221
     def initialize_traffic_generator(
@@ -252,43 +278,34 @@ class TrafficGenerator(AbstractMeasurer):
         subtype = check_subtype(tg_node)
         if subtype == NodeSubTypeTG.TREX:
             self._node = tg_node
-
-            if1_pci = Topology().get_interface_pci_addr(self._node, tg_if1)
-            if2_pci = Topology().get_interface_pci_addr(self._node, tg_if2)
-            if1_addr = Topology().get_interface_mac(self._node, tg_if1)
-            if2_addr = Topology().get_interface_mac(self._node, tg_if2)
+            self._mode = TrexMode.ASTF if osi_layer == u"L7" else TrexMode.STL
+            if1 = dict()
+            if2 = dict()
+            if1[u"pci"] = Topology().get_interface_pci_addr(self._node, tg_if1)
+            if2[u"pci"] = Topology().get_interface_pci_addr(self._node, tg_if2)
+            if1[u"addr"] = Topology().get_interface_mac(self._node, tg_if1)
+            if2[u"addr"] = Topology().get_interface_mac(self._node, tg_if2)
 
             if osi_layer == u"L2":
-                if1_adj_addr = if2_addr
-                if2_adj_addr = if1_addr
-            elif osi_layer == u"L3":
-                if1_adj_addr = Topology().get_interface_mac(
-                    tg_if1_adj_node, tg_if1_adj_if
-                )
-                if2_adj_addr = Topology().get_interface_mac(
-                    tg_if2_adj_node, tg_if2_adj_if
-                )
-            elif osi_layer == u"L7":
-                if1_addr = Topology().get_interface_ip4(self._node, tg_if1)
-                if2_addr = Topology().get_interface_ip4(self._node, tg_if2)
-                if1_adj_addr = Topology().get_interface_ip4(
+                if1[u"adj_addr"] = if2[u"addr"]
+                if2[u"adj_addr"] = if1[u"addr"]
+            elif osi_layer in (u"L3", u"L7"):
+                if1[u"adj_addr"] = Topology().get_interface_mac(
                     tg_if1_adj_node, tg_if1_adj_if
                 )
-                if2_adj_addr = Topology().get_interface_ip4(
+                if2[u"adj_addr"] = Topology().get_interface_mac(
                     tg_if2_adj_node, tg_if2_adj_if
                 )
             else:
-                raise ValueError(u"Unknown Test Type")
+                raise ValueError(u"Unknown OSI layer!")
 
             # in case of switched environment we can override MAC addresses
             if tg_if1_dst_mac is not None and tg_if2_dst_mac is not None:
-                if1_adj_addr = tg_if1_dst_mac
-                if2_adj_addr = tg_if2_dst_mac
+                if1[u"adj_addr"] = tg_if1_dst_mac
+                if2[u"adj_addr"] = tg_if2_dst_mac
 
-            if min(if1_pci, if2_pci) != if1_pci:
-                if1_pci, if2_pci = if2_pci, if1_pci
-                if1_addr, if2_addr = if2_addr, if1_addr
-                if1_adj_addr, if2_adj_addr = if2_adj_addr, if1_adj_addr
+            if min(if1[u"pci"], if2[u"pci"]) != if1[u"pci"]:
+                if1, if2 = if2, if1
                 self._ifaces_reordered = True
 
             master_thread_id, latency_thread_id, socket, threads = \
@@ -296,23 +313,19 @@ class TrafficGenerator(AbstractMeasurer):
                     self._node, tg_if1, tg_if2,
                     tg_dtc=Constants.TREX_CORE_COUNT)
 
-            if osi_layer in (u"L2", u"L3"):
-                dst_mac0 = f"0x{if1_adj_addr.replace(u':', u',0x')}"
-                src_mac0 = f"0x{if1_addr.replace(u':', u',0x')}"
-                dst_mac1 = f"0x{if2_adj_addr.replace(u':', u',0x')}"
-                src_mac1 = f"0x{if2_addr.replace(u':', u',0x')}"
+            if osi_layer in (u"L2", u"L3", u"L7"):
                 exec_cmd_no_error(
                     self._node,
                     f"sh -c 'cat << EOF > /etc/trex_cfg.yaml\n"
                     f"- version: 2\n"
                     f"  c: {len(threads)}\n"
                     f"  limit_memory: {Constants.TREX_LIMIT_MEMORY}\n"
-                    f"  interfaces: [\"{if1_pci}\",\"{if2_pci}\"]\n"
+                    f"  interfaces: [\"{if1[u'pci']}\",\"{if2[u'pci']}\"]\n"
                     f"  port_info:\n"
-                    f"      - dest_mac: [{dst_mac0}]\n"
-                    f"        src_mac: [{src_mac0}]\n"
-                    f"      - dest_mac: [{dst_mac1}]\n"
-                    f"        src_mac: [{src_mac1}]\n"
+                    f"      - dest_mac: \'{if1[u'adj_addr']}\'\n"
+                    f"        src_mac: \'{if1[u'addr']}\'\n"
+                    f"      - dest_mac: \'{if2[u'adj_addr']}\'\n"
+                    f"        src_mac: \'{if2[u'addr']}\'\n"
                     f"  platform :\n"
                     f"      master_thread_id: {master_thread_id}\n"
                     f"      latency_thread_id: {latency_thread_id}\n"
@@ -320,32 +333,10 @@ class TrafficGenerator(AbstractMeasurer):
                     f"          - socket: {socket}\n"
                     f"            threads: {threads}\n"
                     f"EOF'",
-                    sudo=True, message=u"TRex config generation!"
-                )
-            elif osi_layer == u"L7":
-                exec_cmd_no_error(
-                    self._node,
-                    f"sh -c 'cat << EOF > /etc/trex_cfg.yaml\n"
-                    f"- version: 2\n"
-                    f"  c: {len(threads)}\n"
-                    f"  limit_memory: {Constants.TREX_LIMIT_MEMORY}\n"
-                    f"  interfaces: [\"{if1_pci}\",\"{if2_pci}\"]\n"
-                    f"  port_info:\n"
-                    f"      - ip: [{if1_addr}]\n"
-                    f"        default_gw: [{if1_adj_addr}]\n"
-                    f"      - ip: [{if2_addr}]\n"
-                    f"        default_gw: [{if2_adj_addr}]\n"
-                    f"  platform :\n"
-                    f"      master_thread_id: {master_thread_id}\n"
-                    f"      latency_thread_id: {latency_thread_id}\n"
-                    f"      dual_if:\n"
-                    f"          - socket: {socket}\n"
-                    f"            threads: {threads}\n"
-                    f"EOF'",
-                    sudo=True, message=u"TRex config generation!"
+                    sudo=True, message=u"T-Rex config generation!"
                 )
             else:
-                raise ValueError(u"Unknown Test Type!")
+                raise ValueError(u"Unknown OSI layer!")
 
             TrafficGenerator.startup_trex(
                 self._node, osi_layer, subtype=subtype
@@ -361,7 +352,8 @@ class TrafficGenerator(AbstractMeasurer):
         :type tg_node: dict
         :type osi_layer: str
         :type subtype: NodeSubTypeTG
-        :raises RuntimeError: If node subtype is not a TREX or startup failed.
+        :raises RuntimeError: If T-Rex startup failed.
+        :raises ValueError: If OSI layer is not supported.
         """
         if not subtype:
             subtype = check_subtype(tg_node)
@@ -407,14 +399,19 @@ class TrafficGenerator(AbstractMeasurer):
                     )
                     raise RuntimeError(u"Start TRex failed!")
 
-                # Test if TRex starts successfuly.
-                command_line = OptionString().add(u"python3")
-                dirname = f"{Constants.REMOTE_FW_DIR}/GPL/tools/trex"
-                command_line.add(f"'{dirname}/trex_server_info.py'")
+                # Test T-Rex API responsiveness.
+                cmd = u"python3"
+                cmd += f" {Constants.REMOTE_FW_DIR}/GPL/tools/trex/"
+                if osi_layer in (u"L2", u"L3"):
+                    cmd += f"trex_stl_assert.py"
+                elif osi_layer == u"L7":
+                    cmd += f"trex_astf_assert.py"
+                else:
+                    raise ValueError(u"Unknown OSI layer!")
                 try:
                     exec_cmd_no_error(
-                        tg_node, command_line, sudo=True,
-                        message=u"Test TRex failed!", retries=20
+                        tg_node, cmd, sudo=True,
+                        message=u"T-Rex API is not responding!", retries=20
                     )
                 except RuntimeError:
                     continue
@@ -422,17 +419,16 @@ class TrafficGenerator(AbstractMeasurer):
             # After max retries TRex is still not responding to API critical
             # error occurred.
             exec_cmd(tg_node, u"cat /tmp/trex.log", sudo=True)
-            raise RuntimeError(u"Start TRex failed after multiple retries!")
+            raise RuntimeError(u"Start T-Rex failed after multiple retries!")
 
     @staticmethod
     def is_trex_running(node):
-        """Check if TRex is running using pidof.
+        """Check if T-Rex is running using pidof.
 
         :param node: Traffic generator node.
         :type node: dict
-        :returns: True if TRex is running otherwise False.
+        :returns: True if T-Rex is running otherwise False.
         :rtype: bool
-        :raises RuntimeError: If node type is not a TG.
         """
         ret, _, _ = exec_cmd(node, u"pgrep t-rex", sudo=True)
         return bool(int(ret) == 0)
@@ -445,7 +441,7 @@ class TrafficGenerator(AbstractMeasurer):
         :type node: dict
         :returns: nothing
         :raises RuntimeError: If node type is not a TG,
-            or if TRex teardown fails.
+            or if T-Rex teardown fails.
         """
         subtype = check_subtype(node)
         if subtype == NodeSubTypeTG.TREX:
@@ -454,70 +450,276 @@ class TrafficGenerator(AbstractMeasurer):
                 u"sh -c "
                 u"\"if pgrep t-rex; then sudo pkill t-rex && sleep 3; fi\"",
                 sudo=False,
-                message=u"pkill t-rex failed"
+                message=u"T-Rex kill failed!"
             )
 
     def _parse_traffic_results(self, stdout):
         """Parse stdout of scripts into fields of self.
 
         Block of code to reuse, by sync start, or stop after async.
-        TODO: Is the output TG subtype dependent?
 
         :param stdout: Text containing the standard output.
         :type stdout: str
         """
-        # last line from console output
-        line = stdout.splitlines()[-1]
-        self._result = line
-        logger.info(f"TrafficGen result: {self._result}")
-        self._received = self._result.split(u", ")[1].split(u"=", 1)[1]
-        self._sent = self._result.split(u", ")[2].split(u"=", 1)[1]
-        self._loss = self._result.split(u", ")[3].split(u"=", 1)[1]
-        self._approximated_duration = \
-            self._result.split(u", ")[5].split(u"=", 1)[1]
-        self._approximated_rate = self._result.split(u", ")[6].split(u"=", 1)[1]
-        self._latency = list()
-        self._latency.append(self._result.split(u", ")[7].split(u"=", 1)[1])
-        self._latency.append(self._result.split(u", ")[8].split(u"=", 1)[1])
+        subtype = check_subtype(self._node)
+        if subtype == NodeSubTypeTG.TREX:
+            # Last line from console output
+            line = stdout.splitlines()[-1]
+            results = line.split(",")
+            if results[-1] == u" ":
+                results.remove(u" ")
+            self._result = dict()
+            for result in results:
+                key, value = result.split(u"=", maxsplit=1)
+                self._result[key.strip()] = value
+            logger.info(f"TrafficGen results:\n{self._result}")
+            self._received = self._result.get(u"total_received")
+            self._sent = self._result.get(u"total_sent")
+            self._loss = self._result.get(u"frame_loss")
+            self._approximated_duration = \
+                self._result.get(u"approximated_duration")
+            self._approximated_rate = self._result.get(u"approximated_rate")
+            self._latency = list()
+            self._latency.append(self._result.get(u"latency_stream_0(usec)"))
+            self._latency.append(self._result.get(u"latency_stream_1(usec)"))
+            if self._mode == TrexMode.ASTF:
+                self._l7_data = dict()
+                self._l7_data[u"client"] = dict()
+                self._l7_data[u"client"][u"active_flows"] = \
+                    self._result.get(u"client_active_flows")
+                self._l7_data[u"client"][u"established_flows"] = \
+                    self._result.get(u"client_established_flows")
+                self._l7_data[u"server"] = dict()
+                self._l7_data[u"server"][u"active_flows"] = \
+                    self._result.get(u"server_active_flows")
+                self._l7_data[u"server"][u"established_flows"] = \
+                    self._result.get(u"server_established_flows")
+                if u"udp" in self.traffic_profile:
+                    self._l7_data[u"client"][u"udp"] = dict()
+                    self._l7_data[u"client"][u"udp"][u"established_flows"] = \
+                        self._result.get(u"client_udp_connects")
+                    self._l7_data[u"client"][u"udp"][u"closed_flows"] = \
+                        self._result.get(u"client_udp_closed")
+                    self._l7_data[u"server"][u"udp"] = dict()
+                    self._l7_data[u"server"][u"udp"][u"accepted_flows"] = \
+                        self._result.get(u"server_udp_accepts")
+                    self._l7_data[u"server"][u"udp"][u"closed_flows"] = \
+                        self._result.get(u"server_udp_closed")
+                elif u"tcp" in self.traffic_profile:
+                    self._l7_data[u"client"][u"tcp"] = dict()
+                    self._l7_data[u"client"][u"tcp"][u"initiated_flows"] = \
+                        self._result.get(u"client_tcp_connect_inits")
+                    self._l7_data[u"client"][u"tcp"][u"established_flows"] = \
+                        self._result.get(u"client_tcp_connects")
+                    self._l7_data[u"client"][u"tcp"][u"closed_flows"] = \
+                        self._result.get(u"client_tcp_closed")
+                    self._l7_data[u"server"][u"tcp"] = dict()
+                    self._l7_data[u"server"][u"tcp"][u"accepted_flows"] = \
+                        self._result.get(u"server_tcp_accepts")
+                    self._l7_data[u"server"][u"tcp"][u"established_flows"] = \
+                        self._result.get(u"server_tcp_connects")
+                    self._l7_data[u"server"][u"tcp"][u"closed_flows"] = \
+                        self._result.get(u"server_tcp_closed")
+
+    def trex_astf_stop_remote_exec(self, node):
+        """Execute T-Rex ASTF script on remote node over ssh to stop running
+        traffic.
+
+        Internal state is updated with measurement results.
+
+        :param node: T-Rex generator node.
+        :type node: dict
+        :raises RuntimeError: If stop traffic script fails.
+        """
+        command_line = OptionString().add(u"python3")
+        dirname = f"{Constants.REMOTE_FW_DIR}/GPL/tools/trex"
+        command_line.add(f"'{dirname}/trex_astf_stop.py'")
+        command_line.change_prefix(u"--")
+        for index, value in enumerate(self._xstats):
+            if value is not None:
+                value = value.replace(u"'", u"\"")
+                command_line.add_equals(f"xstat{index}", f"'{value}'")
+        stdout, _ = exec_cmd_no_error(
+            node, command_line,
+            message=u"T-Rex ASTF runtime error!"
+        )
+        self._parse_traffic_results(stdout)
 
     def trex_stl_stop_remote_exec(self, node):
-        """Execute script on remote node over ssh to stop running traffic.
+        """Execute T-Rex STL script on remote node over ssh to stop running
+        traffic.
 
         Internal state is updated with measurement results.
 
-        :param node: TRex generator node.
+        :param node: T-Rex generator node.
         :type node: dict
         :raises RuntimeError: If stop traffic script fails.
         """
-        # No need to check subtype, we know it is TREX.
         command_line = OptionString().add(u"python3")
         dirname = f"{Constants.REMOTE_FW_DIR}/GPL/tools/trex"
-        command_line.add(f"'{dirname}/trex_stateless_stop.py'")
+        command_line.add(f"'{dirname}/trex_stl_stop.py'")
         command_line.change_prefix(u"--")
         for index, value in enumerate(self._xstats):
             if value is not None:
                 value = value.replace(u"'", u"\"")
                 command_line.add_equals(f"xstat{index}", f"'{value}'")
         stdout, _ = exec_cmd_no_error(
-            node, command_line, message=u"TRex stateless runtime error"
+            node, command_line,
+            message=u"T-Rex STL runtime error!"
         )
         self._parse_traffic_results(stdout)
 
+    def stop_traffic_on_tg(self):
+        """Stop all traffic on TG.
+
+        :returns: Structure containing the result of the measurement.
+        :rtype: ReceiveRateMeasurement
+        :raises ValueError: If TG traffic profile is not supported.
+        """
+        subtype = check_subtype(self._node)
+        if subtype == NodeSubTypeTG.TREX:
+            if u"trex-astf" in self.traffic_profile:
+                self.trex_astf_stop_remote_exec(self._node)
+            elif u"trex-sl" in self.traffic_profile:
+                self.trex_stl_stop_remote_exec(self._node)
+            else:
+                raise ValueError(u"Unsupported T-Rex traffic profile!")
+
+        return self.get_measurement_result()
+
+    def trex_astf_start_remote_exec(
+            self, duration, mult, frame_size, traffic_profile, async_call=False,
+            latency=True, warmup_time=5.0, traffic_directions=2, tx_port=0,
+            rx_port=1):
+        """Execute T-Rex ASTF script on remote node over ssh to start running
+        traffic.
+
+        In sync mode, measurement results are stored internally.
+        In async mode, initial data including xstats are stored internally.
+
+        :param duration: Time expresed in seconds for how long to send traffic.
+        :param mult: Traffic rate expressed with units (pps, %)
+        :param frame_size: L2 frame size to send (without padding and IPG).
+        :param traffic_profile: Module name as a traffic profile identifier.
+            See GPL/traffic_profiles/trex for implemented modules.
+        :param async_call: If enabled then don't wait for all incoming traffic.
+        :param latency: With latency measurement.
+        :param warmup_time: Warmup time period.
+        :param traffic_directions: Traffic is bi- (2) or uni- (1) directional.
+            Default: 2
+        :param tx_port: Traffic generator transmit port for first flow.
+            Default: 0
+        :param rx_port: Traffic generator receive port for first flow.
+            Default: 1
+        :type duration: float
+        :type mult: int
+        :type frame_size: str
+        :type traffic_profile: str
+        :type async_call: bool
+        :type latency: bool
+        :type warmup_time: float
+        :type traffic_directions: int
+        :type tx_port: int
+        :type rx_port: int
+        :raises RuntimeError: In case of T-Rex driver issue.
+        """
+        self.check_mode(TrexMode.ASTF)
+        p_0, p_1 = (rx_port, tx_port) if self._ifaces_reordered \
+            else (tx_port, rx_port)
+        if not isinstance(duration, (float, int)):
+            duration = float(duration)
+        if not isinstance(warmup_time, (float, int)):
+            warmup_time = float(warmup_time)
+
+        command_line = OptionString().add(u"python3")
+        dirname = f"{Constants.REMOTE_FW_DIR}/GPL/tools/trex"
+        command_line.add(f"'{dirname}/trex_astf_profile.py'")
+        command_line.change_prefix(u"--")
+        dirname = f"{Constants.REMOTE_FW_DIR}/GPL/traffic_profiles/trex"
+        command_line.add_with_value(
+            u"profile", f"'{dirname}/{traffic_profile}.py'"
+        )
+        command_line.add_with_value(u"duration", f"{duration!r}")
+        command_line.add_with_value(u"frame_size", frame_size)
+        command_line.add_with_value(u"mult", int(mult))
+        command_line.add_with_value(u"warmup_time", f"{warmup_time!r}")
+        command_line.add_with_value(u"port_0", p_0)
+        command_line.add_with_value(u"port_1", p_1)
+        command_line.add_with_value(u"traffic_directions", traffic_directions)
+        command_line.add_if(u"async_start", async_call)
+        command_line.add_if(u"latency", latency)
+        command_line.add_if(u"force", Constants.TREX_SEND_FORCE)
+
+        stdout, _ = exec_cmd_no_error(
+            self._node, command_line,
+            timeout=int(duration) + 600 if u"tcp" in self.traffic_profile
+            else 60,
+            message=u"T-Rex ASTF runtime error!"
+        )
+
+        self.traffic_directions = traffic_directions
+        if async_call:
+            # no result
+            self._start_time = time.time()
+            self._rate = float(mult)
+            self._received = None
+            self._sent = None
+            self._loss = None
+            self._latency = None
+            xstats = [None, None]
+            self._l7_data[u"client"] = dict()
+            self._l7_data[u"client"][u"active_flows"] = None
+            self._l7_data[u"client"][u"established_flows"] = None
+            self._l7_data[u"server"] = dict()
+            self._l7_data[u"server"][u"active_flows"] = None
+            self._l7_data[u"server"][u"established_flows"] = None
+            if u"udp" in self.traffic_profile:
+                self._l7_data[u"client"][u"udp"] = dict()
+                self._l7_data[u"client"][u"udp"][u"established_flows"] = None
+                self._l7_data[u"client"][u"udp"][u"closed_flows"] = None
+                self._l7_data[u"server"][u"udp"] = dict()
+                self._l7_data[u"server"][u"udp"][u"accepted_flows"] = None
+                self._l7_data[u"server"][u"udp"][u"closed_flows"] = None
+            elif u"tcp" in self.traffic_profile:
+                self._l7_data[u"client"][u"tcp"] = dict()
+                self._l7_data[u"client"][u"tcp"][u"initiated_flows"] = None
+                self._l7_data[u"client"][u"tcp"][u"established_flows"] = None
+                self._l7_data[u"client"][u"tcp"][u"closed_flows"] = None
+                self._l7_data[u"server"][u"tcp"] = dict()
+                self._l7_data[u"server"][u"tcp"][u"accepted_flows"] = None
+                self._l7_data[u"server"][u"tcp"][u"established_flows"] = None
+                self._l7_data[u"server"][u"tcp"][u"closed_flows"] = None
+            else:
+                logger.warn(u"Unsupported T-Rex ASTF traffic profile!")
+            index = 0
+            for line in stdout.splitlines():
+                if f"Xstats snapshot {index}: " in line:
+                    xstats[index] = line[19:]
+                    index += 1
+                if index == 2:
+                    break
+            self._xstats = tuple(xstats)
+        else:
+            self._parse_traffic_results(stdout)
+            self._start_time = None
+            self._rate = None
+
     def trex_stl_start_remote_exec(
             self, duration, rate, frame_size, traffic_profile, async_call=False,
             latency=True, warmup_time=5.0, traffic_directions=2, tx_port=0,
             rx_port=1):
-        """Execute script on remote node over ssh to start traffic.
+        """Execute T-Rex STL script on remote node over ssh to start running
+        traffic.
 
         In sync mode, measurement results are stored internally.
         In async mode, initial data including xstats are stored internally.
 
-        :param duration: Time expresed in seconds for how long to send traffic.
+        :param duration: Time expressed in seconds for how long to send traffic.
         :param rate: Traffic rate expressed with units (pps, %)
         :param frame_size: L2 frame size to send (without padding and IPG).
         :param traffic_profile: Module name as a traffic profile identifier.
             See GPL/traffic_profiles/trex for implemented modules.
-        :param async_call: If enabled then don't wait for all incomming trafic.
+        :param async_call: If enabled then don't wait for all incoming traffic.
         :param latency: With latency measurement.
         :param warmup_time: Warmup time period.
         :param traffic_directions: Traffic is bi- (2) or uni- (1) directional.
@@ -536,11 +738,11 @@ class TrafficGenerator(AbstractMeasurer):
         :type traffic_directions: int
         :type tx_port: int
         :type rx_port: int
-        :raises RuntimeError: In case of TG driver issue.
+        :raises RuntimeError: In case of T-Rex driver issue.
         """
-        # No need to check subtype, we know it is TREX.
-        reorder = self._ifaces_reordered  # Just to make the next line fit.
-        p_0, p_1 = (rx_port, tx_port) if reorder else (tx_port, rx_port)
+        self.check_mode(TrexMode.STL)
+        p_0, p_1 = (rx_port, tx_port) if self._ifaces_reordered \
+            else (tx_port, rx_port)
         if not isinstance(duration, (float, int)):
             duration = float(duration)
         if not isinstance(warmup_time, (float, int)):
@@ -548,11 +750,12 @@ class TrafficGenerator(AbstractMeasurer):
 
         command_line = OptionString().add(u"python3")
         dirname = f"{Constants.REMOTE_FW_DIR}/GPL/tools/trex"
-        command_line.add(f"'{dirname}/trex_stateless_profile.py'")
+        command_line.add(f"'{dirname}/trex_stl_profile.py'")
         command_line.change_prefix(u"--")
         dirname = f"{Constants.REMOTE_FW_DIR}/GPL/traffic_profiles/trex"
-        quoted_path = f"'{dirname}/{traffic_profile}.py'"
-        command_line.add_with_value(u"profile", quoted_path)
+        command_line.add_with_value(
+            u"profile", f"'{dirname}/{traffic_profile}.py'"
+        )
         command_line.add_with_value(u"duration", f"{duration!r}")
         command_line.add_with_value(u"frame_size", frame_size)
         command_line.add_with_value(u"rate", f"{rate!r}")
@@ -565,8 +768,8 @@ class TrafficGenerator(AbstractMeasurer):
         command_line.add_if(u"force", Constants.TREX_SEND_FORCE)
 
         stdout, _ = exec_cmd_no_error(
-            self._node, command_line, timeout=float(duration) + 60,
-            message=u"TRex stateless runtime error"
+            self._node, command_line, timeout=int(duration) + 60,
+            message=u"T-Rex STL runtime error"
         )
 
         self.traffic_directions = traffic_directions
@@ -578,6 +781,7 @@ class TrafficGenerator(AbstractMeasurer):
             self._sent = None
             self._loss = None
             self._latency = None
+
             xstats = [None, None]
             index = 0
             for line in stdout.splitlines():
@@ -592,18 +796,6 @@ class TrafficGenerator(AbstractMeasurer):
             self._start_time = None
             self._rate = None
 
-    def stop_traffic_on_tg(self):
-        """Stop all traffic on TG.
-
-        :returns: Structure containing the result of the measurement.
-        :rtype: ReceiveRateMeasurement
-        :raises RuntimeError: If TG is not set.
-        """
-        subtype = check_subtype(self._node)
-        if subtype == NodeSubTypeTG.TREX:
-            self.trex_stl_stop_remote_exec(self._node)
-        return self.get_measurement_result()
-
     def send_traffic_on_tg(
             self, duration, rate, frame_size, traffic_profile, warmup_time=5,
             async_call=False, latency=True, traffic_directions=2, tx_port=0,
@@ -624,13 +816,10 @@ class TrafficGenerator(AbstractMeasurer):
         This method handles that, so argument values are invariant,
         but you can see swapped valued in debug logs.
 
-        TODO: Is it better to have less descriptive argument names
-        just to make them less probable to be viewed as misleading or confusing?
-        See https://gerrit.fd.io/r/#/c/17625/11/resources/libraries/python\
-        /TrafficGenerator.py@406
-
         :param duration: Duration of test traffic generation in seconds.
-        :param rate: Offered load per interface (e.g. 1%, 3gbps, 4mpps, ...).
+        :param rate: Traffic rate.
+            - T-Rex stateless mode => Offered load per interface in pps,
+            - T-Rex advanced stateful mode => multiplier of profile CPS.
         :param frame_size: Frame size (L2) in Bytes.
         :param traffic_profile: Module name as a traffic profile identifier.
             See GPL/traffic_profiles/trex for implemented modules.
@@ -643,8 +832,8 @@ class TrafficGenerator(AbstractMeasurer):
             Default: 0
         :param rx_port: Traffic generator receive port for first flow.
             Default: 1
-        :type duration: str
-        :type rate: str
+        :type duration: float
+        :type rate: float
         :type frame_size: str
         :type traffic_profile: str
         :type warmup_time: float
@@ -653,18 +842,31 @@ class TrafficGenerator(AbstractMeasurer):
         :type traffic_directions: int
         :type tx_port: int
         :type rx_port: int
-        :returns: TG output.
+        :returns: TG results.
         :rtype: str
-        :raises RuntimeError: If TG is not set, or if node is not TG,
-            or if subtype is not specified.
-        :raises NotImplementedError: If TG is not supported.
+        :raises ValueError: If TG traffic profile is not supported.
         """
         subtype = check_subtype(self._node)
         if subtype == NodeSubTypeTG.TREX:
-            self.trex_stl_start_remote_exec(
-                duration, rate, frame_size, traffic_profile, async_call,
-                latency, warmup_time, traffic_directions, tx_port, rx_port
-            )
+            self.set_rate_provider_defaults(
+                frame_size, traffic_profile,
+                traffic_directions=traffic_directions)
+            if u"trex-astf" in self.traffic_profile:
+                self.trex_astf_start_remote_exec(
+                    duration, int(rate), frame_size, traffic_profile,
+                    async_call, latency, warmup_time, traffic_directions,
+                    tx_port, rx_port
+                )
+            # TODO: rename all t-rex stateless profiles to use 'trex-stl'
+            elif u"trex-sl" in self.traffic_profile:
+                unit_rate_str = str(rate) + u"pps"
+                self.trex_stl_start_remote_exec(
+                    duration, unit_rate_str, frame_size, traffic_profile,
+                    async_call, latency, warmup_time, traffic_directions,
+                    tx_port, rx_port
+                )
+            else:
+                raise ValueError(u"Unsupported T-Rex traffic profile!")
 
         return self._result
 
@@ -770,7 +972,6 @@ class TrafficGenerator(AbstractMeasurer):
             duration, transmit_rate, transmit_count, loss_count
         )
         measurement.latency = self.get_latency_int()
-        measurement.approximated_rate = self.get_approximated_rate()
         return measurement
 
     def measure(self, duration, transmit_rate):
@@ -779,22 +980,21 @@ class TrafficGenerator(AbstractMeasurer):
         Aggregate means sum over traffic directions.
 
         :param duration: Trial duration [s].
-        :param transmit_rate: Target aggregate transmit rate [pps].
+        :param transmit_rate: Target aggregate transmit rate [pps] / Connections
+        per second (CPS) for UDP/TCP flows.
         :type duration: float
         :type transmit_rate: float
         :returns: Structure containing the result of the measurement.
         :rtype: ReceiveRateMeasurement
-        :raises RuntimeError: If TG is not set, or if node is not TG,
+        :raises RuntimeError: If TG is not set or if node is not TG
             or if subtype is not specified.
         :raises NotImplementedError: If TG is not supported.
         """
         duration = float(duration)
-        transmit_rate = float(transmit_rate)
         # TG needs target Tr per stream, but reports aggregate Tx and Dx.
         unit_rate_int = transmit_rate / float(self.traffic_directions)
-        unit_rate_str = str(unit_rate_int) + u"pps"
         self.send_traffic_on_tg(
-            duration, unit_rate_str, self.frame_size, self.traffic_profile,
+            duration, unit_rate_int, self.frame_size, self.traffic_profile,
             warmup_time=self.warmup_time, latency=True,
             traffic_directions=self.traffic_directions
         )
diff --git a/resources/libraries/robot/ip/ip4.robot b/resources/libraries/robot/ip/ip4.robot
index e555dc17ac..2dc2a72857 100644
--- a/resources/libraries/robot/ip/ip4.robot
+++ b/resources/libraries/robot/ip/ip4.robot
@@ -81,18 +81,18 @@
 | | ... | interface=${DUT2_${int}1}[0]
 | |
 | | Run Keyword Unless | '${remote_host1_ip}' == '${NONE}'
-| | ... | Vpp Route Add | ${dut1} | ${remote_host1_ip} | 32
+| | ... | Vpp Route Add | ${dut1} | ${remote_host1_ip} | 24
 | | ... | gateway=10.10.10.2 | interface=${DUT1_${int}1}[0]
 | | Run Keyword Unless | '${remote_host2_ip}' == '${NONE}'
-| | ... | Vpp Route Add | ${dut} | ${remote_host2_ip} | 32
+| | ... | Vpp Route Add | ${dut} | ${remote_host2_ip} | 24
 | | ... | gateway=20.20.20.2 | interface=${dut_if2}
 | | Run Keyword Unless | '${remote_host1_ip}' == '${NONE}'
 | | ... | Run Keyword If | '${dut2_status}' == 'PASS'
-| | ... | Vpp Route Add | ${dut1} | ${remote_host1_ip} | 32
+| | ... | Vpp Route Add | ${dut1} | ${remote_host1_ip} | 24
 | | ... | gateway=1.1.1.2 | interface=${DUT1_${int}2}[0]
 | | Run Keyword Unless | '${remote_host2_ip}' == '${NONE}'
 | | ... | Run Keyword If | '${dut2_status}' == 'PASS'
-| | ... | Vpp Route Add | ${dut2} | ${remote_host2_ip} | 32
+| | ... | Vpp Route Add | ${dut2} | ${remote_host2_ip} | 24
 | | ... | gateway=1.1.1.1 | interface=${DUT2_${int}1}[0]
 
 | Initialize IPv4 forwarding with scaling in circular topology
diff --git a/resources/libraries/robot/performance/performance_utils.robot b/resources/libraries/robot/performance/performance_utils.robot
index 4c8146e56a..f14d7bd13c 100644
--- a/resources/libraries/robot/performance/performance_utils.robot
+++ b/resources/libraries/robot/performance/performance_utils.robot
@@ -112,10 +112,10 @@
 | | # Finally, trials with runtime and other stats.
 | | # We expect NDR and PDR to have different-looking stats.
 | | Send traffic at specified rate
-| | ... | ${1.0} | ${pdr_per_stream}pps | ${framesize} | ${traffic_profile}
+| | ... | ${1.0} | ${pdr_per_stream} | ${framesize} | ${traffic_profile}
 | | ... | traffic_directions=${traffic_directions}
 | | Send traffic at specified rate
-| | ... | ${1.0} | ${ndr_per_stream}pps | ${framesize} | ${traffic_profile}
+| | ... | ${1.0} | ${ndr_per_stream} | ${framesize} | ${traffic_profile}
 | | ... | traffic_directions=${traffic_directions}
 
 | Find Throughput Using MLRsearch
@@ -247,7 +247,7 @@
 | |
 | | ... | *Arguments:*
 | | ... | - result - Result of bidirectional measurtement.
-| | ... |   Type: ReceiveRateMeasurement
+| | ... | Type: ReceiveRateMeasurement
 | |
 | | ... | *Example:*
 | |
@@ -389,11 +389,12 @@
 | | ... | ${fail_no_traffic}=${True}
 | | ... | ${trial_multiplicity}=${trial_multiplicity}
 | | ... | ${traffic_directions}=${2} | ${tx_port}=${0} | ${rx_port}=${1}
+| | ... | ${latency}=${True}
 | |
 | | ${results}= | Send traffic at specified rate
-| | ... | ${trial_duration} | ${max_rate}pps | ${frame_size}
+| | ... | ${trial_duration} | ${max_rate} | ${frame_size}
 | | ... | ${traffic_profile} | ${trial_multiplicity}
-| | ... | ${traffic_directions} | ${tx_port} | ${rx_port}
+| | ... | ${traffic_directions} | ${tx_port} | ${rx_port} | latency=${latency}
 | | Set Test Message | ${\n}Maximum Receive Rate trial results
 | | Set Test Message | in packets per second: ${results}
 | | ... | append=yes
@@ -405,15 +406,12 @@
 | | ... | Then send traffic at specified rate, possibly multiple trials.
 | | ... | Show various DUT stats, optionally also packet trace.
 | | ... | Return list of measured receive rates.
-| | ... | The rate argument should be TRex friendly, so it should include "pps".
 | |
 | | ... | *Arguments:*
-| | ... | - trial_duration - Duration of single trial [s].
-| | ... | Type: float
-| | ... | - rate - Rate for sending packets.
-| | ... | Type: string
-| | ... | - frame_size - L2 Frame Size [B].
-| | ... | Type: integer/string
+| | ... | - trial_duration - Duration of single trial [s]. Type: float
+| | ... | - rate - Target aggregate transmit rate [pps] / Connections per second
+| | ... | (CPS) for UDP/TCP flows. Type: float
+| | ... | - frame_size - L2 Frame Size [B]. Type: integer/string
 | | ... | - traffic_profile - Name of module defining traffc for measurements.
 | | ... | Type: string
 | | ... | - trial_multiplicity - How many trials in this measurement.
@@ -429,13 +427,14 @@
 | |
 | | ... | *Example:*
 | |
-| | ... | \| Send traffic at specified rate \| \${1.0} \| 4.0mpps \| \${64} \
-| | ... | \| 3-node-IPv4 \| \${10} \| \${2} \| \${0} \| \${1} \| \${False} \|
+| | ... | \| Send traffic at specified rate \| \${1.0} \| ${4000000.0} \
+| | ... | \| \${64} \| 3-node-IPv4 \| \${10} \| \${2} \| \${0} \| \${1} \
+| | ... | \${False} \|
 | |
 | | [Arguments] | ${trial_duration} | ${rate} | ${frame_size}
 | | ... | ${traffic_profile} | ${trial_multiplicity}=${trial_multiplicity}
 | | ... | ${traffic_directions}=${2} | ${tx_port}=${0} | ${rx_port}=${1}
-| | ... | ${extended_debug}=${extended_debug}
+| | ... | ${extended_debug}=${extended_debug} | ${latency}=${True}
 | |
 | | Set Test Variable | ${extended_debug}
 | | Clear and show runtime counters with running traffic | ${trial_duration}
@@ -451,7 +450,7 @@
 | | | Send traffic on tg | ${trial_duration} | ${rate} | ${frame_size}
 | | | ... | ${traffic_profile} | warmup_time=${0}
 | | | ... | traffic_directions=${traffic_directions} | tx_port=${tx_port}
-| | | ... | rx_port=${rx_port}
+| | | ... | rx_port=${rx_port} | latency=${latency}
 | | | ${rx} = | Get Received
 | | | ${rr} = | Evaluate | ${rx} / ${trial_duration}
 | | | Append To List | ${results} | ${rr}
@@ -471,7 +470,9 @@
 | | ... | *Arguments:*
 | | ... | - message_prefix - Preface to test message addition. Type: string
 | | ... | - trial_duration - Duration of single trial [s]. Type: float
-| | ... | - rate - Rate for sending packets, in pps. Type: int
+| | ... | - rate - Rate [pps] for sending packets in case of T-Rex stateless
+| | ... | mode or multiplier of profile CPS in case of T-Rex astf mode.
+| | ... | Type: float
 | | ... | - frame_size - L2 Frame Size [B]. Type: integer/string
 | | ... | - traffic_profile - Name of module defining traffic for measurements.
 | | ... | Type: string
@@ -495,7 +496,7 @@
 | | ${real_rate} = | Evaluate | max(${rate}, ${safe_rate})
 | | # The following line is skipping some default arguments,
 | | # that is why subsequent arguments have to be named.
-| | Send traffic on tg | ${trial_duration} | ${real_rate}pps | ${frame_size}
+| | Send traffic on tg | ${trial_duration} | ${real_rate} | ${frame_size}
 | | ... | ${traffic_profile} | warmup_time=${0}
 | | ... | traffic_directions=${traffic_directions} | tx_port=${tx_port}
 | | ... | rx_port=${rx_port}
@@ -510,7 +511,9 @@
 | |
 | | ... | *Arguments:*
 | | ... | - duration - Duration of traffic run [s]. Type: integer
-| | ... | - rate - Unidirectional rate for sending packets. Type: string
+| | ... | - rate - Rate [pps] for sending packets in case of T-Rex stateless
+| | ... | mode or multiplier of profile CPS in case of T-Rex astf mode.
+| | ... | Type: float
 | | ... | - frame_size - L2 Frame Size [B] or IMIX_v4_1. Type: integer/string
 | | ... | - traffic_profile - Name of module defining traffc for measurements.
 | | ... | Type: string
@@ -522,7 +525,7 @@
 | | ... | *Example:*
 | |
 | | ... | \| Clear and show runtime counters with running traffic \| \${10} \
-| | ... | \| 4.0mpps \| \${64} \| 3-node-IPv4 \| \${2} \| \${0} \| \${1} \|
+| | ... | \| ${4000000.0} \| \${64} \| 3-node-IPv4 \| \${2} \| \${0} \| \${1} \|
 | |
 | | [Arguments] | ${duration} | ${rate} | ${frame_size} | ${traffic_profile}
 | | ... | ${traffic_directions}=${2} | ${tx_port}=${0} | ${rx_port}=${1}
@@ -552,7 +555,9 @@
 | | ... | Type: string
 | | ... | - frame_size - L2 Frame Size [B] or IMIX string. Type: int or str
 | | ... | *Arguments:*
-| | ... | - rate - Unidirectional rate for sending packets. Type: string
+| | ... | - rate - Rate [pps] for sending packets in case of T-Rex stateless
+| | ... | mode or multiplier of profile CPS in case of T-Rex astf mode.
+| | ... | Type: float
 | | ... | - traffic_directions - Bi- (2) or uni- (1) directional traffic.
 | | ... | Type: int
 | | ... | - tx_port - TX port of TG, default 0. Type: integer
@@ -560,7 +565,7 @@
 | |
 | | ... | *Example:*
 | |
-| | ... | \| Start Traffic on Background \| 4.0mpps \| \${2} \| \${0} \
+| | ... | \| Start Traffic on Background \| ${4000000.0} \| \${2} \| \${0} \
 | | ... | \| \${1} \|
 | |
 | | [Arguments] | ${rate} | ${traffic_directions}=${2} | ${tx_port}=${0}
diff --git a/resources/libraries/robot/shared/test_teardown.robot b/resources/libraries/robot/shared/test_teardown.robot
index e6ddc58c4b..68bbe716f2 100644
--- a/resources/libraries/robot/shared/test_teardown.robot
+++ b/resources/libraries/robot/shared/test_teardown.robot
@@ -51,7 +51,7 @@
 | | ... | Additional teardown for tests which uses performance measurement.
 | |
 | | Run Keyword If Test Failed
-| | ... | Send traffic at specified rate | ${1.0} | 10000pps
+| | ... | Send traffic at specified rate | ${1.0} | 10000
 | | ... | ${frame_size} | ${traffic_profile} | trial_multiplicity=${1}
 | | ... | extended_debug=${True}
 
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec10000tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec10000tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf.robot
index 5e9d0f0e28..8779a509b5 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec10000tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec10000tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf.robot
@@ -111,7 +111,7 @@
 | | ... | ${laddr_ip4} | ${raddr_ip4} | ${addr_range}
 | | ${bidirectional_throughput}= | Find Throughput Using MLRsearch
 | | ${unidirectional_throughput}= | Evaluate | ${bidirectional_throughput} / 2.0
-| | Start Traffic on Background | ${unidirectional_throughput}pps
+| | Start Traffic on Background | ${unidirectional_throughput}
 | | And VPP IPsec Create Tunnel Interfaces
 | | ... | ${nodes} | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${DUT1_${int}2}[0]
 | | ... | ${DUT2_${int}1}[0] | ${n_total_tunnels} | ${encr_alg} | ${auth_alg}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec10000tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec10000tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf.robot
index 50223018a0..71e6574ef9 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec10000tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec10000tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf.robot
@@ -111,7 +111,7 @@
 | | ... | ${laddr_ip4} | ${raddr_ip4} | ${addr_range}
 | | ${bidirectional_throughput}= | Find Throughput Using MLRsearch
 | | ${unidirectional_throughput}= | Evaluate | ${bidirectional_throughput} / 2.0
-| | Start Traffic on Background | ${unidirectional_throughput}pps
+| | Start Traffic on Background | ${unidirectional_throughput}
 | | And VPP IPsec Create Tunnel Interfaces
 | | ... | ${nodes} | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${DUT1_${int}2}[0]
 | | ... | ${DUT2_${int}1}[0] | ${n_total_tunnels} | ${encr_alg} | ${auth_alg}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec10000tnlsw-1atnl-ip4base-int-aes128gcm-reconf.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec10000tnlsw-1atnl-ip4base-int-aes128gcm-reconf.robot
index c3b8cdddaa..5e924362fa 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec10000tnlsw-1atnl-ip4base-int-aes128gcm-reconf.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec10000tnlsw-1atnl-ip4base-int-aes128gcm-reconf.robot
@@ -112,7 +112,7 @@
 | | ... | ${laddr_ip4} | ${raddr_ip4} | ${addr_range}
 | | ${bidirectional_throughput}= | Find Throughput Using MLRsearch
 | | ${unidirectional_throughput}= | Evaluate | ${bidirectional_throughput} / 2.0
-| | Start Traffic on Background | ${unidirectional_throughput}pps
+| | Start Traffic on Background | ${unidirectional_throughput}
 | | And VPP IPsec Create Tunnel Interfaces
 | | ... | ${nodes} | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${DUT1_${int}2}[0]
 | | ... | ${DUT2_${int}1}[0] | ${n_total_tunnels} | ${encr_alg} | ${auth_alg}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec10000tnlsw-1atnl-ip4base-int-aes256gcm-reconf.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec10000tnlsw-1atnl-ip4base-int-aes256gcm-reconf.robot
index 9b5587c700..12e00331d0 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec10000tnlsw-1atnl-ip4base-int-aes256gcm-reconf.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec10000tnlsw-1atnl-ip4base-int-aes256gcm-reconf.robot
@@ -112,7 +112,7 @@
 | | ... | ${laddr_ip4} | ${raddr_ip4} | ${addr_range}
 | | ${bidirectional_throughput}= | Find Throughput Using MLRsearch
 | | ${unidirectional_throughput}= | Evaluate | ${bidirectional_throughput} / 2.0
-| | Start Traffic on Background | ${unidirectional_throughput}pps
+| | Start Traffic on Background | ${unidirectional_throughput}
 | | And VPP IPsec Create Tunnel Interfaces
 | | ... | ${nodes} | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${DUT1_${int}2}[0]
 | | ... | ${DUT2_${int}1}[0] | ${n_total_tunnels} | ${encr_alg} | ${auth_alg}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf.robot
index d86d8a0b6f..a58b425b33 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf.robot
@@ -111,7 +111,7 @@
 | | ... | ${laddr_ip4} | ${raddr_ip4} | ${addr_range}
 | | ${bidirectional_throughput}= | Find Throughput Using MLRsearch
 | | ${unidirectional_throughput}= | Evaluate | ${bidirectional_throughput} / 2.0
-| | Start Traffic on Background | ${unidirectional_throughput}pps
+| | Start Traffic on Background | ${unidirectional_throughput}
 | | And VPP IPsec Create Tunnel Interfaces
 | | ... | ${nodes} | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${DUT1_${int}2}[0]
 | | ... | ${DUT2_${int}1}[0] | ${n_total_tunnels} | ${encr_alg} | ${auth_alg}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf.robot
index b0da1adb8c..8acb24d06e 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf.robot
@@ -111,7 +111,7 @@
 | | ... | ${laddr_ip4} | ${raddr_ip4} | ${addr_range}
 | | ${bidirectional_throughput}= | Find Throughput Using MLRsearch
 | | ${unidirectional_throughput}= | Evaluate | ${bidirectional_throughput} / 2.0
-| | Start Traffic on Background | ${unidirectional_throughput}pps
+| | Start Traffic on Background | ${unidirectional_throughput}
 | | And VPP IPsec Create Tunnel Interfaces
 | | ... | ${nodes} | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${DUT1_${int}2}[0]
 | | ... | ${DUT2_${int}1}[0] | ${n_total_tunnels} | ${encr_alg} | ${auth_alg}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-1atnl-ip4base-int-aes128gcm-reconf.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-1atnl-ip4base-int-aes128gcm-reconf.robot
index da12849a36..3a3d5e1d6b 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-1atnl-ip4base-int-aes128gcm-reconf.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-1atnl-ip4base-int-aes128gcm-reconf.robot
@@ -112,7 +112,7 @@
 | | ... | ${laddr_ip4} | ${raddr_ip4} | ${addr_range}
 | | ${bidirectional_throughput}= | Find Throughput Using MLRsearch
 | | ${unidirectional_throughput}= | Evaluate | ${bidirectional_throughput} / 2.0
-| | Start Traffic on Background | ${unidirectional_throughput}pps
+| | Start Traffic on Background | ${unidirectional_throughput}
 | | And VPP IPsec Create Tunnel Interfaces
 | | ... | ${nodes} | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${DUT1_${int}2}[0]
 | | ... | ${DUT2_${int}1}[0] | ${n_total_tunnels} | ${encr_alg} | ${auth_alg}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-1atnl-ip4base-int-aes256gcm-reconf.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-1atnl-ip4base-int-aes256gcm-reconf.robot
index a5bf73f5b9..fc09a8ff46 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-1atnl-ip4base-int-aes256gcm-reconf.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-1atnl-ip4base-int-aes256gcm-reconf.robot
@@ -112,7 +112,7 @@
 | | ... | ${laddr_ip4} | ${raddr_ip4} | ${addr_range}
 | | ${bidirectional_throughput}= | Find Throughput Using MLRsearch
 | | ${unidirectional_throughput}= | Evaluate | ${bidirectional_throughput} / 2.0
-| | Start Traffic on Background | ${unidirectional_throughput}pps
+| | Start Traffic on Background | ${unidirectional_throughput}
 | | And VPP IPsec Create Tunnel Interfaces
 | | ... | ${nodes} | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${DUT1_${int}2}[0]
 | | ... | ${DUT2_${int}1}[0] | ${n_total_tunnels} | ${encr_alg} | ${auth_alg}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf.robot
index 96028f6cce..f6b80e1d12 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf.robot
@@ -111,7 +111,7 @@
 | | ... | ${laddr_ip4} | ${raddr_ip4} | ${addr_range}
 | | ${bidirectional_throughput}= | Find Throughput Using MLRsearch
 | | ${unidirectional_throughput}= | Evaluate | ${bidirectional_throughput} / 2.0
-| | Start Traffic on Background | ${unidirectional_throughput}pps
+| | Start Traffic on Background | ${unidirectional_throughput}
 | | And VPP IPsec Create Tunnel Interfaces
 | | ... | ${nodes} | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${DUT1_${int}2}[0]
 | | ... | ${DUT2_${int}1}[0] | ${n_total_tunnels} | ${encr_alg} | ${auth_alg}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf.robot
index 8ae614bccb..6dc52288b6 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf.robot
@@ -111,7 +111,7 @@
 | | ... | ${laddr_ip4} | ${raddr_ip4} | ${addr_range}
 | | ${bidirectional_throughput}= | Find Throughput Using MLRsearch
 | | ${unidirectional_throughput}= | Evaluate | ${bidirectional_throughput} / 2.0
-| | Start Traffic on Background | ${unidirectional_throughput}pps
+| | Start Traffic on Background | ${unidirectional_throughput}
 | | And VPP IPsec Create Tunnel Interfaces
 | | ... | ${nodes} | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${DUT1_${int}2}[0]
 | | ... | ${DUT2_${int}1}[0] | ${n_total_tunnels} | ${encr_alg} | ${auth_alg}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-1atnl-ip4base-int-aes128gcm-reconf.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-1atnl-ip4base-int-aes128gcm-reconf.robot
index b9075a05e1..65f14c4800 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-1atnl-ip4base-int-aes128gcm-reconf.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-1atnl-ip4base-int-aes128gcm-reconf.robot
@@ -112,7 +112,7 @@
 | | ... | ${laddr_ip4} | ${raddr_ip4} | ${addr_range}
 | | ${bidirectional_throughput}= | Find Throughput Using MLRsearch
 | | ${unidirectional_throughput}= | Evaluate | ${bidirectional_throughput} / 2.0
-| | Start Traffic on Background | ${unidirectional_throughput}pps
+| | Start Traffic on Background | ${unidirectional_throughput}
 | | And VPP IPsec Create Tunnel Interfaces
 | | ... | ${nodes} | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${DUT1_${int}2}[0]
 | | ... | ${DUT2_${int}1}[0] | ${n_total_tunnels} | ${encr_alg} | ${auth_alg}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-1atnl-ip4base-int-aes256gcm-reconf.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-1atnl-ip4base-int-aes256gcm-reconf.robot
index b8c6b7bfa7..9f48f73de9 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-1atnl-ip4base-int-aes256gcm-reconf.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-1atnl-ip4base-int-aes256gcm-reconf.robot
@@ -112,7 +112,7 @@
 | | ... | ${laddr_ip4} | ${raddr_ip4} | ${addr_range}
 | | ${bidirectional_throughput}= | Find Throughput Using MLRsearch
 | | ${unidirectional_throughput}= | Evaluate | ${bidirectional_throughput} / 2.0
-| | Start Traffic on Background | ${unidirectional_throughput}pps
+| | Start Traffic on Background | ${unidirectional_throughput}
 | | And VPP IPsec Create Tunnel Interfaces
 | | ... | ${nodes} | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${DUT1_${int}2}[0]
 | | ... | ${DUT2_${int}1}[0] | ${n_total_tunnels} | ${encr_alg} | ${auth_alg}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec20000tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec20000tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf.robot
index c7d6c0467a..417128d40c 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec20000tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec20000tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf.robot
@@ -111,7 +111,7 @@
 | | ... | ${laddr_ip4} | ${raddr_ip4} | ${addr_range}
 | | ${bidirectional_throughput}= | Find Throughput Using MLRsearch
 | | ${unidirectional_throughput}= | Evaluate | ${bidirectional_throughput} / 2.0
-| | Start Traffic on Background | ${unidirectional_throughput}pps
+| | Start Traffic on Background | ${unidirectional_throughput}
 | | And VPP IPsec Create Tunnel Interfaces
 | | ... | ${nodes} | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${DUT1_${int}2}[0]
 | | ... | ${DUT2_${int}1}[0] | ${n_total_tunnels} | ${encr_alg} | ${auth_alg}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec20000tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec20000tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf.robot
index a416ad7d92..b726965ffa 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec20000tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec20000tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf.robot
@@ -111,7 +111,7 @@
 | | ... | ${laddr_ip4} | ${raddr_ip4} | ${addr_range}
 | | ${bidirectional_throughput}= | Find Throughput Using MLRsearch
 | | ${unidirectional_throughput}= | Evaluate | ${bidirectional_throughput} / 2.0
-| | Start Traffic on Background | ${unidirectional_throughput}pps
+| | Start Traffic on Background | ${unidirectional_throughput}
 | | And VPP IPsec Create Tunnel Interfaces
 | | ... | ${nodes} | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${DUT1_${int}2}[0]
 | | ... | ${DUT2_${int}1}[0] | ${n_total_tunnels} | ${encr_alg} | ${auth_alg}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec20000tnlsw-1atnl-ip4base-int-aes128gcm-reconf.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec20000tnlsw-1atnl-ip4base-int-aes128gcm-reconf.robot
index 3007eba1bb..4e7f0aafff 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec20000tnlsw-1atnl-ip4base-int-aes128gcm-reconf.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec20000tnlsw-1atnl-ip4base-int-aes128gcm-reconf.robot
@@ -112,7 +112,7 @@
 | | ... | ${laddr_ip4} | ${raddr_ip4} | ${addr_range}
 | | ${bidirectional_throughput}= | Find Throughput Using MLRsearch
 | | ${unidirectional_throughput}= | Evaluate | ${bidirectional_throughput} / 2.0
-| | Start Traffic on Background | ${unidirectional_throughput}pps
+| | Start Traffic on Background | ${unidirectional_throughput}
 | | And VPP IPsec Create Tunnel Interfaces
 | | ... | ${nodes} | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${DUT1_${int}2}[0]
 | | ... | ${DUT2_${int}1}[0] | ${n_total_tunnels} | ${encr_alg} | ${auth_alg}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec20000tnlsw-1atnl-ip4base-int-aes256gcm-reconf.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec20000tnlsw-1atnl-ip4base-int-aes256gcm-reconf.robot
index 8ca2160da3..1b69f62025 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec20000tnlsw-1atnl-ip4base-int-aes256gcm-reconf.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec20000tnlsw-1atnl-ip4base-int-aes256gcm-reconf.robot
@@ -112,7 +112,7 @@
 | | ... | ${laddr_ip4} | ${raddr_ip4} | ${addr_range}
 | | ${bidirectional_throughput}= | Find Throughput Using MLRsearch
 | | ${unidirectional_throughput}= | Evaluate | ${bidirectional_throughput} / 2.0
-| | Start Traffic on Background | ${unidirectional_throughput}pps
+| | Start Traffic on Background | ${unidirectional_throughput}
 | | And VPP IPsec Create Tunnel Interfaces
 | | ... | ${nodes} | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${DUT1_${int}2}[0]
 | | ... | ${DUT2_${int}1}[0] | ${n_total_tunnels} | ${encr_alg} | ${auth_alg}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40000tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40000tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf.robot
index 9eb76a47a0..09498004f0 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40000tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40000tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf.robot
@@ -111,7 +111,7 @@
 | | ... | ${laddr_ip4} | ${raddr_ip4} | ${addr_range}
 | | ${bidirectional_throughput}= | Find Throughput Using MLRsearch
 | | ${unidirectional_throughput}= | Evaluate | ${bidirectional_throughput} / 2.0
-| | Start Traffic on Background | ${unidirectional_throughput}pps
+| | Start Traffic on Background | ${unidirectional_throughput}
 | | And VPP IPsec Create Tunnel Interfaces
 | | ... | ${nodes} | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${DUT1_${int}2}[0]
 | | ... | ${DUT2_${int}1}[0] | ${n_total_tunnels} | ${encr_alg} | ${auth_alg}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40000tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40000tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf.robot
index b61b162ce8..34d484dac8 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40000tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40000tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf.robot
@@ -111,7 +111,7 @@
 | | ... | ${laddr_ip4} | ${raddr_ip4} | ${addr_range}
 | | ${bidirectional_throughput}= | Find Throughput Using MLRsearch
 | | ${unidirectional_throughput}= | Evaluate | ${bidirectional_throughput} / 2.0
-| | Start Traffic on Background | ${unidirectional_throughput}pps
+| | Start Traffic on Background | ${unidirectional_throughput}
 | | And VPP IPsec Create Tunnel Interfaces
 | | ... | ${nodes} | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${DUT1_${int}2}[0]
 | | ... | ${DUT2_${int}1}[0] | ${n_total_tunnels} | ${encr_alg} | ${auth_alg}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40000tnlsw-1atnl-ip4base-int-aes128gcm-reconf.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40000tnlsw-1atnl-ip4base-int-aes128gcm-reconf.robot
index 5209ca4892..64d53d5c09 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40000tnlsw-1atnl-ip4base-int-aes128gcm-reconf.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40000tnlsw-1atnl-ip4base-int-aes128gcm-reconf.robot
@@ -112,7 +112,7 @@
 | | ... | ${laddr_ip4} | ${raddr_ip4} | ${addr_range}
 | | ${bidirectional_throughput}= | Find Throughput Using MLRsearch
 | | ${unidirectional_throughput}= | Evaluate | ${bidirectional_throughput} / 2.0
-| | Start Traffic on Background | ${unidirectional_throughput}pps
+| | Start Traffic on Background | ${unidirectional_throughput}
 | | And VPP IPsec Create Tunnel Interfaces
 | | ... | ${nodes} | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${DUT1_${int}2}[0]
 | | ... | ${DUT2_${int}1}[0] | ${n_total_tunnels} | ${encr_alg} | ${auth_alg}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40000tnlsw-1atnl-ip4base-int-aes256gcm-reconf.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40000tnlsw-1atnl-ip4base-int-aes256gcm-reconf.robot
index 87a3923f1c..6280d92a3b 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40000tnlsw-1atnl-ip4base-int-aes256gcm-reconf.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40000tnlsw-1atnl-ip4base-int-aes256gcm-reconf.robot
@@ -112,7 +112,7 @@
 | | ... | ${laddr_ip4} | ${raddr_ip4} | ${addr_range}
 | | ${bidirectional_throughput}= | Find Throughput Using MLRsearch
 | | ${unidirectional_throughput}= | Evaluate | ${bidirectional_throughput} / 2.0
-| | Start Traffic on Background | ${unidirectional_throughput}pps
+| | Start Traffic on Background | ${unidirectional_throughput}
 | | And VPP IPsec Create Tunnel Interfaces
 | | ... | ${nodes} | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${DUT1_${int}2}[0]
 | | ... | ${DUT2_${int}1}[0] | ${n_total_tunnels} | ${encr_alg} | ${auth_alg}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec400tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec400tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf.robot
index eeb7015ad8..2c763c4198 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec400tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec400tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf.robot
@@ -111,7 +111,7 @@
 | | ... | ${laddr_ip4} | ${raddr_ip4} | ${addr_range}
 | | ${bidirectional_throughput}= | Find Throughput Using MLRsearch
 | | ${unidirectional_throughput}= | Evaluate | ${bidirectional_throughput} / 2.0
-| | Start Traffic on Background | ${unidirectional_throughput}pps
+| | Start Traffic on Background | ${unidirectional_throughput}
 | | And VPP IPsec Create Tunnel Interfaces
 | | ... | ${nodes} | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${DUT1_${int}2}[0]
 | | ... | ${DUT2_${int}1}[0] | ${n_total_tunnels} | ${encr_alg} | ${auth_alg}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec400tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec400tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf.robot
index b18a211792..42629236db 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec400tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec400tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf.robot
@@ -111,7 +111,7 @@
 | | ... | ${laddr_ip4} | ${raddr_ip4} | ${addr_range}
 | | ${bidirectional_throughput}= | Find Throughput Using MLRsearch
 | | ${unidirectional_throughput}= | Evaluate | ${bidirectional_throughput} / 2.0
-| | Start Traffic on Background | ${unidirectional_throughput}pps
+| | Start Traffic on Background | ${unidirectional_throughput}
 | | And VPP IPsec Create Tunnel Interfaces
 | | ... | ${nodes} | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${DUT1_${int}2}[0]
 | | ... | ${DUT2_${int}1}[0] | ${n_total_tunnels} | ${encr_alg} | ${auth_alg}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec400tnlsw-1atnl-ip4base-int-aes128gcm-reconf.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec400tnlsw-1atnl-ip4base-int-aes128gcm-reconf.robot
index bea27e31ae..d5f2bbe03a 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec400tnlsw-1atnl-ip4base-int-aes128gcm-reconf.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec400tnlsw-1atnl-ip4base-int-aes128gcm-reconf.robot
@@ -112,7 +112,7 @@
 | | ... | ${laddr_ip4} | ${raddr_ip4} | ${addr_range}
 | | ${bidirectional_throughput}= | Find Throughput Using MLRsearch
 | | ${unidirectional_throughput}= | Evaluate | ${bidirectional_throughput} / 2.0
-| | Start Traffic on Background | ${unidirectional_throughput}pps
+| | Start Traffic on Background | ${unidirectional_throughput}
 | | And VPP IPsec Create Tunnel Interfaces
 | | ... | ${nodes} | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${DUT1_${int}2}[0]
 | | ... | ${DUT2_${int}1}[0] | ${n_total_tunnels} | ${encr_alg} | ${auth_alg}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec400tnlsw-1atnl-ip4base-int-aes256gcm-reconf.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec400tnlsw-1atnl-ip4base-int-aes256gcm-reconf.robot
index 9307fb0f99..1b71873b18 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec400tnlsw-1atnl-ip4base-int-aes256gcm-reconf.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec400tnlsw-1atnl-ip4base-int-aes256gcm-reconf.robot
@@ -112,7 +112,7 @@
 | | ... | ${laddr_ip4} | ${raddr_ip4} | ${addr_range}
 | | ${bidirectional_throughput}= | Find Throughput Using MLRsearch
 | | ${unidirectional_throughput}= | Evaluate | ${bidirectional_throughput} / 2.0
-| | Start Traffic on Background | ${unidirectional_throughput}pps
+| | Start Traffic on Background | ${unidirectional_throughput}
 | | And VPP IPsec Create Tunnel Interfaces
 | | ... | ${nodes} | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${DUT1_${int}2}[0]
 | | ... | ${DUT2_${int}1}[0] | ${n_total_tunnels} | ${encr_alg} | ${auth_alg}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf.robot
index 4d83c70a0f..c597adcc0d 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf.robot
@@ -111,7 +111,7 @@
 | | ... | ${laddr_ip4} | ${raddr_ip4} | ${addr_range}
 | | ${bidirectional_throughput}= | Find Throughput Using MLRsearch
 | | ${unidirectional_throughput}= | Evaluate | ${bidirectional_throughput} / 2.0
-| | Start Traffic on Background | ${unidirectional_throughput}pps
+| | Start Traffic on Background | ${unidirectional_throughput}
 | | And VPP IPsec Create Tunnel Interfaces
 | | ... | ${nodes} | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${DUT1_${int}2}[0]
 | | ... | ${DUT2_${int}1}[0] | ${n_total_tunnels} | ${encr_alg} | ${auth_alg}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf.robot
index dab925c6e7..430fd8d2bd 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf.robot
@@ -111,7 +111,7 @@
 | | ... | ${laddr_ip4} | ${raddr_ip4} | ${addr_range}
 | | ${bidirectional_throughput}= | Find Throughput Using MLRsearch
 | | ${unidirectional_throughput}= | Evaluate | ${bidirectional_throughput} / 2.0
-| | Start Traffic on Background | ${unidirectional_throughput}pps
+| | Start Traffic on Background | ${unidirectional_throughput}
 | | And VPP IPsec Create Tunnel Interfaces
 | | ... | ${nodes} | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${DUT1_${int}2}[0]
 | | ... | ${DUT2_${int}1}[0] | ${n_total_tunnels} | ${encr_alg} | ${auth_alg}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40tnlsw-1atnl-ip4base-int-aes128gcm-reconf.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40tnlsw-1atnl-ip4base-int-aes128gcm-reconf.robot
index a39e00621d..702a12b712 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40tnlsw-1atnl-ip4base-int-aes128gcm-reconf.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40tnlsw-1atnl-ip4base-int-aes128gcm-reconf.robot
@@ -112,7 +112,7 @@
 | | ... | ${laddr_ip4} | ${raddr_ip4} | ${addr_range}
 | | ${bidirectional_throughput}= | Find Throughput Using MLRsearch
 | | ${unidirectional_throughput}= | Evaluate | ${bidirectional_throughput} / 2.0
-| | Start Traffic on Background | ${unidirectional_throughput}pps
+| | Start Traffic on Background | ${unidirectional_throughput}
 | | And VPP IPsec Create Tunnel Interfaces
 | | ... | ${nodes} | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${DUT1_${int}2}[0]
 | | ... | ${DUT2_${int}1}[0] | ${n_total_tunnels} | ${encr_alg} | ${auth_alg}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40tnlsw-1atnl-ip4base-int-aes256gcm-reconf.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40tnlsw-1atnl-ip4base-int-aes256gcm-reconf.robot
index 56b51dbf01..9c3dc1c0c8 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40tnlsw-1atnl-ip4base-int-aes256gcm-reconf.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40tnlsw-1atnl-ip4base-int-aes256gcm-reconf.robot
@@ -112,7 +112,7 @@
 | | ... | ${laddr_ip4} | ${raddr_ip4} | ${addr_range}
 | | ${bidirectional_throughput}= | Find Throughput Using MLRsearch
 | | ${unidirectional_throughput}= | Evaluate | ${bidirectional_throughput} / 2.0
-| | Start Traffic on Background | ${unidirectional_throughput}pps
+| | Start Traffic on Background | ${unidirectional_throughput}
 | | And VPP IPsec Create Tunnel Interfaces
 | | ... | ${nodes} | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${DUT1_${int}2}[0]
 | | ... | ${DUT2_${int}1}[0] | ${n_total_tunnels} | ${encr_alg} | ${auth_alg}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec4tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec4tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf.robot
index 040531c813..ae1b8430bf 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec4tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec4tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf.robot
@@ -111,7 +111,7 @@
 | | ... | ${laddr_ip4} | ${raddr_ip4} | ${addr_range}
 | | ${bidirectional_throughput}= | Find Throughput Using MLRsearch
 | | ${unidirectional_throughput}= | Evaluate | ${bidirectional_throughput} / 2.0
-| | Start Traffic on Background | ${unidirectional_throughput}pps
+| | Start Traffic on Background | ${unidirectional_throughput}
 | | And VPP IPsec Create Tunnel Interfaces
 | | ... | ${nodes} | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${DUT1_${int}2}[0]
 | | ... | ${DUT2_${int}1}[0] | ${n_total_tunnels} | ${encr_alg} | ${auth_alg}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec4tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec4tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf.robot
index 4a1a78c29a..868904554c 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec4tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec4tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf.robot
@@ -111,7 +111,7 @@
 | | ... | ${laddr_ip4} | ${raddr_ip4} | ${addr_range}
 | | ${bidirectional_throughput}= | Find Throughput Using MLRsearch
 | | ${unidirectional_throughput}= | Evaluate | ${bidirectional_throughput} / 2.0
-| | Start Traffic on Background | ${unidirectional_throughput}pps
+| | Start Traffic on Background | ${unidirectional_throughput}
 | | And VPP IPsec Create Tunnel Interfaces
 | | ... | ${nodes} | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${DUT1_${int}2}[0]
 | | ... | ${DUT2_${int}1}[0] | ${n_total_tunnels} | ${encr_alg} | ${auth_alg}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec4tnlsw-1atnl-ip4base-int-aes128gcm-reconf.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec4tnlsw-1atnl-ip4base-int-aes128gcm-reconf.robot
index 25e8d046cc..e1718a0d75 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec4tnlsw-1atnl-ip4base-int-aes128gcm-reconf.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec4tnlsw-1atnl-ip4base-int-aes128gcm-reconf.robot
@@ -112,7 +112,7 @@
 | | ... | ${laddr_ip4} | ${raddr_ip4} | ${addr_range}
 | | ${bidirectional_throughput}= | Find Throughput Using MLRsearch
 | | ${unidirectional_throughput}= | Evaluate | ${bidirectional_throughput} / 2.0
-| | Start Traffic on Background | ${unidirectional_throughput}pps
+| | Start Traffic on Background | ${unidirectional_throughput}
 | | And VPP IPsec Create Tunnel Interfaces
 | | ... | ${nodes} | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${DUT1_${int}2}[0]
 | | ... | ${DUT2_${int}1}[0] | ${n_total_tunnels} | ${encr_alg} | ${auth_alg}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec4tnlsw-1atnl-ip4base-int-aes256gcm-reconf.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec4tnlsw-1atnl-ip4base-int-aes256gcm-reconf.robot
index cc3a1ff852..9b73fd519f 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec4tnlsw-1atnl-ip4base-int-aes256gcm-reconf.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec4tnlsw-1atnl-ip4base-int-aes256gcm-reconf.robot
@@ -112,7 +112,7 @@
 | | ... | ${laddr_ip4} | ${raddr_ip4} | ${addr_range}
 | | ${bidirectional_throughput}= | Find Throughput Using MLRsearch
 | | ${unidirectional_throughput}= | Evaluate | ${bidirectional_throughput} / 2.0
-| | Start Traffic on Background | ${unidirectional_throughput}pps
+| | Start Traffic on Background | ${unidirectional_throughput}
 | | And VPP IPsec Create Tunnel Interfaces
 | | ... | ${nodes} | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${DUT1_${int}2}[0]
 | | ... | ${DUT2_${int}1}[0] | ${n_total_tunnels} | ${encr_alg} | ${auth_alg}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec5000tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec5000tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf.robot
index 45229714c4..6b03e995d2 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec5000tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec5000tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf.robot
@@ -111,7 +111,7 @@
 | | ... | ${laddr_ip4} | ${raddr_ip4} | ${addr_range}
 | | ${bidirectional_throughput}= | Find Throughput Using MLRsearch
 | | ${unidirectional_throughput}= | Evaluate | ${bidirectional_throughput} / 2.0
-| | Start Traffic on Background | ${unidirectional_throughput}pps
+| | Start Traffic on Background | ${unidirectional_throughput}
 | | And VPP IPsec Create Tunnel Interfaces
 | | ... | ${nodes} | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${DUT1_${int}2}[0]
 | | ... | ${DUT2_${int}1}[0] | ${n_total_tunnels} | ${encr_alg} | ${auth_alg}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec5000tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec5000tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf.robot
index 1e03dc9cc1..92f9d2ab7f 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec5000tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec5000tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf.robot
@@ -111,7 +111,7 @@
 | | ... | ${laddr_ip4} | ${raddr_ip4} | ${addr_range}
 | | ${bidirectional_throughput}= | Find Throughput Using MLRsearch
 | | ${unidirectional_throughput}= | Evaluate | ${bidirectional_throughput} / 2.0
-| | Start Traffic on Background | ${unidirectional_throughput}pps
+| | Start Traffic on Background | ${unidirectional_throughput}
 | | And VPP IPsec Create Tunnel Interfaces
 | | ... | ${nodes} | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${DUT1_${int}2}[0]
 | | ... | ${DUT2_${int}1}[0] | ${n_total_tunnels} | ${encr_alg} | ${auth_alg}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec5000tnlsw-1atnl-ip4base-int-aes128gcm-reconf.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec5000tnlsw-1atnl-ip4base-int-aes128gcm-reconf.robot
index 1f367eef4c..fdf4d02616 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec5000tnlsw-1atnl-ip4base-int-aes128gcm-reconf.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec5000tnlsw-1atnl-ip4base-int-aes128gcm-reconf.robot
@@ -112,7 +112,7 @@
 | | ... | ${laddr_ip4} | ${raddr_ip4} | ${addr_range}
 | | ${bidirectional_throughput}= | Find Throughput Using MLRsearch
 | | ${unidirectional_throughput}= | Evaluate | ${bidirectional_throughput} / 2.0
-| | Start Traffic on Background | ${unidirectional_throughput}pps
+| | Start Traffic on Background | ${unidirectional_throughput}
 | | And VPP IPsec Create Tunnel Interfaces
 | | ... | ${nodes} | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${DUT1_${int}2}[0]
 | | ... | ${DUT2_${int}1}[0] | ${n_total_tunnels} | ${encr_alg} | ${auth_alg}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec5000tnlsw-1atnl-ip4base-int-aes256gcm-reconf.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec5000tnlsw-1atnl-ip4base-int-aes256gcm-reconf.robot
index 98c1ec049a..ddfbe357dd 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec5000tnlsw-1atnl-ip4base-int-aes256gcm-reconf.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec5000tnlsw-1atnl-ip4base-int-aes256gcm-reconf.robot
@@ -112,7 +112,7 @@
 | | ... | ${laddr_ip4} | ${raddr_ip4} | ${addr_range}
 | | ${bidirectional_throughput}= | Find Throughput Using MLRsearch
 | | ${unidirectional_throughput}= | Evaluate | ${bidirectional_throughput} / 2.0
-| | Start Traffic on Background | ${unidirectional_throughput}pps
+| | Start Traffic on Background | ${unidirectional_throughput}
 | | And VPP IPsec Create Tunnel Interfaces
 | | ... | ${nodes} | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${DUT1_${int}2}[0]
 | | ... | ${DUT2_${int}1}[0] | ${n_total_tunnels} | ${encr_alg} | ${auth_alg}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec60000tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec60000tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf.robot
index 56bb62fb2b..c99c252b2a 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec60000tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec60000tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf.robot
@@ -111,7 +111,7 @@
 | | ... | ${laddr_ip4} | ${raddr_ip4} | ${addr_range}
 | | ${bidirectional_throughput}= | Find Throughput Using MLRsearch
 | | ${unidirectional_throughput}= | Evaluate | ${bidirectional_throughput} / 2.0
-| | Start Traffic on Background | ${unidirectional_throughput}pps
+| | Start Traffic on Background | ${unidirectional_throughput}
 | | And VPP IPsec Create Tunnel Interfaces
 | | ... | ${nodes} | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${DUT1_${int}2}[0]
 | | ... | ${DUT2_${int}1}[0] | ${n_total_tunnels} | ${encr_alg} | ${auth_alg}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec60000tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec60000tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf.robot
index 2efe71e914..9af1ad321a 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec60000tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec60000tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf.robot
@@ -111,7 +111,7 @@
 | | ... | ${laddr_ip4} | ${raddr_ip4} | ${addr_range}
 | | ${bidirectional_throughput}= | Find Throughput Using MLRsearch
 | | ${unidirectional_throughput}= | Evaluate | ${bidirectional_throughput} / 2.0
-| | Start Traffic on Background | ${unidirectional_throughput}pps
+| | Start Traffic on Background | ${unidirectional_throughput}
 | | And VPP IPsec Create Tunnel Interfaces
 | | ... | ${nodes} | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${DUT1_${int}2}[0]
 | | ... | ${DUT2_${int}1}[0] | ${n_total_tunnels} | ${encr_alg} | ${auth_alg}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec60000tnlsw-1atnl-ip4base-int-aes128gcm-reconf.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec60000tnlsw-1atnl-ip4base-int-aes128gcm-reconf.robot
index afd6363f83..3b471fb13f 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec60000tnlsw-1atnl-ip4base-int-aes128gcm-reconf.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec60000tnlsw-1atnl-ip4base-int-aes128gcm-reconf.robot
@@ -112,7 +112,7 @@
 | | ... | ${laddr_ip4} | ${raddr_ip4} | ${addr_range}
 | | ${bidirectional_throughput}= | Find Throughput Using MLRsearch
 | | ${unidirectional_throughput}= | Evaluate | ${bidirectional_throughput} / 2.0
-| | Start Traffic on Background | ${unidirectional_throughput}pps
+| | Start Traffic on Background | ${unidirectional_throughput}
 | | And VPP IPsec Create Tunnel Interfaces
 | | ... | ${nodes} | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${DUT1_${int}2}[0]
 | | ... | ${DUT2_${int}1}[0] | ${n_total_tunnels} | ${encr_alg} | ${auth_alg}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec60000tnlsw-1atnl-ip4base-int-aes256gcm-reconf.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec60000tnlsw-1atnl-ip4base-int-aes256gcm-reconf.robot
index 124fd8a21f..944606fdb6 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec60000tnlsw-1atnl-ip4base-int-aes256gcm-reconf.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec60000tnlsw-1atnl-ip4base-int-aes256gcm-reconf.robot
@@ -112,7 +112,7 @@
 | | ... | ${laddr_ip4} | ${raddr_ip4} | ${addr_range}
 | | ${bidirectional_throughput}= | Find Throughput Using MLRsearch
 | | ${unidirectional_throughput}= | Evaluate | ${bidirectional_throughput} / 2.0
-| | Start Traffic on Background | ${unidirectional_throughput}pps
+| | Start Traffic on Background | ${unidirectional_throughput}
 | | And VPP IPsec Create Tunnel Interfaces
 | | ... | ${nodes} | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${DUT1_${int}2}[0]
 | | ... | ${DUT2_${int}1}[0] | ${n_total_tunnels} | ${encr_alg} | ${auth_alg}
diff --git a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4-ip4base-ndrpdr.robot b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4-ip4base-ndrpdr.robot
index 80ffa072aa..f682230ee8 100644
--- a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4-ip4base-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4-ip4base-ndrpdr.robot
@@ -69,7 +69,7 @@
 | |
 | | ... | *Arguments:*
 | | ... | - frame_size - Framesize in Bytes in integer or string (IMIX_v4_1).
-| | ... |   Type: integer, string
+| | ... | Type: integer, string
 | | ... | - phy_cores - Number of physical cores. Type: integer
 | | ... | - rxq - Number of RX queues, default value: ${None}. Type: integer
 | |
diff --git a/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-10ch-1ach-20vh-10vm1t-testpmd-reconf.robot b/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-10ch-1ach-20vh-10vm1t-testpmd-reconf.robot
index 8e946b3deb..362e1a5bdf 100644
--- a/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-10ch-1ach-20vh-10vm1t-testpmd-reconf.robot
+++ b/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-10ch-1ach-20vh-10vm1t-testpmd-reconf.robot
@@ -107,7 +107,7 @@
 | | ... | use_tuned_cfs=${False} | auto_scale=${False} | vnf=testpmd_io
 | | ${bidirectional_throughput}= | Find Throughput Using MLRsearch
 | | ${unidirectional_throughput}= | Evaluate | ${bidirectional_throughput} / 2.0
-| | Start Traffic on Background | ${unidirectional_throughput}pps
+| | Start Traffic on Background | ${unidirectional_throughput}
 | | And Initialize layer dot1q
 | | ... | count=${nf_total_chains} | vlan_per_chain=${False}
 | | ... | start=${nf_chains+1}
diff --git a/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-10ch-1ach-20vh-10vm2t-testpmd-reconf.robot b/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-10ch-1ach-20vh-10vm2t-testpmd-reconf.robot
index 10ed085662..465db01038 100644
--- a/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-10ch-1ach-20vh-10vm2t-testpmd-reconf.robot
+++ b/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-10ch-1ach-20vh-10vm2t-testpmd-reconf.robot
@@ -107,7 +107,7 @@
 | | ... | use_tuned_cfs=${False} | auto_scale=${False} | vnf=testpmd_io
 | | ${bidirectional_throughput}= | Find Throughput Using MLRsearch
 | | ${unidirectional_throughput}= | Evaluate | ${bidirectional_throughput} / 2.0
-| | Start Traffic on Background | ${unidirectional_throughput}pps
+| | Start Traffic on Background | ${unidirectional_throughput}
 | | And Initialize layer dot1q
 | | ... | count=${nf_total_chains} | vlan_per_chain=${False}
 | | ... | start=${nf_chains+1}
diff --git a/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-1ch-1ach-2vh-1vm1t-testpmd-reconf.robot b/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-1ch-1ach-2vh-1vm1t-testpmd-reconf.robot
index 2357ec5af4..ebeef1a5b5 100644
--- a/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-1ch-1ach-2vh-1vm1t-testpmd-reconf.robot
+++ b/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-1ch-1ach-2vh-1vm1t-testpmd-reconf.robot
@@ -107,7 +107,7 @@
 | | ... | use_tuned_cfs=${False} | auto_scale=${False} | vnf=testpmd_io
 | | ${bidirectional_throughput}= | Find Throughput Using MLRsearch
 | | ${unidirectional_throughput}= | Evaluate | ${bidirectional_throughput} / 2.0
-| | Start Traffic on Background | ${unidirectional_throughput}pps
+| | Start Traffic on Background | ${unidirectional_throughput}
 | | And Initialize layer dot1q
 | | ... | count=${nf_total_chains} | vlan_per_chain=${False}
 | | ... | start=${nf_chains+1}
diff --git a/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-1ch-1ach-2vh-1vm2t-testpmd-reconf.robot b/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-1ch-1ach-2vh-1vm2t-testpmd-reconf.robot
index fe52365fcc..6d359373ed 100644
--- a/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-1ch-1ach-2vh-1vm2t-testpmd-reconf.robot
+++ b/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-1ch-1ach-2vh-1vm2t-testpmd-reconf.robot
@@ -107,7 +107,7 @@
 | | ... | use_tuned_cfs=${False} | auto_scale=${False} | vnf=testpmd_io
 | | ${bidirectional_throughput}= | Find Throughput Using MLRsearch
 | | ${unidirectional_throughput}= | Evaluate | ${bidirectional_throughput} / 2.0
-| | Start Traffic on Background | ${unidirectional_throughput}pps
+| | Start Traffic on Background | ${unidirectional_throughput}
 | | And Initialize layer dot1q
 | | ... | count=${nf_total_chains} | vlan_per_chain=${False}
 | | ... | start=${nf_chains+1}
diff --git a/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-2ch-1ach-4vh-2vm1t-testpmd-reconf.robot b/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-2ch-1ach-4vh-2vm1t-testpmd-reconf.robot
index 3f3ade2b78..080a871b16 100644
--- a/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-2ch-1ach-4vh-2vm1t-testpmd-reconf.robot
+++ b/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-2ch-1ach-4vh-2vm1t-testpmd-reconf.robot
@@ -107,7 +107,7 @@
 | | ... | use_tuned_cfs=${False} | auto_scale=${False} | vnf=testpmd_io
 | | ${bidirectional_throughput}= | Find Throughput Using MLRsearch
 | | ${unidirectional_throughput}= | Evaluate | ${bidirectional_throughput} / 2.0
-| | Start Traffic on Background | ${unidirectional_throughput}pps
+| | Start Traffic on Background | ${unidirectional_throughput}
 | | And Initialize layer dot1q
 | | ... | count=${nf_total_chains} | vlan_per_chain=${False}
 | | ... | start=${nf_chains+1}
diff --git a/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-2ch-1ach-4vh-2vm2t-testpmd-reconf.robot b/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-2ch-1ach-4vh-2vm2t-testpmd-reconf.robot
index 28ebcdf961..e8ffb971b4 100644
--- a/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-2ch-1ach-4vh-2vm2t-testpmd-reconf.robot
+++ b/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-2ch-1ach-4vh-2vm2t-testpmd-reconf.robot
@@ -107,7 +107,7 @@
 | | ... | use_tuned_cfs=${False} | auto_scale=${False} | vnf=testpmd_io
 | | ${bidirectional_throughput}= | Find Throughput Using MLRsearch
 | | ${unidirectional_throughput}= | Evaluate | ${bidirectional_throughput} / 2.0
-| | Start Traffic on Background | ${unidirectional_throughput}pps
+| | Start Traffic on Background | ${unidirectional_throughput}
 | | And Initialize layer dot1q
 | | ... | count=${nf_total_chains} | vlan_per_chain=${False}
 | | ... | start=${nf_chains+1}
diff --git a/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-4ch-1ach-8vh-4vm1t-testpmd-reconf.robot b/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-4ch-1ach-8vh-4vm1t-testpmd-reconf.robot
index 068a7bb3b1..c3e4b1353e 100644
--- a/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-4ch-1ach-8vh-4vm1t-testpmd-reconf.robot
+++ b/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-4ch-1ach-8vh-4vm1t-testpmd-reconf.robot
@@ -107,7 +107,7 @@
 | | ... | use_tuned_cfs=${False} | auto_scale=${False} | vnf=testpmd_io
 | | ${bidirectional_throughput}= | Find Throughput Using MLRsearch
 | | ${unidirectional_throughput}= | Evaluate | ${bidirectional_throughput} / 2.0
-| | Start Traffic on Background | ${unidirectional_throughput}pps
+| | Start Traffic on Background | ${unidirectional_throughput}
 | | And Initialize layer dot1q
 | | ... | count=${nf_total_chains} | vlan_per_chain=${False}
 | | ... | start=${nf_chains+1}
diff --git a/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-4ch-1ach-8vh-4vm2t-testpmd-reconf.robot b/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-4ch-1ach-8vh-4vm2t-testpmd-reconf.robot
index a152fb9172..dd7ebb39d6 100644
--- a/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-4ch-1ach-8vh-4vm2t-testpmd-reconf.robot
+++ b/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-4ch-1ach-8vh-4vm2t-testpmd-reconf.robot
@@ -107,7 +107,7 @@
 | | ... | use_tuned_cfs=${False} | auto_scale=${False} | vnf=testpmd_io
 | | ${bidirectional_throughput}= | Find Throughput Using MLRsearch
 | | ${unidirectional_throughput}= | Evaluate | ${bidirectional_throughput} / 2.0
-| | Start Traffic on Background | ${unidirectional_throughput}pps
+| | Start Traffic on Background | ${unidirectional_throughput}
 | | And Initialize layer dot1q
 | | ... | count=${nf_total_chains} | vlan_per_chain=${False}
 | | ... | start=${nf_chains+1}
diff --git a/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-6ch-1ach-12vh-6vm1t-testpmd-reconf.robot b/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-6ch-1ach-12vh-6vm1t-testpmd-reconf.robot
index efc7a3fd34..9d568b4d95 100644
--- a/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-6ch-1ach-12vh-6vm1t-testpmd-reconf.robot
+++ b/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-6ch-1ach-12vh-6vm1t-testpmd-reconf.robot
@@ -107,7 +107,7 @@
 | | ... | use_tuned_cfs=${False} | auto_scale=${False} | vnf=testpmd_io
 | | ${bidirectional_throughput}= | Find Throughput Using MLRsearch
 | | ${unidirectional_throughput}= | Evaluate | ${bidirectional_throughput} / 2.0
-| | Start Traffic on Background | ${unidirectional_throughput}pps
+| | Start Traffic on Background | ${unidirectional_throughput}
 | | And Initialize layer dot1q
 | | ... | count=${nf_total_chains} | vlan_per_chain=${False}
 | | ... | start=${nf_chains+1}
diff --git a/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-6ch-1ach-12vh-6vm2t-testpmd-reconf.robot b/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-6ch-1ach-12vh-6vm2t-testpmd-reconf.robot
index d61e8fec6c..10b1c64b27 100644
--- a/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-6ch-1ach-12vh-6vm2t-testpmd-reconf.robot
+++ b/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-6ch-1ach-12vh-6vm2t-testpmd-reconf.robot
@@ -107,7 +107,7 @@
 | | ... | use_tuned_cfs=${False} | auto_scale=${False} | vnf=testpmd_io
 | | ${bidirectional_throughput}= | Find Throughput Using MLRsearch
 | | ${unidirectional_throughput}= | Evaluate | ${bidirectional_throughput} / 2.0
-| | Start Traffic on Background | ${unidirectional_throughput}pps
+| | Start Traffic on Background | ${unidirectional_throughput}
 | | And Initialize layer dot1q
 | | ... | count=${nf_total_chains} | vlan_per_chain=${False}
 | | ... | start=${nf_chains+1}
diff --git a/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-8ch-1ach-16vh-8vm1t-testpmd-reconf.robot b/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-8ch-1ach-16vh-8vm1t-testpmd-reconf.robot
index b0685cfcad..a678595d3d 100644
--- a/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-8ch-1ach-16vh-8vm1t-testpmd-reconf.robot
+++ b/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-8ch-1ach-16vh-8vm1t-testpmd-reconf.robot
@@ -107,7 +107,7 @@
 | | ... | use_tuned_cfs=${False} | auto_scale=${False} | vnf=testpmd_io
 | | ${bidirectional_throughput}= | Find Throughput Using MLRsearch
 | | ${unidirectional_throughput}= | Evaluate | ${bidirectional_throughput} / 2.0
-| | Start Traffic on Background | ${unidirectional_throughput}pps
+| | Start Traffic on Background | ${unidirectional_throughput}
 | | And Initialize layer dot1q
 | | ... | count=${nf_total_chains} | vlan_per_chain=${False}
 | | ... | start=${nf_chains+1}
diff --git a/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-8ch-1ach-16vh-8vm2t-testpmd-reconf.robot b/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-8ch-1ach-16vh-8vm2t-testpmd-reconf.robot
index 869adf8d22..1607bcc10c 100644
--- a/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-8ch-1ach-16vh-8vm2t-testpmd-reconf.robot
+++ b/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-8ch-1ach-16vh-8vm2t-testpmd-reconf.robot
@@ -107,7 +107,7 @@
 | | ... | use_tuned_cfs=${False} | auto_scale=${False} | vnf=testpmd_io
 | | ${bidirectional_throughput}= | Find Throughput Using MLRsearch
 | | ${unidirectional_throughput}= | Evaluate | ${bidirectional_throughput} / 2.0
-| | Start Traffic on Background | ${unidirectional_throughput}pps
+| | Start Traffic on Background | ${unidirectional_throughput}
 | | And Initialize layer dot1q
 | | ... | count=${nf_total_chains} | vlan_per_chain=${False}
 | | ... | start=${nf_chains+1}