X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=GPL%2Ftraffic_profiles%2Ftrex%2Fprofile_trex_stateless_base_class.py;h=5b86192021cb142ca8e4696781e25e2ce02d218a;hb=ad98ea70cf435d104b6a4f0090575e137660da77;hp=32ffe9efd65a89c1562ea76aa7376aaa8154a800;hpb=250d14332d04569f01117e614a25de290e629800;p=csit.git

diff --git a/GPL/traffic_profiles/trex/profile_trex_stateless_base_class.py b/GPL/traffic_profiles/trex/profile_trex_stateless_base_class.py
index 32ffe9efd6..5b86192021 100644
--- a/GPL/traffic_profiles/trex/profile_trex_stateless_base_class.py
+++ b/GPL/traffic_profiles/trex/profile_trex_stateless_base_class.py
@@ -1,9 +1,19 @@
-# 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,
@@ -14,7 +24,6 @@
 """Base class for stream profiles for T-rex traffic generator.
 """
 
-import sys
 import socket
 import struct
 
@@ -119,35 +128,39 @@ class TrafficStreamsBaseClass:
 
         # Frame size is defined as an integer, e.g. 64, 1518:
         if isinstance(self.framesize, int):
-            # Create a base packet and pad it to size
-            payload_len = max(0, self.framesize - len(base_pkt_a) - 4)  # No FCS
+            # Create a base packet and pad it to size; deduct FCS
+            payload_len_a = max(0, self.framesize - len(base_pkt_a) - 4)
+            payload_len_b = max(0, self.framesize - len(base_pkt_b) - 4)
 
             # Direction 0 --> 1
             pkt_a = STLPktBuilder(
-                pkt=base_pkt_a / self._gen_payload(payload_len), vm=vm1
+                pkt=base_pkt_a / self._gen_payload(payload_len_a), vm=vm1
             )
             # Direction 1 --> 0
             pkt_b = STLPktBuilder(
-                pkt=base_pkt_b / self._gen_payload(payload_len), vm=vm2
+                pkt=base_pkt_b / self._gen_payload(payload_len_b), vm=vm2
             )
 
             # Packets for latency measurement:
             # Direction 0 --> 1
             pkt_lat_a = STLPktBuilder(
-                pkt=base_pkt_a / self._gen_payload(payload_len), vm=vm1
+                pkt=base_pkt_a / self._gen_payload(payload_len_a), vm=vm1
             )
             # Direction 1 --> 0
             pkt_lat_b = STLPktBuilder(
-                pkt=base_pkt_b / self._gen_payload(payload_len), vm=vm2
+                pkt=base_pkt_b / self._gen_payload(payload_len_b), vm=vm2
             )
 
             # Create the streams:
             # Direction 0 --> 1
-            stream1 = STLStream(packet=pkt_a, mode=STLTXCont(pps=9000))
+            stream1 = STLStream(
+                packet=pkt_a, mode=STLTXCont(pps=9000)
+            )
             # Direction 1 --> 0
             # second traffic stream with a phase of 10ns (inter-stream gap)
-            stream2 = STLStream(packet=pkt_b, isg=10.0,
-                                mode=STLTXCont(pps=9000))
+            stream2 = STLStream(
+                packet=pkt_b, isg=10.0, mode=STLTXCont(pps=9000)
+            )
 
             # Streams for latency measurement:
             # Direction 0 --> 1
@@ -179,10 +192,12 @@ class TrafficStreamsBaseClass:
                 # Create a base packet and pad it to size
                 pkt_a = STLPktBuilder(
                     pkt=base_pkt_a / self._gen_payload(payload_len_a),
-                    vm=vm1)
+                    vm=vm1
+                )
                 pkt_b = STLPktBuilder(
                     pkt=base_pkt_b / self._gen_payload(payload_len_b),
-                    vm=vm2)
+                    vm=vm2
+                )
 
                 # Create the streams:
                 stream1.append(STLStream(