X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=GPL%2Ftools%2Ftrex%2Ftrex_stl_stop.py;h=8d24a88b33001ff0dd2fd9483f221c25b5f2c566;hp=28a9de942107ea556e03e72facfd42cb0df89c63;hb=a4ba3f4e9d2124050502b8dc5c53acbdebd39e11;hpb=38ba3408ef77161b61cd4be702d0c6e8fc36f8e5

diff --git a/GPL/tools/trex/trex_stl_stop.py b/GPL/tools/trex/trex_stl_stop.py
index 28a9de9421..8d24a88b33 100644
--- a/GPL/tools/trex/trex_stl_stop.py
+++ b/GPL/tools/trex/trex_stl_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.stl.api import *
+from trex.stl.api import STLClient
 
 
 def main():
@@ -91,13 +101,16 @@ def main():
 
     total_rcvd, total_sent = rx_0 + rx_1, tx_0 + tx_1
     total_lost = total_sent - total_rcvd
-    # TODO: Add latency.
     print(
-        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"
+        f"rate='unknown'; "
+        f"total_received={total_rcvd}; "
+        f"total_sent={total_sent}; "
+        f"frame_loss={total_lost}; "
+        f"target_duration='manual'; "
+        f"approximated_duration='manual'; "
+        f"approximated_rate='unknown'; "
+        f"latency_stream_0(usec)=-1/-1/-1; "
+        f"latency_stream_1(usec)=-1/-1/-1; "
     )