diff options
Diffstat (limited to 'resources')
25 files changed, 57 insertions, 103 deletions
diff --git a/resources/libraries/python/TrafficGenerator.py b/resources/libraries/python/TrafficGenerator.py index 1680438625..88adcc4542 100644 --- a/resources/libraries/python/TrafficGenerator.py +++ b/resources/libraries/python/TrafficGenerator.py @@ -184,19 +184,17 @@ class TrafficGenerator(object): self._node = tg_node if tg_node['subtype'] == NodeSubTypeTG.TREX: - trex_path = "/opt/trex-core-2.29" + trex_path = "/opt/trex-core-2.34" ssh = SSH() ssh.connect(tg_node) - (ret, stdout, stderr) = ssh.exec_command( + (ret, _, _) = ssh.exec_command( "sudo -E sh -c '{}/resources/tools/trex/" "trex_installer.sh'".format(Constants.REMOTE_FW_DIR), timeout=1800) if int(ret) != 0: - logger.error('TRex installation failed: {0}'.format( - stdout + stderr)) - raise RuntimeError('Installation of TG failed') + raise RuntimeError('TRex installation failed.') if1_pci = topo.get_interface_pci_addr(tg_node, tg_if1) if2_pci = topo.get_interface_pci_addr(tg_node, tg_if2) @@ -229,7 +227,7 @@ class TrafficGenerator(object): if1_adj_mac_hex = "0x"+if1_adj_mac.replace(":", ",0x") if2_adj_mac_hex = "0x"+if2_adj_mac.replace(":", ",0x") - (ret, stdout, stderr) = ssh.exec_command( + (ret, _, _) = ssh.exec_command( "sudo sh -c 'cat << EOF > /etc/trex_cfg.yaml\n" "- port_limit : 2\n" " version : 2\n" @@ -244,8 +242,6 @@ class TrafficGenerator(object): if1_adj_mac_hex, if1_mac_hex, if2_adj_mac_hex, if2_mac_hex)) if int(ret) != 0: - logger.error("failed to create t-rex config: {}"\ - .format(stdout + stderr)) raise RuntimeError('trex config generation error') max_startup_retries = 3 @@ -255,20 +251,20 @@ class TrafficGenerator(object): "sh -c 'pgrep t-rex && sudo pkill t-rex && sleep 3'") # configure T-rex - (ret, stdout, stderr) = ssh.exec_command( + (ret, _, _) = ssh.exec_command( "sh -c 'cd {0}/scripts/ && sudo ./trex-cfg'"\ .format(trex_path)) if int(ret) != 0: - logger.error('trex-cfg failed: {0}'.format(stdout + stderr)) raise RuntimeError('trex-cfg failed') # start T-rex (ret, _, _) = ssh.exec_command( "sh -c 'cd {0}/scripts/ && " - "sudo nohup ./t-rex-64 -i -c 7 --iom 0 > /dev/null 2>&1 &'" - "> /dev/null"\ + "sudo nohup ./t-rex-64 -i -c 7 --iom 0 > /tmp/trex.log " + "2>&1 &' > /dev/null"\ .format(trex_path)) if int(ret) != 0: + ssh.exec_command("sh -c 'cat /tmp/trex.log'") raise RuntimeError('t-rex-64 startup failed') # get T-rex server info @@ -301,10 +297,9 @@ class TrafficGenerator(object): if node['subtype'] == NodeSubTypeTG.TREX: ssh = SSH() ssh.connect(node) - (ret, stdout, stderr) = ssh.exec_command( + (ret, _, _) = ssh.exec_command( "sh -c 'sudo pkill t-rex && sleep 3'") if int(ret) != 0: - logger.error('pkill t-rex failed: {0}'.format(stdout + stderr)) raise RuntimeError('pkill t-rex failed') @staticmethod diff --git a/resources/tools/trex/trex_installer.sh b/resources/tools/trex/trex_installer.sh index c9a41ce525..1e9b4ba734 100755 --- a/resources/tools/trex/trex_installer.sh +++ b/resources/tools/trex/trex_installer.sh @@ -1,6 +1,6 @@ #!/bin/sh -TREX_VERSION="2.29" +TREX_VERSION="2.34" TREX_DOWNLOAD_REPO="https://github.com/cisco-system-traffic-generator/trex-core/archive/" TREX_DOWNLOAD_PACKAGE="v${TREX_VERSION}.zip" @@ -34,4 +34,3 @@ test $? -eq 0 || exit 1 cd ${TREX_INSTALL_DIR}/linux_dpdk/ && ./b configure && ./b build || exit 1 cd ${TREX_INSTALL_DIR}/scripts/ko/src && make && make install || exit 1 - diff --git a/resources/tools/trex/trex_server_info.py b/resources/tools/trex/trex_server_info.py index 9a98637c3b..ff1350d306 100755 --- a/resources/tools/trex/trex_server_info.py +++ b/resources/tools/trex/trex_server_info.py @@ -28,7 +28,7 @@ Functionality: import sys -sys.path.insert(0, "/opt/trex-core-2.29/scripts/automation/"+\ +sys.path.insert(0, "/opt/trex-core-2.34/scripts/automation/"+\ "trex_control_plane/stl/") from trex_stl_lib.api import * @@ -72,5 +72,6 @@ def main(): get_server_system_info() + if __name__ == "__main__": main() diff --git a/resources/tools/trex/trex_stateless_profile.py b/resources/tools/trex/trex_stateless_profile.py index a3072cfaed..311c85f5d8 100755 --- a/resources/tools/trex/trex_stateless_profile.py +++ b/resources/tools/trex/trex_stateless_profile.py @@ -22,7 +22,7 @@ import sys import argparse import json -sys.path.insert(0, "/opt/trex-core-2.29/scripts/automation/" +sys.path.insert(0, "/opt/trex-core-2.34/scripts/automation/" "trex_control_plane/stl/") from trex_stl_lib.api import * @@ -109,11 +109,9 @@ def simple_burst(profile_file, duration, framesize, rate, warmup_time, port_0, print("### Profile file:\n{}".format(profile_file)) profile = STLProfile.load(profile_file, direction=0, port_id=0, framesize=framesize) - print("\n### Profiles ###\n") - print(profile.dump_to_yaml()) streams = profile.get_streams() - except STLError: - print("Error while loading profile '{0}'\n".format(profile_file)) + except STLError as err: + print("Error while loading profile '{0}' {1}".format(profile_file, err)) sys.exit(1) try: diff --git a/resources/tools/trex/trex_stateless_stop.py b/resources/tools/trex/trex_stateless_stop.py index 0a2aabfba2..67dd2d277e 100755 --- a/resources/tools/trex/trex_stateless_stop.py +++ b/resources/tools/trex/trex_stateless_stop.py @@ -29,7 +29,7 @@ Functionality: import sys import json -sys.path.insert(0, "/opt/trex-core-2.29/scripts/automation/"+\ +sys.path.insert(0, "/opt/trex-core-2.34/scripts/automation/"+\ "trex_control_plane/stl/") from trex_stl_lib.api import * @@ -87,5 +87,6 @@ def main(): stop_all_traffic_streams() + if __name__ == "__main__": main() diff --git a/resources/traffic_profiles/trex/trex-sl-2n-ethip4-ip4src253.py b/resources/traffic_profiles/trex/trex-sl-2n-ethip4-ip4src253.py index f9a030b9eb..ee521ddcab 100755 --- a/resources/traffic_profiles/trex/trex-sl-2n-ethip4-ip4src253.py +++ b/resources/traffic_profiles/trex/trex-sl-2n-ethip4-ip4src253.py @@ -69,16 +69,14 @@ class TrafficStreams(TrafficStreamsBaseClass): max_value=self.p1_src_end_ip, size=4, op="inc"), STLVmWrFlowVar(fv_name="src", pkt_offset="IP.src"), - STLVmFixIpv4(offset="IP")], - split_by_field="src") + STLVmFixIpv4(offset="IP")]) # Direction 1 --> 0 vm2 = STLScVmRaw([STLVmFlowVar(name="src", min_value=self.p2_src_start_ip, max_value=self.p2_src_end_ip, size=4, op="inc"), STLVmWrFlowVar(fv_name="src", pkt_offset="IP.src"), - STLVmFixIpv4(offset="IP")], - split_by_field="src") + STLVmFixIpv4(offset="IP")]) return base_pkt_a, base_pkt_b, vm1, vm2 diff --git a/resources/traffic_profiles/trex/trex-sl-3n-ethip4-ip4dst100.py b/resources/traffic_profiles/trex/trex-sl-3n-ethip4-ip4dst100.py index 86f423a153..4ace3963c7 100755 --- a/resources/traffic_profiles/trex/trex-sl-3n-ethip4-ip4dst100.py +++ b/resources/traffic_profiles/trex/trex-sl-3n-ethip4-ip4dst100.py @@ -71,16 +71,14 @@ class TrafficStreams(TrafficStreamsBaseClass): max_value=self.p1_dst_end_ip, size=4, op="inc"), STLVmWrFlowVar(fv_name="dst", pkt_offset="IP.dst"), - STLVmFixIpv4(offset="IP")], - split_by_field="dst") + STLVmFixIpv4(offset="IP")]) # Direction 1 --> 0 vm2 = STLScVmRaw([STLVmFlowVar(name="dst", min_value=self.p2_dst_start_ip, max_value=self.p2_dst_end_ip, size=4, op="inc"), STLVmWrFlowVar(fv_name="dst", pkt_offset="IP.dst"), - STLVmFixIpv4(offset="IP")], - split_by_field="dst") + STLVmFixIpv4(offset="IP")]) return base_pkt_a, base_pkt_b, vm1, vm2 diff --git a/resources/traffic_profiles/trex/trex-sl-3n-ethip4-ip4dst1000.py b/resources/traffic_profiles/trex/trex-sl-3n-ethip4-ip4dst1000.py index 569c06360f..5f0d1ce418 100755 --- a/resources/traffic_profiles/trex/trex-sl-3n-ethip4-ip4dst1000.py +++ b/resources/traffic_profiles/trex/trex-sl-3n-ethip4-ip4dst1000.py @@ -71,16 +71,14 @@ class TrafficStreams(TrafficStreamsBaseClass): max_value=self.p1_dst_end_ip, size=4, op="inc"), STLVmWrFlowVar(fv_name="dst", pkt_offset="IP.dst"), - STLVmFixIpv4(offset="IP")], - split_by_field="dst") + STLVmFixIpv4(offset="IP")]) # Direction 1 --> 0 vm2 = STLScVmRaw([STLVmFlowVar(name="dst", min_value=self.p2_dst_start_ip, max_value=self.p2_dst_end_ip, size=4, op="inc"), STLVmWrFlowVar(fv_name="dst", pkt_offset="IP.dst"), - STLVmFixIpv4(offset="IP")], - split_by_field="dst") + STLVmFixIpv4(offset="IP")]) return base_pkt_a, base_pkt_b, vm1, vm2 diff --git a/resources/traffic_profiles/trex/trex-sl-3n-ethip4-ip4dst10000.py b/resources/traffic_profiles/trex/trex-sl-3n-ethip4-ip4dst10000.py index 373076f596..c562a8e176 100755 --- a/resources/traffic_profiles/trex/trex-sl-3n-ethip4-ip4dst10000.py +++ b/resources/traffic_profiles/trex/trex-sl-3n-ethip4-ip4dst10000.py @@ -71,16 +71,14 @@ class TrafficStreams(TrafficStreamsBaseClass): max_value=self.p1_dst_end_ip, size=4, op="inc"), STLVmWrFlowVar(fv_name="dst", pkt_offset="IP.dst"), - STLVmFixIpv4(offset="IP")], - split_by_field="dst") + STLVmFixIpv4(offset="IP")]) # Direction 1 --> 0 vm2 = STLScVmRaw([STLVmFlowVar(name="dst", min_value=self.p2_dst_start_ip, max_value=self.p2_dst_end_ip, size=4, op="inc"), STLVmWrFlowVar(fv_name="dst", pkt_offset="IP.dst"), - STLVmFixIpv4(offset="IP")], - split_by_field="dst") + STLVmFixIpv4(offset="IP")]) return base_pkt_a, base_pkt_b, vm1, vm2 diff --git a/resources/traffic_profiles/trex/trex-sl-3n-ethip4-ip4dst100000.py b/resources/traffic_profiles/trex/trex-sl-3n-ethip4-ip4dst100000.py index 3b27e9a9e0..da873f8746 100755 --- a/resources/traffic_profiles/trex/trex-sl-3n-ethip4-ip4dst100000.py +++ b/resources/traffic_profiles/trex/trex-sl-3n-ethip4-ip4dst100000.py @@ -71,16 +71,14 @@ class TrafficStreams(TrafficStreamsBaseClass): max_value=self.p1_dst_end_ip, size=4, op="inc"), STLVmWrFlowVar(fv_name="dst", pkt_offset="IP.dst"), - STLVmFixIpv4(offset="IP")], - split_by_field="dst") + STLVmFixIpv4(offset="IP")]) # Direction 1 --> 0 vm2 = STLScVmRaw([STLVmFlowVar(name="dst", min_value=self.p2_dst_start_ip, max_value=self.p2_dst_end_ip, size=4, op="inc"), STLVmWrFlowVar(fv_name="dst", pkt_offset="IP.dst"), - STLVmFixIpv4(offset="IP")], - split_by_field="dst") + STLVmFixIpv4(offset="IP")]) return base_pkt_a, base_pkt_b, vm1, vm2 diff --git a/resources/traffic_profiles/trex/trex-sl-3n-ethip4-ip4dst1000000.py b/resources/traffic_profiles/trex/trex-sl-3n-ethip4-ip4dst1000000.py index 076951b566..a75e17530c 100755 --- a/resources/traffic_profiles/trex/trex-sl-3n-ethip4-ip4dst1000000.py +++ b/resources/traffic_profiles/trex/trex-sl-3n-ethip4-ip4dst1000000.py @@ -71,16 +71,14 @@ class TrafficStreams(TrafficStreamsBaseClass): max_value=self.p1_dst_end_ip, size=4, op="inc"), STLVmWrFlowVar(fv_name="dst", pkt_offset="IP.dst"), - STLVmFixIpv4(offset="IP")], - split_by_field="dst") + STLVmFixIpv4(offset="IP")]) # Direction 1 --> 0 vm2 = STLScVmRaw([STLVmFlowVar(name="dst", min_value=self.p2_dst_start_ip, max_value=self.p2_dst_end_ip, size=4, op="inc"), STLVmWrFlowVar(fv_name="dst", pkt_offset="IP.dst"), - STLVmFixIpv4(offset="IP")], - split_by_field="dst") + STLVmFixIpv4(offset="IP")]) return base_pkt_a, base_pkt_b, vm1, vm2 diff --git a/resources/traffic_profiles/trex/trex-sl-3n-ethip4-ip4dst253.py b/resources/traffic_profiles/trex/trex-sl-3n-ethip4-ip4dst253.py index 684af82ce1..adbf9fb6f3 100755 --- a/resources/traffic_profiles/trex/trex-sl-3n-ethip4-ip4dst253.py +++ b/resources/traffic_profiles/trex/trex-sl-3n-ethip4-ip4dst253.py @@ -71,16 +71,14 @@ class TrafficStreams(TrafficStreamsBaseClass): max_value=self.p1_dst_end_ip, size=4, op="inc"), STLVmWrFlowVar(fv_name="dst", pkt_offset="IP.dst"), - STLVmFixIpv4(offset="IP")], - split_by_field="dst") + STLVmFixIpv4(offset="IP")]) # Direction 1 --> 0 vm2 = STLScVmRaw([STLVmFlowVar(name="dst", min_value=self.p2_dst_start_ip, max_value=self.p2_dst_end_ip, size=4, op="inc"), STLVmWrFlowVar(fv_name="dst", pkt_offset="IP.dst"), - STLVmFixIpv4(offset="IP")], - split_by_field="dst") + STLVmFixIpv4(offset="IP")]) return base_pkt_a, base_pkt_b, vm1, vm2 diff --git a/resources/traffic_profiles/trex/trex-sl-3n-ethip4-ip4dst253_l3fwd.py b/resources/traffic_profiles/trex/trex-sl-3n-ethip4-ip4dst253_l3fwd.py index 55a79942de..f8cae518c4 100755 --- a/resources/traffic_profiles/trex/trex-sl-3n-ethip4-ip4dst253_l3fwd.py +++ b/resources/traffic_profiles/trex/trex-sl-3n-ethip4-ip4dst253_l3fwd.py @@ -71,16 +71,14 @@ class TrafficStreams(TrafficStreamsBaseClass): max_value=self.p1_dst_end_ip, size=4, op="inc"), STLVmWrFlowVar(fv_name="dst", pkt_offset="IP.dst"), - STLVmFixIpv4(offset="IP")], - split_by_field="dst") + STLVmFixIpv4(offset="IP")]) # Direction 1 --> 0 vm2 = STLScVmRaw([STLVmFlowVar(name="dst", min_value=self.p2_dst_start_ip, max_value=self.p2_dst_end_ip, size=4, op="inc"), STLVmWrFlowVar(fv_name="dst", pkt_offset="IP.dst"), - STLVmFixIpv4(offset="IP")], - split_by_field="dst") + STLVmFixIpv4(offset="IP")]) return base_pkt_a, base_pkt_b, vm1, vm2 diff --git a/resources/traffic_profiles/trex/trex-sl-3n-ethip4-ip4src253.py b/resources/traffic_profiles/trex/trex-sl-3n-ethip4-ip4src253.py index f9a030b9eb..ee521ddcab 100755 --- a/resources/traffic_profiles/trex/trex-sl-3n-ethip4-ip4src253.py +++ b/resources/traffic_profiles/trex/trex-sl-3n-ethip4-ip4src253.py @@ -69,16 +69,14 @@ class TrafficStreams(TrafficStreamsBaseClass): max_value=self.p1_src_end_ip, size=4, op="inc"), STLVmWrFlowVar(fv_name="src", pkt_offset="IP.src"), - STLVmFixIpv4(offset="IP")], - split_by_field="src") + STLVmFixIpv4(offset="IP")]) # Direction 1 --> 0 vm2 = STLScVmRaw([STLVmFlowVar(name="src", min_value=self.p2_src_start_ip, max_value=self.p2_src_end_ip, size=4, op="inc"), STLVmWrFlowVar(fv_name="src", pkt_offset="IP.src"), - STLVmFixIpv4(offset="IP")], - split_by_field="src") + STLVmFixIpv4(offset="IP")]) return base_pkt_a, base_pkt_b, vm1, vm2 diff --git a/resources/traffic_profiles/trex/trex-sl-3n-ethip4-ip4src254.py b/resources/traffic_profiles/trex/trex-sl-3n-ethip4-ip4src254.py index 0a2a4a4564..55238da044 100755 --- a/resources/traffic_profiles/trex/trex-sl-3n-ethip4-ip4src254.py +++ b/resources/traffic_profiles/trex/trex-sl-3n-ethip4-ip4src254.py @@ -69,16 +69,14 @@ class TrafficStreams(TrafficStreamsBaseClass): max_value=self.p1_src_end_ip, size=4, op="inc"), STLVmWrFlowVar(fv_name="src", pkt_offset="IP.src"), - STLVmFixIpv4(offset="IP")], - split_by_field="src") + STLVmFixIpv4(offset="IP")]) # Direction 1 --> 0 vm2 = STLScVmRaw([STLVmFlowVar(name="src", min_value=self.p2_src_start_ip, max_value=self.p2_src_end_ip, size=4, op="inc"), STLVmWrFlowVar(fv_name="src", pkt_offset="IP.src"), - STLVmFixIpv4(offset="IP")], - split_by_field="src") + STLVmFixIpv4(offset="IP")]) return base_pkt_a, base_pkt_b, vm1, vm2 diff --git a/resources/traffic_profiles/trex/trex-sl-3n-ethip4-macsrc100ip4src100.py b/resources/traffic_profiles/trex/trex-sl-3n-ethip4-macsrc100ip4src100.py index 1b5ba3f280..f8bf3aec7c 100755 --- a/resources/traffic_profiles/trex/trex-sl-3n-ethip4-macsrc100ip4src100.py +++ b/resources/traffic_profiles/trex/trex-sl-3n-ethip4-macsrc100ip4src100.py @@ -85,8 +85,7 @@ class TrafficStreams(TrafficStreamsBaseClass): max_value=self.p1_src_end_ip, size=4, op="inc"), STLVmWrFlowVar(fv_name="src", pkt_offset="IP.src"), - STLVmFixIpv4(offset="IP")], - split_by_field="src") + STLVmFixIpv4(offset="IP")]) # Direction 1 --> 0 vm2 = STLScVmRaw([STLVmFlowVar(name="mac_src", min_value=0, @@ -98,8 +97,7 @@ class TrafficStreams(TrafficStreamsBaseClass): max_value=self.p2_src_end_ip, size=4, op="inc"), STLVmWrFlowVar(fv_name="src", pkt_offset="IP.src"), - STLVmFixIpv4(offset="IP")], - split_by_field="src") + STLVmFixIpv4(offset="IP")]) return base_pkt_a, base_pkt_b, vm1, vm2 diff --git a/resources/traffic_profiles/trex/trex-sl-3n-ethip4-macsrc100kip4src100k.py b/resources/traffic_profiles/trex/trex-sl-3n-ethip4-macsrc100kip4src100k.py index 5a4916ba84..6f97800733 100755 --- a/resources/traffic_profiles/trex/trex-sl-3n-ethip4-macsrc100kip4src100k.py +++ b/resources/traffic_profiles/trex/trex-sl-3n-ethip4-macsrc100kip4src100k.py @@ -85,8 +85,7 @@ class TrafficStreams(TrafficStreamsBaseClass): max_value=self.p1_src_end_ip, size=4, op="inc"), STLVmWrFlowVar(fv_name="src", pkt_offset="IP.src"), - STLVmFixIpv4(offset="IP")], - split_by_field="src") + STLVmFixIpv4(offset="IP")]) # Direction 1 --> 0 vm2 = STLScVmRaw([STLVmFlowVar(name="mac_src", min_value=0, @@ -98,8 +97,7 @@ class TrafficStreams(TrafficStreamsBaseClass): max_value=self.p2_src_end_ip, size=4, op="inc"), STLVmWrFlowVar(fv_name="src", pkt_offset="IP.src"), - STLVmFixIpv4(offset="IP")], - split_by_field="src") + STLVmFixIpv4(offset="IP")]) return base_pkt_a, base_pkt_b, vm1, vm2 diff --git a/resources/traffic_profiles/trex/trex-sl-3n-ethip4-macsrc10kip4src10k.py b/resources/traffic_profiles/trex/trex-sl-3n-ethip4-macsrc10kip4src10k.py index 1b5bcab16a..d5b795d4e3 100755 --- a/resources/traffic_profiles/trex/trex-sl-3n-ethip4-macsrc10kip4src10k.py +++ b/resources/traffic_profiles/trex/trex-sl-3n-ethip4-macsrc10kip4src10k.py @@ -85,8 +85,7 @@ class TrafficStreams(TrafficStreamsBaseClass): max_value=self.p1_src_end_ip, size=4, op="inc"), STLVmWrFlowVar(fv_name="src", pkt_offset="IP.src"), - STLVmFixIpv4(offset="IP")], - split_by_field="src") + STLVmFixIpv4(offset="IP")]) # Direction 1 --> 0 vm2 = STLScVmRaw([STLVmFlowVar(name="mac_src", min_value=0, @@ -98,8 +97,7 @@ class TrafficStreams(TrafficStreamsBaseClass): max_value=self.p2_src_end_ip, size=4, op="inc"), STLVmWrFlowVar(fv_name="src", pkt_offset="IP.src"), - STLVmFixIpv4(offset="IP")], - split_by_field="src") + STLVmFixIpv4(offset="IP")]) return base_pkt_a, base_pkt_b, vm1, vm2 diff --git a/resources/traffic_profiles/trex/trex-sl-3n-ethip4-macsrc500kdst500k.py b/resources/traffic_profiles/trex/trex-sl-3n-ethip4-macsrc500kdst500k.py index 7094788a42..72d0b1351d 100755 --- a/resources/traffic_profiles/trex/trex-sl-3n-ethip4-macsrc500kdst500k.py +++ b/resources/traffic_profiles/trex/trex-sl-3n-ethip4-macsrc500kdst500k.py @@ -105,8 +105,7 @@ class TrafficStreams(TrafficStreamsBaseClass): max_value=self.p1_dst_end_ip, size=4, op="inc"), STLVmWrFlowVar(fv_name="ip_dst", pkt_offset="IP.dst"), - STLVmFixIpv4(offset="IP")], - split_by_field="dst") + STLVmFixIpv4(offset="IP")]) # Direction 1 --> 0 vm2 = STLScVmRaw([STLVmFlowVar(name="mac_src", min_value=0, @@ -128,8 +127,7 @@ class TrafficStreams(TrafficStreamsBaseClass): max_value=self.p2_dst_end_ip, size=4, op="inc"), STLVmWrFlowVar(fv_name="ip_dst", pkt_offset="IP.dst"), - STLVmFixIpv4(offset="IP")], - split_by_field="dst") + STLVmFixIpv4(offset="IP")]) return base_pkt_a, base_pkt_b, vm1, vm2 diff --git a/resources/traffic_profiles/trex/trex-sl-3n-ethip4-macsrc50kdst50k.py b/resources/traffic_profiles/trex/trex-sl-3n-ethip4-macsrc50kdst50k.py index b8c9ca1daa..f5822b4fe0 100755 --- a/resources/traffic_profiles/trex/trex-sl-3n-ethip4-macsrc50kdst50k.py +++ b/resources/traffic_profiles/trex/trex-sl-3n-ethip4-macsrc50kdst50k.py @@ -105,8 +105,7 @@ class TrafficStreams(TrafficStreamsBaseClass): max_value=self.p1_dst_end_ip, size=4, op="inc"), STLVmWrFlowVar(fv_name="ip_dst", pkt_offset="IP.dst"), - STLVmFixIpv4(offset="IP")], - split_by_field="dst") + STLVmFixIpv4(offset="IP")]) # Direction 1 --> 0 vm2 = STLScVmRaw([STLVmFlowVar(name="mac_src", min_value=0, @@ -128,8 +127,7 @@ class TrafficStreams(TrafficStreamsBaseClass): max_value=self.p2_dst_end_ip, size=4, op="inc"), STLVmWrFlowVar(fv_name="ip_dst", pkt_offset="IP.dst"), - STLVmFixIpv4(offset="IP")], - split_by_field="dst") + STLVmFixIpv4(offset="IP")]) return base_pkt_a, base_pkt_b, vm1, vm2 diff --git a/resources/traffic_profiles/trex/trex-sl-3n-ethip4-macsrc5kdst5k.py b/resources/traffic_profiles/trex/trex-sl-3n-ethip4-macsrc5kdst5k.py index b51dd88af7..30a25cb1b9 100755 --- a/resources/traffic_profiles/trex/trex-sl-3n-ethip4-macsrc5kdst5k.py +++ b/resources/traffic_profiles/trex/trex-sl-3n-ethip4-macsrc5kdst5k.py @@ -105,8 +105,7 @@ class TrafficStreams(TrafficStreamsBaseClass): max_value=self.p1_dst_end_ip, size=4, op="inc"), STLVmWrFlowVar(fv_name="ip_dst", pkt_offset="IP.dst"), - STLVmFixIpv4(offset="IP")], - split_by_field="dst") + STLVmFixIpv4(offset="IP")]) # Direction 1 --> 0 vm2 = STLScVmRaw([STLVmFlowVar(name="mac_src", min_value=0, @@ -128,8 +127,7 @@ class TrafficStreams(TrafficStreamsBaseClass): max_value=self.p2_dst_end_ip, size=4, op="inc"), STLVmWrFlowVar(fv_name="ip_dst", pkt_offset="IP.dst"), - STLVmFixIpv4(offset="IP")], - split_by_field="dst") + STLVmFixIpv4(offset="IP")]) return base_pkt_a, base_pkt_b, vm1, vm2 diff --git a/resources/traffic_profiles/trex/trex-sl-3n-ethip6-ip6dst10000.py b/resources/traffic_profiles/trex/trex-sl-3n-ethip6-ip6dst10000.py index 7a85ddfc05..757e90318b 100755 --- a/resources/traffic_profiles/trex/trex-sl-3n-ethip6-ip6dst10000.py +++ b/resources/traffic_profiles/trex/trex-sl-3n-ethip6-ip6dst10000.py @@ -73,8 +73,7 @@ class TrafficStreams(TrafficStreamsBaseClass): size=8, op="inc"), STLVmWrFlowVar(fv_name="ipv6_dst", pkt_offset="IPv6.dst", - offset_fixup=8)], - split_by_field="ipv6_dst") + offset_fixup=8)]) # Direction 1 --> 0 vm2 = STLScVmRaw([STLVmFlowVar(name="ipv6_dst", min_value=base_p2, @@ -82,8 +81,7 @@ class TrafficStreams(TrafficStreamsBaseClass): size=8, op="inc"), STLVmWrFlowVar(fv_name="ipv6_dst", pkt_offset="IPv6.dst", - offset_fixup=8)], - split_by_field="ipv6_dst") + offset_fixup=8)]) return base_pkt_a, base_pkt_b, vm1, vm2 diff --git a/resources/traffic_profiles/trex/trex-sl-3n-ethip6-ip6dst100000.py b/resources/traffic_profiles/trex/trex-sl-3n-ethip6-ip6dst100000.py index b1948c9de2..fd252d4725 100755 --- a/resources/traffic_profiles/trex/trex-sl-3n-ethip6-ip6dst100000.py +++ b/resources/traffic_profiles/trex/trex-sl-3n-ethip6-ip6dst100000.py @@ -73,8 +73,7 @@ class TrafficStreams(TrafficStreamsBaseClass): size=8, op="inc"), STLVmWrFlowVar(fv_name="ipv6_dst", pkt_offset="IPv6.dst", - offset_fixup=8)], - split_by_field="ipv6_dst") + offset_fixup=8)]) # Direction 1 --> 0 vm2 = STLScVmRaw([STLVmFlowVar(name="ipv6_dst", min_value=base_p2, @@ -82,8 +81,7 @@ class TrafficStreams(TrafficStreamsBaseClass): size=8, op="inc"), STLVmWrFlowVar(fv_name="ipv6_dst", pkt_offset="IPv6.dst", - offset_fixup=8)], - split_by_field="ipv6_dst") + offset_fixup=8)]) return base_pkt_a, base_pkt_b, vm1, vm2 diff --git a/resources/traffic_profiles/trex/trex-sl-3n-ethip6-ip6dst1000000.py b/resources/traffic_profiles/trex/trex-sl-3n-ethip6-ip6dst1000000.py index ace0dace76..700dc7437d 100755 --- a/resources/traffic_profiles/trex/trex-sl-3n-ethip6-ip6dst1000000.py +++ b/resources/traffic_profiles/trex/trex-sl-3n-ethip6-ip6dst1000000.py @@ -73,8 +73,7 @@ class TrafficStreams(TrafficStreamsBaseClass): size=8, op="inc"), STLVmWrFlowVar(fv_name="ipv6_dst", pkt_offset="IPv6.dst", - offset_fixup=8)], - split_by_field="ipv6_dst") + offset_fixup=8)]) # Direction 1 --> 0 vm2 = STLScVmRaw([STLVmFlowVar(name="ipv6_dst", min_value=base_p2, @@ -82,8 +81,7 @@ class TrafficStreams(TrafficStreamsBaseClass): size=8, op="inc"), STLVmWrFlowVar(fv_name="ipv6_dst", pkt_offset="IPv6.dst", - offset_fixup=8)], - split_by_field="ipv6_dst") + offset_fixup=8)]) return base_pkt_a, base_pkt_b, vm1, vm2 diff --git a/resources/traffic_profiles/trex/trex-sl-3n-ethip6-ip6src253.py b/resources/traffic_profiles/trex/trex-sl-3n-ethip6-ip6src253.py index be900ce2cc..eb306bfe69 100755 --- a/resources/traffic_profiles/trex/trex-sl-3n-ethip6-ip6src253.py +++ b/resources/traffic_profiles/trex/trex-sl-3n-ethip6-ip6src253.py @@ -73,8 +73,7 @@ class TrafficStreams(TrafficStreamsBaseClass): size=8, op="inc"), STLVmWrFlowVar(fv_name="ipv6_src", pkt_offset="IPv6.src", - offset_fixup=8)], - split_by_field="ipv6_src") + offset_fixup=8)]) # Direction 1 --> 0 vm2 = STLScVmRaw([STLVmFlowVar(name="ipv6_src", min_value=base_p2, @@ -82,8 +81,7 @@ class TrafficStreams(TrafficStreamsBaseClass): size=8, op="inc"), STLVmWrFlowVar(fv_name="ipv6_src", pkt_offset="IPv6.src", - offset_fixup=8)], - split_by_field="ipv6_src") + offset_fixup=8)]) return base_pkt_a, base_pkt_b, vm1, vm2 |