FIX: eval expression

[csit.git] / GPL / tools / trex / trex_astf_stop.py

diff --git a/GPL/tools/trex/trex_astf_stop.py b/GPL/tools/trex/trex_astf_stop.py
index be13e8e..8c05cb4 100644 (file)
--- a/GPL/tools/trex/trex_astf_stop.py
+++ b/GPL/tools/trex/trex_astf_stop.py
@@ -1,11 +1,21 @@
 #!/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:
+# Copyright (c) 2021 Cisco and/or its affiliates.
+#
+# SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
+#
+# Licensed under the Apache License 2.0 or
+# GNU General Public License v2.0 or later;  you may not use this file
+# except in compliance with one of these Licenses. You
+# may obtain a copy of the Licenses at:
 #
 #     http://www.apache.org/licenses/LICENSE-2.0
+#     https://www.gnu.org/licenses/old-licenses/gpl-2.0-standalone.html
+#
+# Note: If this file is linked with Scapy, which is GPLv2+, your use of it
+# must be under GPLv2+.  If at any point in the future it is no longer linked
+# with Scapy (or other GPLv2+ licensed software), you are free to choose
+# Apache 2.
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
@@ -34,9 +44,9 @@ 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/"
+    0, u"/opt/trex-core-2.88/scripts/automation/trex_control_plane/interactive/"
 )
-from trex.astf.api import *
+from trex.astf.api import ASTFClient
 
 
 def main():
@@ -87,66 +97,20 @@ def main():
     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}"
+        f"cps='unknown'; "
+        f"total_received={total_rcvd}; "
+        f"total_sent={total_sent}; "
+        f"frame_loss={total_lost}; "
+        f"latency_stream_0(usec)=-1/-1/-1; "
+        f"latency_stream_1(usec)=-1/-1/-1; "
+        f"latency_hist_stream_0=; "
+        f"latency_hist_stream_1=; "
     )