X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=GPL%2Ftraffic_profiles%2Ftrex%2Fprofile_trex_stateless_base_class.py;fp=GPL%2Ftraffic_profiles%2Ftrex%2Fprofile_trex_stateless_base_class.py;h=5b86192021cb142ca8e4696781e25e2ce02d218a;hp=5cae6bfb7912f13837d50ec784b854deb3325901;hb=6962831a1f1905e50a3d663c0cf3ce8c2873ecc9;hpb=ef5c30213bb28824a55f4ebbcade6410ee8d2461 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 5cae6bfb79..5b86192021 100644 --- a/GPL/traffic_profiles/trex/profile_trex_stateless_base_class.py +++ b/GPL/traffic_profiles/trex/profile_trex_stateless_base_class.py @@ -24,7 +24,6 @@ """Base class for stream profiles for T-rex traffic generator. """ -import sys import socket import struct @@ -129,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 @@ -189,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(