diff options
Diffstat (limited to 'resources')
83 files changed, 222 insertions, 452 deletions
diff --git a/resources/libraries/python/Constants.py b/resources/libraries/python/Constants.py index 72310ba8ce..4b8344a72d 100644 --- a/resources/libraries/python/Constants.py +++ b/resources/libraries/python/Constants.py @@ -65,10 +65,10 @@ class Constants(object): QEMU_VM_DPDK = '/opt/dpdk-19.02' # TRex install version - TREX_INSTALL_VERSION = '2.35' + TREX_INSTALL_VERSION = '2.54' # TRex install directory - TREX_INSTALL_DIR = '/opt/trex-core-2.35' + TREX_INSTALL_DIR = '/opt/trex-core-2.54' # Honeycomb directory location at topology nodes: REMOTE_HC_DIR = '/opt/honeycomb' diff --git a/resources/libraries/python/TrafficGenerator.py b/resources/libraries/python/TrafficGenerator.py index 9e0a1d2735..334e299f3e 100644 --- a/resources/libraries/python/TrafficGenerator.py +++ b/resources/libraries/python/TrafficGenerator.py @@ -18,7 +18,7 @@ from robot.libraries.BuiltIn import BuiltIn from .DropRateSearch import DropRateSearch from .Constants import Constants -from .ssh import SSH +from .ssh import SSH, exec_cmd_no_error from .topology import NodeType from .topology import NodeSubTypeTG from .topology import Topology @@ -203,9 +203,9 @@ class TrafficGenerator(AbstractMeasurer): raise RuntimeError('Node type is not a TG') self._node = tg_node - if tg_node['subtype'] == NodeSubTypeTG.TREX: + if self._node['subtype'] == NodeSubTypeTG.TREX: ssh = SSH() - ssh.connect(tg_node) + ssh.connect(self._node) (ret, _, _) = ssh.exec_command( "sudo -E sh -c '{0}/resources/tools/trex/" @@ -215,10 +215,10 @@ class TrafficGenerator(AbstractMeasurer): if int(ret) != 0: raise RuntimeError('TRex installation failed.') - if1_pci = Topology().get_interface_pci_addr(tg_node, tg_if1) - if2_pci = Topology().get_interface_pci_addr(tg_node, tg_if2) - if1_addr = Topology().get_interface_mac(tg_node, tg_if1) - if2_addr = Topology().get_interface_mac(tg_node, tg_if2) + if1_pci = Topology().get_interface_pci_addr(self._node, tg_if1) + if2_pci = Topology().get_interface_pci_addr(self._node, tg_if2) + if1_addr = Topology().get_interface_mac(self._node, tg_if1) + if2_addr = Topology().get_interface_mac(self._node, tg_if2) if osi_layer == 'L2': if1_adj_addr = if2_addr @@ -229,8 +229,8 @@ class TrafficGenerator(AbstractMeasurer): if2_adj_addr = Topology().get_interface_mac(tg_if2_adj_node, tg_if2_adj_if) elif osi_layer == 'L7': - if1_addr = Topology().get_interface_ip4(tg_node, tg_if1) - if2_addr = Topology().get_interface_ip4(tg_node, tg_if2) + if1_addr = Topology().get_interface_ip4(self._node, tg_if1) + if2_addr = Topology().get_interface_ip4(self._node, tg_if2) if1_adj_addr = Topology().get_interface_ip4(tg_if1_adj_node, tg_if1_adj_if) if2_adj_addr = Topology().get_interface_ip4(tg_if2_adj_node, @@ -252,8 +252,7 @@ class TrafficGenerator(AbstractMeasurer): if osi_layer == 'L2' or osi_layer == 'L3': (ret, _, _) = ssh.exec_command( "sudo sh -c 'cat << EOF > /etc/trex_cfg.yaml\n" - "- port_limit: 2\n" - " version: 2\n" + "- version: 2\n" " interfaces: [\"{0}\",\"{1}\"]\n" " port_info:\n" " - dest_mac: [{2}]\n" @@ -269,8 +268,7 @@ class TrafficGenerator(AbstractMeasurer): elif osi_layer == 'L7': (ret, _, _) = ssh.exec_command( "sudo sh -c 'cat << EOF > /etc/trex_cfg.yaml\n" - "- port_limit: 2\n" - " version: 2\n" + "- version: 2\n" " interfaces: [\"{0}\",\"{1}\"]\n" " port_info:\n" " - ip: [{2}]\n" @@ -286,49 +284,68 @@ class TrafficGenerator(AbstractMeasurer): if int(ret) != 0: raise RuntimeError('TRex config generation error') - for _ in range(0, 3): - # kill TRex only if it is already running - ssh.exec_command( - "sh -c 'pgrep t-rex && sudo pkill t-rex && sleep 3'") + self._startup_trex(osi_layer) - # configure TRex - (ret, _, _) = ssh.exec_command( - "sh -c 'cd {0}/scripts/ && sudo ./trex-cfg'"\ - .format(Constants.TREX_INSTALL_DIR)) - if int(ret) != 0: - raise RuntimeError('trex-cfg failed') - - # start TRex - if osi_layer == 'L2' or osi_layer == 'L3': - (ret, _, _) = ssh.exec_command( - "sh -c 'cd {0}/scripts/ && " - "sudo nohup ./t-rex-64 -i -c 7 --iom 0 > /tmp/trex.log " - "2>&1 &' > /dev/null"\ - .format(Constants.TREX_INSTALL_DIR)) - elif osi_layer == 'L7': - (ret, _, _) = ssh.exec_command( - "sh -c 'cd {0}/scripts/ && " - "sudo nohup ./t-rex-64 --astf -i -c 7 --iom 0 > " - "/tmp/trex.log 2>&1 &' > /dev/null"\ - .format(Constants.TREX_INSTALL_DIR)) - else: - raise ValueError("Unknown Test Type") - if int(ret) != 0: - ssh.exec_command("sh -c 'cat /tmp/trex.log'") - raise RuntimeError('t-rex-64 startup failed') - - # get TRex server info - (ret, _, _) = ssh.exec_command( - "sh -c 'sleep 3; " - "{0}/resources/tools/trex/trex_server_info.py'"\ - .format(Constants.REMOTE_FW_DIR), - timeout=120) - if int(ret) == 0: - # If we get info TRex is running - return - # after max retries TRex is still not responding to API - # critical error occurred - raise RuntimeError('t-rex-64 startup failed') + def _startup_trex(self, osi_layer): + """Startup sequence for the TRex traffic generator. + + :param osi_layer: 'L2', 'L3' or 'L7' - OSI Layer testing type. + :type osi_layer: str + :raises RuntimeError: If node subtype is not a TREX or startup failed. + """ + if self._node['subtype'] != NodeSubTypeTG.TREX: + raise RuntimeError('Node subtype is not a TREX!') + + for _ in range(0, 3): + # Kill TRex only if it is already running. + cmd = "sh -c 'pgrep t-rex && pkill t-rex && sleep 3 || true'" + exec_cmd_no_error( + self._node, cmd, sudo=True, message='Kill TRex failed!') + + # Configure TRex. + ports = '' + for port in self._node['interfaces'].values(): + ports += ' {pci}'.format(pci=port.get('pci_address')) + + cmd = ("sh -c 'cd {dir}/scripts/ && " + "./dpdk_nic_bind.py -u {ports} || true'" + .format(dir=Constants.TREX_INSTALL_DIR, ports=ports)) + exec_cmd_no_error( + self._node, cmd, sudo=True, + message='Unbind PCI ports from driver failed!') + + cmd = ("sh -c 'cd {dir}/scripts/ && ./trex-cfg'" + .format(dir=Constants.TREX_INSTALL_DIR)) + exec_cmd_no_error( + self._node, cmd, sudo=True, message='Config TRex failed!') + + # Start TRex. + cmd = ("sh -c 'cd {dir}/scripts/ && " + "nohup ./t-rex-64 {mode} -i -c 7 > " + "/tmp/trex.log 2>&1 &' > /dev/null" + .format(dir=Constants.TREX_INSTALL_DIR, + mode='--astf' if osi_layer == 'L7' else '')) + try: + exec_cmd_no_error(self._node, cmd, sudo=True) + except RuntimeError: + cmd = "sh -c 'cat /tmp/trex.log'" + exec_cmd_no_error(self._node, cmd, sudo=True, + message='Get TRex logs failed!') + raise RuntimeError('Start TRex failed!') + + # Test if TRex starts successfuly. + cmd = ("sh -c '{dir}/resources/tools/trex/trex_server_info.py'" + .format(dir=Constants.REMOTE_FW_DIR)) + try: + exec_cmd_no_error( + self._node, cmd, sudo=True, message='Test TRex failed!', + retries=20) + except RuntimeError: + continue + return + # After max retries TRex is still not responding to API critical error + # occurred. + raise RuntimeError('Start TRex failed after multiple retries!') @staticmethod def is_trex_running(node): diff --git a/resources/tools/presentation/conf.py b/resources/tools/presentation/conf.py index 342abcdef2..4026ac6b19 100644 --- a/resources/tools/presentation/conf.py +++ b/resources/tools/presentation/conf.py @@ -119,7 +119,7 @@ rst_epilog = """ vpp_prev_release='19.01', dpdkrelease='19.02', sdpdkrelease='1902', - trex_version='v2.35', + trex_version='v2.54', csit_ubuntu_ver='csit-ubuntu-16.04.1_2019-03-27_2.4', csit_centos_ver='csit-centos-7.6-1810_2019-04-15_2.4', vpp_release_commit_id='3d18a191aaf31ef8b1524ab80fed22a304adf75d') diff --git a/resources/tools/trex/trex_server_info.py b/resources/tools/trex/trex_server_info.py index e9de6f9413..da49bfc742 100755 --- a/resources/tools/trex/trex_server_info.py +++ b/resources/tools/trex/trex_server_info.py @@ -1,6 +1,6 @@ #!/usr/bin/python -# Copyright (c) 2016 Cisco and/or its affiliates. +# Copyright (c) 2019 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: @@ -17,8 +17,8 @@ Requirements: - T-REX: https://github.com/cisco-system-traffic-generator/trex-core - - compiled and running T-REX process (eg. ./t-rex-64 -i -c 4) - - trex_stl_lib.api library + - compiled and running T-REX process (eg. ./t-rex-64 -i) + - trex.stl.api library - Script must be executed on a node with T-REX instance Functionality: @@ -28,17 +28,15 @@ Functionality: import sys -sys.path.insert(0, "/opt/trex-core-2.35/scripts/automation/"+\ - "trex_control_plane/stl/") -from trex_stl_lib.api import * - +sys.path.insert(0, "/opt/trex-core-2.54/scripts/automation/"+\ + "trex_control_plane/interactive/") +from trex.stl.api import * def get_server_system_info(): """Check server info and quit. :return: nothing """ - # create client client = STLClient() @@ -46,30 +44,16 @@ def get_server_system_info(): # connect to server client.connect() # get server info - print client.get_server_system_info() - + print(client.get_server_system_info()) except STLError as ex_error: - print_error(str(ex_error)) + sys.stderr.write(str(ex_error)) sys.exit(1) - finally: client.disconnect() -def print_error(msg): - """Print error message on stderr. - - :param msg: Error message to print. - :type msg: string - :return: nothing - """ - - sys.stderr.write(msg+'\n') - - def main(): """Main function.""" - get_server_system_info() diff --git a/resources/tools/trex/trex_stateless_profile.py b/resources/tools/trex/trex_stateless_profile.py index aa68a014b8..4b2d7701ce 100755 --- a/resources/tools/trex/trex_stateless_profile.py +++ b/resources/tools/trex/trex_stateless_profile.py @@ -22,10 +22,9 @@ import sys import argparse import json -sys.path.insert(0, "/opt/trex-core-2.35/scripts/automation/" - "trex_control_plane/stl/") - -from trex_stl_lib.api import * +sys.path.insert(0, "/opt/trex-core-2.54/scripts/automation/" + "trex_control_plane/interactive/") +from trex.stl.api import * def fmt_latency(lat_min, lat_avg, lat_max): @@ -118,7 +117,7 @@ def simple_burst(profile_file, duration, framesize, rate, warmup_time, port_0, try: # Create the client: - client = STLClient(verbose_level=LoggerApi.VERBOSE_QUIET) + client = STLClient() # Connect to server: client.connect() # Prepare our ports (the machine has 0 <--> 1 with static route): diff --git a/resources/tools/trex/trex_stateless_stop.py b/resources/tools/trex/trex_stateless_stop.py index 778bd05e01..37988e72f4 100755 --- a/resources/tools/trex/trex_stateless_stop.py +++ b/resources/tools/trex/trex_stateless_stop.py @@ -1,6 +1,6 @@ #!/usr/bin/python -# Copyright (c) 2016 Cisco and/or its affiliates. +# Copyright (c) 2019 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: @@ -17,21 +17,20 @@ Requirements: - T-REX: https://github.com/cisco-system-traffic-generator/trex-core - - compiled and running T-REX process (eg. ./t-rex-64 -i -c 4) - - trex_stl_lib.api library + - compiled and running T-REX process (eg. ./t-rex-64 -i) + - trex.stl.api library - Script must be executed on a node with T-REX instance Functionality: 1. Stop any running traffic - """ import sys import json -sys.path.insert(0, "/opt/trex-core-2.35/scripts/automation/"+\ - "trex_control_plane/stl/") -from trex_stl_lib.api import * +sys.path.insert(0, "/opt/trex-core-2.54/scripts/automation/"+\ + "trex_control_plane/interactive/") +from trex.stl.api import * def stop_all_traffic_streams(): @@ -39,9 +38,8 @@ def stop_all_traffic_streams(): :return: nothing """ - # create client - client = STLClient(verbose_level=LoggerApi.VERBOSE_QUIET) + client = STLClient() try: # connect to server @@ -62,29 +60,15 @@ def stop_all_traffic_streams(): print("\npackets lost from 0 --> 1: {0} pkts".format(lost_a)) print("packets lost from 1 --> 0: {0} pkts".format(lost_b)) - except STLError as ex_error: - print_error(str(ex_error)) + sys.stderr.write(str(ex_error)) sys.exit(1) - finally: client.disconnect() -def print_error(msg): - """Print error message on stderr. - - :param msg: Error message to print. - :type msg: string - :return: nothing - """ - - sys.stderr.write(msg+'\n') - - def main(): """Main function.""" - stop_all_traffic_streams() diff --git a/resources/traffic_profiles/trex/profile_trex_stateless_base_class.py b/resources/traffic_profiles/trex/profile_trex_stateless_base_class.py index 913c3e19cf..1decc40c82 100755 --- a/resources/traffic_profiles/trex/profile_trex_stateless_base_class.py +++ b/resources/traffic_profiles/trex/profile_trex_stateless_base_class.py @@ -1,4 +1,4 @@ -# Copyright (c) 2017 Cisco and/or its affiliates. +# Copyright (c) 2019 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: @@ -21,7 +21,7 @@ import struct from random import choice from string import letters -from trex_stl_lib.api import * +from trex.stl.api import * class TrafficStreamsBaseClass(object): diff --git a/resources/traffic_profiles/trex/trex-sf-2n-ethip4tcphttp-1u1s-nginx-cps.py b/resources/traffic_profiles/trex/trex-sf-2n-ethip4tcphttp-1u1s-nginx-cps.py deleted file mode 100644 index 4e838e0088..0000000000 --- a/resources/traffic_profiles/trex/trex-sf-2n-ethip4tcphttp-1u1s-nginx-cps.py +++ /dev/null @@ -1,109 +0,0 @@ -# Copyright (c) 2018 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: -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -"""ASTF profile for TRex traffic generator. - -ASTF profile: - - Client side traffic in directions 0 --> 1. - - Server side traffic disabled. - - Packet: ETH / IP / TCP / HTTP1.1 - - Direction 0 --> 1: - - Source IP address range: 172.16.130.2 - 172.16.130.2 - - Destination IP address range: 192.168.0.1 -""" - -from trex_astf_lib.api import * - - -class Prof1(): - def __init__(self): - """Initialization and setting of streams' parameters.""" - - # Response content length. - self.content_len = 0 - # Number of requests per HTTP transaction. - self.requests = 1 - # Number of transactions per HTTP connection. - self.transaction_per_conn = 1 - # Use TCP RST instead of FIN+ACK. - self.tcp_reset = False - - # IP used in packet headers. - self.p1_src_start_ip = '172.16.130.2' - self.p1_src_end_ip = '172.16.130.2' - self.p1_dst_start_ip = '192.168.0.1' - self.p1_dst_end_ip = '192.168.0.1' - - self.http_req = (b'GET /0KB.bin HTTP/1.1\r\n' - 'Host: {host}\r\n' - 'User-Agent: trex/astf\r\n' - 'Accept: */*\r\n' - 'Connection: keep-alive\r\n\r\n' - .format(host=self.p1_dst_start_ip)) - self.http_res = (b'HTTP/1.1 200 OK\r\n' - 'Server: nginx/1.13.7\r\n' - 'Date: Mon, 01 Jan 2018 00:00:00 GMT\r\n' - 'Content-Type: application/octet-stream\r\n' - 'Content-Length: {length}\r\n' - 'Last-Modified: Mon, 01 Jan 2018 00:00:00 GMT\r\n' - 'Connection: keep-alive\r\n' - 'ETag: "5a027c14-0"\r\n' - 'Accept-Ranges: bytes\r\n\r\n' - .format(length=self.content_len)) - - def create_profile(self): - # client operations - prog_c = ASTFProgram() - prog_c.connect() - for i in range(self.transaction_per_conn): - prog_c.send(self.http_req * self.requests) - prog_c.recv((len(self.http_res) + self.content_len) * self.requests) - if self.tcp_reset: - prog_c.reset() - - # ip generator - ip_gen_c = ASTFIPGenDist(ip_range=[self.p1_src_start_ip, - self.p1_src_end_ip], - distribution="seq") - ip_gen_s = ASTFIPGenDist(ip_range=[self.p1_dst_start_ip, - self.p1_dst_end_ip], - distribution="seq") - ip_gen = ASTFIPGen(glob=ASTFIPGenGlobal(ip_offset="0.0.0.1"), - dist_client=ip_gen_c, - dist_server=ip_gen_s) - - # TCP parameters - tcp_params = ASTFTCPInfo(window=32768) - # client tunables - c_glob_info = ASTFGlobalInfo() - - # template - client_template = ASTFTCPClientTemplate(program=prog_c, - tcp_info=tcp_params, - ip_gen=ip_gen) - server_template = ASTFTCPServerTemplate(program=ASTFProgram(), - tcp_info=tcp_params) - template = ASTFTemplate(client_template=client_template, - server_template=server_template) - - # profile - return ASTFProfile(default_ip_gen=ip_gen, templates=template, - default_c_glob_info=c_glob_info) - - def get_profile(self): - return self.create_profile() - - -def register(): - return Prof1() - diff --git a/resources/traffic_profiles/trex/trex-sf-2n-ethip4tcphttp-1u1s-vpp-cps.py b/resources/traffic_profiles/trex/trex-sf-2n-ethip4tcphttp-1u1s-vpp-cps.py deleted file mode 100644 index 0533978830..0000000000 --- a/resources/traffic_profiles/trex/trex-sf-2n-ethip4tcphttp-1u1s-vpp-cps.py +++ /dev/null @@ -1,105 +0,0 @@ -# Copyright (c) 2018 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: -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -"""ASTF profile for TRex traffic generator. - -ASTF profile: - - Client side traffic in directions 0 --> 1. - - Server side traffic disabled. - - Packet: ETH / IP / TCP / HTTP1.1 - - Direction 0 --> 1: - - Source IP address range: 172.16.130.2 - 172.16.130.2 - - Destination IP address range: 192.168.0.1 -""" - -from trex_astf_lib.api import * - - -class Prof1(): - def __init__(self): - """Initialization and setting of streams' parameters.""" - - # Response content length. - self.content_len = 115 - # Number of requests per HTTP transaction. - self.requests = 1 - # Number of transactions per HTTP connection. - self.transaction_per_conn = 1 - # Use TCP RST instead of FIN+ACK. - self.tcp_reset = False - - # IP used in packet headers. - self.p1_src_start_ip = '172.16.130.2' - self.p1_src_end_ip = '172.16.130.2' - self.p1_dst_start_ip = '172.16.130.1' - self.p1_dst_end_ip = '172.16.130.1' - - self.http_req = (b'GET / HTTP/1.1\r\n' - 'Host: {host}\r\n' - 'User-Agent: trex/astf\r\n' - 'Accept: */*\r\n\r\n' - .format(host=self.p1_dst_start_ip)) - self.http_res = (b'HTTP/1.1 200 OK\r\n' - 'Content-Type: text/html\r\n' - 'Expires: Mon, 11 Jan 1970 10:10:10 GMT\r\n' - 'Connection: close\r\n' - 'Pragma: no-cache\r\n' - 'Content-Length: {length}\r\n\r\n' - .format(length=self.content_len)) - - def create_profile(self): - # client operations - prog_c = ASTFProgram() - prog_c.connect() - for i in range(self.transaction_per_conn): - prog_c.send(self.http_req * self.requests) - prog_c.recv((len(self.http_res) + self.content_len) * self.requests) - if self.tcp_reset: - prog_c.reset() - - # ip generator - ip_gen_c = ASTFIPGenDist(ip_range=[self.p1_src_start_ip, - self.p1_src_end_ip], - distribution="seq") - ip_gen_s = ASTFIPGenDist(ip_range=[self.p1_dst_start_ip, - self.p1_dst_end_ip], - distribution="seq") - ip_gen = ASTFIPGen(glob=ASTFIPGenGlobal(ip_offset="0.0.0.1"), - dist_client=ip_gen_c, - dist_server=ip_gen_s) - - # TCP parameters - tcp_params = ASTFTCPInfo(window=32768) - # client tunables - c_glob_info = ASTFGlobalInfo() - - # template - client_template = ASTFTCPClientTemplate(program=prog_c, - tcp_info=tcp_params, - ip_gen=ip_gen) - server_template = ASTFTCPServerTemplate(program=ASTFProgram(), - tcp_info=tcp_params) - template = ASTFTemplate(client_template=client_template, - server_template=server_template) - - # profile - return ASTFProfile(default_ip_gen=ip_gen, templates=template, - default_c_glob_info=c_glob_info) - - def get_profile(self): - return self.create_profile() - - -def register(): - return Prof1() - diff --git a/resources/traffic_profiles/trex/trex-sl-2n-dot1qip4asym-ip4src254.py b/resources/traffic_profiles/trex/trex-sl-2n-dot1qip4asym-ip4src254.py index 74d409bdc8..676236b196 100755 --- a/resources/traffic_profiles/trex/trex-sl-2n-dot1qip4asym-ip4src254.py +++ b/resources/traffic_profiles/trex/trex-sl-2n-dot1qip4asym-ip4src254.py @@ -1,4 +1,4 @@ -# Copyright (c) 2018 Cisco and/or its affiliates. +# Copyright (c) 2019 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: @@ -25,7 +25,7 @@ Stream profile: - Destination IP address range: 10.10.10.1 """ -from trex_stl_lib.api import * +from trex.stl.api import * from profile_trex_stateless_base_class import TrafficStreamsBaseClass diff --git a/resources/traffic_profiles/trex/trex-sl-2n-dot1qip6asym-ip6src253.py b/resources/traffic_profiles/trex/trex-sl-2n-dot1qip6asym-ip6src253.py index 573547fe86..acf6bccc16 100755 --- a/resources/traffic_profiles/trex/trex-sl-2n-dot1qip6asym-ip6src253.py +++ b/resources/traffic_profiles/trex/trex-sl-2n-dot1qip6asym-ip6src253.py @@ -1,4 +1,4 @@ -# Copyright (c) 2018 Cisco and/or its affiliates. +# Copyright (c) 2019 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: @@ -25,7 +25,7 @@ Stream profile: - Destination IP address range: 2001:1::2 """ -from trex_stl_lib.api import * +from trex.stl.api import * from profile_trex_stateless_base_class import TrafficStreamsBaseClass diff --git a/resources/traffic_profiles/trex/trex-sl-2n-ethip4-ip4dst10000.py b/resources/traffic_profiles/trex/trex-sl-2n-ethip4-ip4dst10000.py index c562a8e176..e324aa7c2e 100755 --- a/resources/traffic_profiles/trex/trex-sl-2n-ethip4-ip4dst10000.py +++ b/resources/traffic_profiles/trex/trex-sl-2n-ethip4-ip4dst10000.py @@ -1,4 +1,4 @@ -# Copyright (c) 2017 Cisco and/or its affiliates. +# Copyright (c) 2019 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: @@ -24,7 +24,7 @@ Stream profile: - Destination IP address range: 10.0.0.0 - 10.0.39.15 """ -from trex_stl_lib.api import * +from trex.stl.api import * from profile_trex_stateless_base_class import TrafficStreamsBaseClass diff --git a/resources/traffic_profiles/trex/trex-sl-2n-ethip4-ip4dst100000.py b/resources/traffic_profiles/trex/trex-sl-2n-ethip4-ip4dst100000.py index da873f8746..65b85b4fd6 100755 --- a/resources/traffic_profiles/trex/trex-sl-2n-ethip4-ip4dst100000.py +++ b/resources/traffic_profiles/trex/trex-sl-2n-ethip4-ip4dst100000.py @@ -1,4 +1,4 @@ -# Copyright (c) 2017 Cisco and/or its affiliates. +# Copyright (c) 2019 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: @@ -24,7 +24,7 @@ Stream profile: - Destination IP address range: 10.0.0.0 - 10.1.134.159 """ -from trex_stl_lib.api import * +from trex.stl.api import * from profile_trex_stateless_base_class import TrafficStreamsBaseClass diff --git a/resources/traffic_profiles/trex/trex-sl-2n-ethip4-ip4dst1000000.py b/resources/traffic_profiles/trex/trex-sl-2n-ethip4-ip4dst1000000.py index a75e17530c..84df261ddf 100755 --- a/resources/traffic_profiles/trex/trex-sl-2n-ethip4-ip4dst1000000.py +++ b/resources/traffic_profiles/trex/trex-sl-2n-ethip4-ip4dst1000000.py @@ -1,4 +1,4 @@ -# Copyright (c) 2017 Cisco and/or its affiliates. +# Copyright (c) 2019 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: @@ -24,7 +24,7 @@ Stream profile: - Destination IP address range: 10.0.0.0 - 10.15.66.63 """ -from trex_stl_lib.api import * +from trex.stl.api import * from profile_trex_stateless_base_class import TrafficStreamsBaseClass 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 ee521ddcab..685365aa1d 100755 --- a/resources/traffic_profiles/trex/trex-sl-2n-ethip4-ip4src253.py +++ b/resources/traffic_profiles/trex/trex-sl-2n-ethip4-ip4src253.py @@ -1,4 +1,4 @@ -# Copyright (c) 2017 Cisco and/or its affiliates. +# Copyright (c) 2019 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: @@ -24,7 +24,7 @@ Stream profile: - Destination IP address range: 10.10.10.2 """ -from trex_stl_lib.api import * +from trex.stl.api import * from profile_trex_stateless_base_class import TrafficStreamsBaseClass diff --git a/resources/traffic_profiles/trex/trex-sl-2n-ethip4-ip4src254.py b/resources/traffic_profiles/trex/trex-sl-2n-ethip4-ip4src254.py index 55238da044..1a0b0475e5 100755 --- a/resources/traffic_profiles/trex/trex-sl-2n-ethip4-ip4src254.py +++ b/resources/traffic_profiles/trex/trex-sl-2n-ethip4-ip4src254.py @@ -1,4 +1,4 @@ -# Copyright (c) 2017 Cisco and/or its affiliates. +# Copyright (c) 2019 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: @@ -24,7 +24,7 @@ Stream profile: - Destination IP address range: 10.10.10.1 """ -from trex_stl_lib.api import * +from trex.stl.api import * from profile_trex_stateless_base_class import TrafficStreamsBaseClass diff --git a/resources/traffic_profiles/trex/trex-sl-2n-ethip4-macsrc500kdst500k.py b/resources/traffic_profiles/trex/trex-sl-2n-ethip4-macsrc500kdst500k.py index 72d0b1351d..6dda8fe2aa 100755 --- a/resources/traffic_profiles/trex/trex-sl-2n-ethip4-macsrc500kdst500k.py +++ b/resources/traffic_profiles/trex/trex-sl-2n-ethip4-macsrc500kdst500k.py @@ -1,4 +1,4 @@ -# Copyright (c) 2017 Cisco and/or its affiliates. +# Copyright (c) 2019 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: @@ -28,7 +28,7 @@ Stream profile: - Destination IP address range: 10.0.0.0 - 10.7.161.31 """ -from trex_stl_lib.api import * +from trex.stl.api import * from profile_trex_stateless_base_class import TrafficStreamsBaseClass diff --git a/resources/traffic_profiles/trex/trex-sl-2n-ethip4-macsrc50kdst50k.py b/resources/traffic_profiles/trex/trex-sl-2n-ethip4-macsrc50kdst50k.py index f5822b4fe0..03559115d2 100755 --- a/resources/traffic_profiles/trex/trex-sl-2n-ethip4-macsrc50kdst50k.py +++ b/resources/traffic_profiles/trex/trex-sl-2n-ethip4-macsrc50kdst50k.py @@ -1,4 +1,4 @@ -# Copyright (c) 2017 Cisco and/or its affiliates. +# Copyright (c) 2019 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: @@ -28,7 +28,7 @@ Stream profile: - Destination IP address range: 10.0.0.0 - 10.0.195.79 """ -from trex_stl_lib.api import * +from trex.stl.api import * from profile_trex_stateless_base_class import TrafficStreamsBaseClass diff --git a/resources/traffic_profiles/trex/trex-sl-2n-ethip4-macsrc5kdst5k.py b/resources/traffic_profiles/trex/trex-sl-2n-ethip4-macsrc5kdst5k.py index 30a25cb1b9..0ce4ca94d1 100755 --- a/resources/traffic_profiles/trex/trex-sl-2n-ethip4-macsrc5kdst5k.py +++ b/resources/traffic_profiles/trex/trex-sl-2n-ethip4-macsrc5kdst5k.py @@ -1,4 +1,4 @@ -# Copyright (c) 2017 Cisco and/or its affiliates. +# Copyright (c) 2019 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: @@ -28,7 +28,7 @@ Stream profile: - Destination IP address range: 10.0.0.0 - 10.0.19.135 """ -from trex_stl_lib.api import * +from trex.stl.api import * from profile_trex_stateless_base_class import TrafficStreamsBaseClass diff --git a/resources/traffic_profiles/trex/trex-sl-2n-ethip4udp-10u1000p-conc.py b/resources/traffic_profiles/trex/trex-sl-2n-ethip4udp-10u1000p-conc.py index c9885daeaf..384037d860 100755 --- a/resources/traffic_profiles/trex/trex-sl-2n-ethip4udp-10u1000p-conc.py +++ b/resources/traffic_profiles/trex/trex-sl-2n-ethip4udp-10u1000p-conc.py @@ -1,4 +1,4 @@ -# Copyright (c) 2018 Cisco and/or its affiliates. +# Copyright (c) 2019 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: @@ -28,7 +28,7 @@ Stream profile: - Destination UDP port range: 1001 - 2000 """ -from trex_stl_lib.api import * +from trex.stl.api import * from profile_trex_stateless_base_class import TrafficStreamsBaseClass diff --git a/resources/traffic_profiles/trex/trex-sl-2n-ethip4udp-1u1p.py b/resources/traffic_profiles/trex/trex-sl-2n-ethip4udp-1u1p.py index 2ed84f6f41..a4d0842a50 100755 --- a/resources/traffic_profiles/trex/trex-sl-2n-ethip4udp-1u1p.py +++ b/resources/traffic_profiles/trex/trex-sl-2n-ethip4udp-1u1p.py @@ -1,4 +1,4 @@ -# Copyright (c) 2018 Cisco and/or its affiliates. +# Copyright (c) 2019 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: @@ -28,7 +28,7 @@ Stream profile: - Destination UDP port range: 1028 """ -from trex_stl_lib.api import * +from trex.stl.api import * from profile_trex_stateless_base_class import TrafficStreamsBaseClass diff --git a/resources/traffic_profiles/trex/trex-sl-2n-ethip6-ip6dst10000.py b/resources/traffic_profiles/trex/trex-sl-2n-ethip6-ip6dst10000.py index 757e90318b..085787aa6b 100755 --- a/resources/traffic_profiles/trex/trex-sl-2n-ethip6-ip6dst10000.py +++ b/resources/traffic_profiles/trex/trex-sl-2n-ethip6-ip6dst10000.py @@ -1,4 +1,4 @@ -# Copyright (c) 2017 Cisco and/or its affiliates. +# Copyright (c) 2019 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: @@ -24,7 +24,7 @@ Stream profile: - Destination IP address range: 2001:1::0 - 2001:1::270F """ -from trex_stl_lib.api import * +from trex.stl.api import * from profile_trex_stateless_base_class import TrafficStreamsBaseClass diff --git a/resources/traffic_profiles/trex/trex-sl-2n-ethip6-ip6dst100000.py b/resources/traffic_profiles/trex/trex-sl-2n-ethip6-ip6dst100000.py index fd252d4725..b32943062a 100755 --- a/resources/traffic_profiles/trex/trex-sl-2n-ethip6-ip6dst100000.py +++ b/resources/traffic_profiles/trex/trex-sl-2n-ethip6-ip6dst100000.py @@ -1,4 +1,4 @@ -# Copyright (c) 2017 Cisco and/or its affiliates. +# Copyright (c) 2019 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: @@ -24,7 +24,7 @@ Stream profile: - Destination IP address range: 2001:1::0 - 2001:1::1:869F """ -from trex_stl_lib.api import * +from trex.stl.api import * from profile_trex_stateless_base_class import TrafficStreamsBaseClass diff --git a/resources/traffic_profiles/trex/trex-sl-2n-ethip6-ip6dst1000000.py b/resources/traffic_profiles/trex/trex-sl-2n-ethip6-ip6dst1000000.py index 700dc7437d..e45d37f833 100755 --- a/resources/traffic_profiles/trex/trex-sl-2n-ethip6-ip6dst1000000.py +++ b/resources/traffic_profiles/trex/trex-sl-2n-ethip6-ip6dst1000000.py @@ -1,4 +1,4 @@ -# Copyright (c) 2017 Cisco and/or its affiliates. +# Copyright (c) 2019 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: @@ -24,7 +24,7 @@ Stream profile: - Destination IP address range: 2001:1::0 - 2001:1::F:423F """ -from trex_stl_lib.api import * +from trex.stl.api import * from profile_trex_stateless_base_class import TrafficStreamsBaseClass diff --git a/resources/traffic_profiles/trex/trex-sl-2n-ethip6-ip6src253.py b/resources/traffic_profiles/trex/trex-sl-2n-ethip6-ip6src253.py index eb306bfe69..8bce54f85b 100755 --- a/resources/traffic_profiles/trex/trex-sl-2n-ethip6-ip6src253.py +++ b/resources/traffic_profiles/trex/trex-sl-2n-ethip6-ip6src253.py @@ -1,4 +1,4 @@ -# Copyright (c) 2017 Cisco and/or its affiliates. +# Copyright (c) 2019 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: @@ -24,7 +24,7 @@ Stream profile: - Destination IP address range: 2001:1::2 """ -from trex_stl_lib.api import * +from trex.stl.api import * from profile_trex_stateless_base_class import TrafficStreamsBaseClass diff --git a/resources/traffic_profiles/trex/trex-sl-2n3n-ethip4-ip4src254-10c1n.py b/resources/traffic_profiles/trex/trex-sl-2n3n-ethip4-ip4src254-10c1n.py index 33a472c53d..4495d32b4b 100644..100755 --- a/resources/traffic_profiles/trex/trex-sl-2n3n-ethip4-ip4src254-10c1n.py +++ b/resources/traffic_profiles/trex/trex-sl-2n3n-ethip4-ip4src254-10c1n.py @@ -26,7 +26,7 @@ Stream profile: - Destination IP address range: 10.10.10.1 """ -from trex_stl_lib.api import * +from trex.stl.api import * from profile_trex_stateless_base_class import TrafficStreamsBaseClass diff --git a/resources/traffic_profiles/trex/trex-sl-2n3n-ethip4-ip4src254-10c2n.py b/resources/traffic_profiles/trex/trex-sl-2n3n-ethip4-ip4src254-10c2n.py index fb9c4fd6fb..fe5d986af9 100644..100755 --- a/resources/traffic_profiles/trex/trex-sl-2n3n-ethip4-ip4src254-10c2n.py +++ b/resources/traffic_profiles/trex/trex-sl-2n3n-ethip4-ip4src254-10c2n.py @@ -26,7 +26,7 @@ Stream profile: - Destination IP address range: 10.10.10.1 """ -from trex_stl_lib.api import * +from trex.stl.api import * from profile_trex_stateless_base_class import TrafficStreamsBaseClass diff --git a/resources/traffic_profiles/trex/trex-sl-2n3n-ethip4-ip4src254-1c10n.py b/resources/traffic_profiles/trex/trex-sl-2n3n-ethip4-ip4src254-1c10n.py index 6ced7d702e..83c2f049de 100644..100755 --- a/resources/traffic_profiles/trex/trex-sl-2n3n-ethip4-ip4src254-1c10n.py +++ b/resources/traffic_profiles/trex/trex-sl-2n3n-ethip4-ip4src254-1c10n.py @@ -26,7 +26,7 @@ Stream profile: - Destination IP address range: 10.10.10.1 """ -from trex_stl_lib.api import * +from trex.stl.api import * from profile_trex_stateless_base_class import TrafficStreamsBaseClass diff --git a/resources/traffic_profiles/trex/trex-sl-2n3n-ethip4-ip4src254-1c1n.py b/resources/traffic_profiles/trex/trex-sl-2n3n-ethip4-ip4src254-1c1n.py index 760b60e50c..2b1aa52f77 100644..100755 --- a/resources/traffic_profiles/trex/trex-sl-2n3n-ethip4-ip4src254-1c1n.py +++ b/resources/traffic_profiles/trex/trex-sl-2n3n-ethip4-ip4src254-1c1n.py @@ -28,7 +28,7 @@ Stream profile: from re import finditer -from trex_stl_lib.api import * +from trex.stl.api import * from profile_trex_stateless_base_class import TrafficStreamsBaseClass diff --git a/resources/traffic_profiles/trex/trex-sl-2n3n-ethip4-ip4src254-1c2n.py b/resources/traffic_profiles/trex/trex-sl-2n3n-ethip4-ip4src254-1c2n.py index 3de8b6c186..9fffaf2cd7 100644..100755 --- a/resources/traffic_profiles/trex/trex-sl-2n3n-ethip4-ip4src254-1c2n.py +++ b/resources/traffic_profiles/trex/trex-sl-2n3n-ethip4-ip4src254-1c2n.py @@ -26,7 +26,7 @@ Stream profile: - Destination IP address range: 10.10.10.1 """ -from trex_stl_lib.api import * +from trex.stl.api import * from profile_trex_stateless_base_class import TrafficStreamsBaseClass diff --git a/resources/traffic_profiles/trex/trex-sl-2n3n-ethip4-ip4src254-1c4n.py b/resources/traffic_profiles/trex/trex-sl-2n3n-ethip4-ip4src254-1c4n.py index 74392235a6..a256107ef0 100644..100755 --- a/resources/traffic_profiles/trex/trex-sl-2n3n-ethip4-ip4src254-1c4n.py +++ b/resources/traffic_profiles/trex/trex-sl-2n3n-ethip4-ip4src254-1c4n.py @@ -26,7 +26,7 @@ Stream profile: - Destination IP address range: 10.10.10.1 """ -from trex_stl_lib.api import * +from trex.stl.api import * from profile_trex_stateless_base_class import TrafficStreamsBaseClass diff --git a/resources/traffic_profiles/trex/trex-sl-2n3n-ethip4-ip4src254-1c6n.py b/resources/traffic_profiles/trex/trex-sl-2n3n-ethip4-ip4src254-1c6n.py index c7493eb01b..68647d4208 100644..100755 --- a/resources/traffic_profiles/trex/trex-sl-2n3n-ethip4-ip4src254-1c6n.py +++ b/resources/traffic_profiles/trex/trex-sl-2n3n-ethip4-ip4src254-1c6n.py @@ -26,7 +26,7 @@ Stream profile: - Destination IP address range: 10.10.10.1 """ -from trex_stl_lib.api import * +from trex.stl.api import * from profile_trex_stateless_base_class import TrafficStreamsBaseClass diff --git a/resources/traffic_profiles/trex/trex-sl-2n3n-ethip4-ip4src254-1c8n.py b/resources/traffic_profiles/trex/trex-sl-2n3n-ethip4-ip4src254-1c8n.py index 3c0b164f02..59b571d487 100644..100755 --- a/resources/traffic_profiles/trex/trex-sl-2n3n-ethip4-ip4src254-1c8n.py +++ b/resources/traffic_profiles/trex/trex-sl-2n3n-ethip4-ip4src254-1c8n.py @@ -26,7 +26,7 @@ Stream profile: - Destination IP address range: 10.10.10.1 """ -from trex_stl_lib.api import * +from trex.stl.api import * from profile_trex_stateless_base_class import TrafficStreamsBaseClass diff --git a/resources/traffic_profiles/trex/trex-sl-2n3n-ethip4-ip4src254-2c10n.py b/resources/traffic_profiles/trex/trex-sl-2n3n-ethip4-ip4src254-2c10n.py index f4a3400eb8..429758efa7 100644..100755 --- a/resources/traffic_profiles/trex/trex-sl-2n3n-ethip4-ip4src254-2c10n.py +++ b/resources/traffic_profiles/trex/trex-sl-2n3n-ethip4-ip4src254-2c10n.py @@ -26,7 +26,7 @@ Stream profile: - Destination IP address range: 10.10.10.1 """ -from trex_stl_lib.api import * +from trex.stl.api import * from profile_trex_stateless_base_class import TrafficStreamsBaseClass diff --git a/resources/traffic_profiles/trex/trex-sl-2n3n-ethip4-ip4src254-2c1n.py b/resources/traffic_profiles/trex/trex-sl-2n3n-ethip4-ip4src254-2c1n.py index 70c263fbda..667c970a3c 100644..100755 --- a/resources/traffic_profiles/trex/trex-sl-2n3n-ethip4-ip4src254-2c1n.py +++ b/resources/traffic_profiles/trex/trex-sl-2n3n-ethip4-ip4src254-2c1n.py @@ -26,7 +26,7 @@ Stream profile: - Destination IP address range: 10.10.10.1 """ -from trex_stl_lib.api import * +from trex.stl.api import * from profile_trex_stateless_base_class import TrafficStreamsBaseClass diff --git a/resources/traffic_profiles/trex/trex-sl-2n3n-ethip4-ip4src254-2c2n.py b/resources/traffic_profiles/trex/trex-sl-2n3n-ethip4-ip4src254-2c2n.py index 1f4a4421c0..647cbc8d1a 100644..100755 --- a/resources/traffic_profiles/trex/trex-sl-2n3n-ethip4-ip4src254-2c2n.py +++ b/resources/traffic_profiles/trex/trex-sl-2n3n-ethip4-ip4src254-2c2n.py @@ -26,7 +26,7 @@ Stream profile: - Destination IP address range: 10.10.10.1 """ -from trex_stl_lib.api import * +from trex.stl.api import * from profile_trex_stateless_base_class import TrafficStreamsBaseClass diff --git a/resources/traffic_profiles/trex/trex-sl-2n3n-ethip4-ip4src254-2c4n.py b/resources/traffic_profiles/trex/trex-sl-2n3n-ethip4-ip4src254-2c4n.py index 310834543a..a3059be7a0 100644..100755 --- a/resources/traffic_profiles/trex/trex-sl-2n3n-ethip4-ip4src254-2c4n.py +++ b/resources/traffic_profiles/trex/trex-sl-2n3n-ethip4-ip4src254-2c4n.py @@ -26,7 +26,7 @@ Stream profile: - Destination IP address range: 10.10.10.1 """ -from trex_stl_lib.api import * +from trex.stl.api import * from profile_trex_stateless_base_class import TrafficStreamsBaseClass diff --git a/resources/traffic_profiles/trex/trex-sl-2n3n-ethip4-ip4src254-2c6n.py b/resources/traffic_profiles/trex/trex-sl-2n3n-ethip4-ip4src254-2c6n.py index 3c85a6796c..5225ff312e 100644..100755 --- a/resources/traffic_profiles/trex/trex-sl-2n3n-ethip4-ip4src254-2c6n.py +++ b/resources/traffic_profiles/trex/trex-sl-2n3n-ethip4-ip4src254-2c6n.py @@ -26,7 +26,7 @@ Stream profile: - Destination IP address range: 10.10.10.1 """ -from trex_stl_lib.api import * +from trex.stl.api import * from profile_trex_stateless_base_class import TrafficStreamsBaseClass diff --git a/resources/traffic_profiles/trex/trex-sl-2n3n-ethip4-ip4src254-2c8n.py b/resources/traffic_profiles/trex/trex-sl-2n3n-ethip4-ip4src254-2c8n.py index b0e7a8e768..6b105b8605 100644..100755 --- a/resources/traffic_profiles/trex/trex-sl-2n3n-ethip4-ip4src254-2c8n.py +++ b/resources/traffic_profiles/trex/trex-sl-2n3n-ethip4-ip4src254-2c8n.py @@ -26,7 +26,7 @@ Stream profile: - Destination IP address range: 10.10.10.1 """ -from trex_stl_lib.api import * +from trex.stl.api import * from profile_trex_stateless_base_class import TrafficStreamsBaseClass diff --git a/resources/traffic_profiles/trex/trex-sl-2n3n-ethip4-ip4src254-4c1n.py b/resources/traffic_profiles/trex/trex-sl-2n3n-ethip4-ip4src254-4c1n.py index b0ccff8d49..38a9a7dc3d 100644..100755 --- a/resources/traffic_profiles/trex/trex-sl-2n3n-ethip4-ip4src254-4c1n.py +++ b/resources/traffic_profiles/trex/trex-sl-2n3n-ethip4-ip4src254-4c1n.py @@ -26,7 +26,7 @@ Stream profile: - Destination IP address range: 10.10.10.1 """ -from trex_stl_lib.api import * +from trex.stl.api import * from profile_trex_stateless_base_class import TrafficStreamsBaseClass diff --git a/resources/traffic_profiles/trex/trex-sl-2n3n-ethip4-ip4src254-4c2n.py b/resources/traffic_profiles/trex/trex-sl-2n3n-ethip4-ip4src254-4c2n.py index 249e57ce45..5fb88e3645 100644..100755 --- a/resources/traffic_profiles/trex/trex-sl-2n3n-ethip4-ip4src254-4c2n.py +++ b/resources/traffic_profiles/trex/trex-sl-2n3n-ethip4-ip4src254-4c2n.py @@ -26,7 +26,7 @@ Stream profile: - Destination IP address range: 10.10.10.1 """ -from trex_stl_lib.api import * +from trex.stl.api import * from profile_trex_stateless_base_class import TrafficStreamsBaseClass diff --git a/resources/traffic_profiles/trex/trex-sl-2n3n-ethip4-ip4src254-4c4n.py b/resources/traffic_profiles/trex/trex-sl-2n3n-ethip4-ip4src254-4c4n.py index 1f2c258627..8608f37c89 100644..100755 --- a/resources/traffic_profiles/trex/trex-sl-2n3n-ethip4-ip4src254-4c4n.py +++ b/resources/traffic_profiles/trex/trex-sl-2n3n-ethip4-ip4src254-4c4n.py @@ -26,7 +26,7 @@ Stream profile: - Destination IP address range: 10.10.10.1 """ -from trex_stl_lib.api import * +from trex.stl.api import * from profile_trex_stateless_base_class import TrafficStreamsBaseClass diff --git a/resources/traffic_profiles/trex/trex-sl-2n3n-ethip4-ip4src254-4c6n.py b/resources/traffic_profiles/trex/trex-sl-2n3n-ethip4-ip4src254-4c6n.py index 913bbd3188..088cde7724 100644..100755 --- a/resources/traffic_profiles/trex/trex-sl-2n3n-ethip4-ip4src254-4c6n.py +++ b/resources/traffic_profiles/trex/trex-sl-2n3n-ethip4-ip4src254-4c6n.py @@ -26,7 +26,7 @@ Stream profile: - Destination IP address range: 10.10.10.1 """ -from trex_stl_lib.api import * +from trex.stl.api import * from profile_trex_stateless_base_class import TrafficStreamsBaseClass diff --git a/resources/traffic_profiles/trex/trex-sl-2n3n-ethip4-ip4src254-6c1n.py b/resources/traffic_profiles/trex/trex-sl-2n3n-ethip4-ip4src254-6c1n.py index 319d4b8bc5..dab881b81f 100644..100755 --- a/resources/traffic_profiles/trex/trex-sl-2n3n-ethip4-ip4src254-6c1n.py +++ b/resources/traffic_profiles/trex/trex-sl-2n3n-ethip4-ip4src254-6c1n.py @@ -26,7 +26,7 @@ Stream profile: - Destination IP address range: 10.10.10.1 """ -from trex_stl_lib.api import * +from trex.stl.api import * from profile_trex_stateless_base_class import TrafficStreamsBaseClass diff --git a/resources/traffic_profiles/trex/trex-sl-2n3n-ethip4-ip4src254-6c2n.py b/resources/traffic_profiles/trex/trex-sl-2n3n-ethip4-ip4src254-6c2n.py index cea3f08e89..491fcdaad1 100644..100755 --- a/resources/traffic_profiles/trex/trex-sl-2n3n-ethip4-ip4src254-6c2n.py +++ b/resources/traffic_profiles/trex/trex-sl-2n3n-ethip4-ip4src254-6c2n.py @@ -26,7 +26,7 @@ Stream profile: - Destination IP address range: 10.10.10.1 """ -from trex_stl_lib.api import * +from trex.stl.api import * from profile_trex_stateless_base_class import TrafficStreamsBaseClass diff --git a/resources/traffic_profiles/trex/trex-sl-2n3n-ethip4-ip4src254-6c4n.py b/resources/traffic_profiles/trex/trex-sl-2n3n-ethip4-ip4src254-6c4n.py index f8dd4da4bc..c4602c324c 100644..100755 --- a/resources/traffic_profiles/trex/trex-sl-2n3n-ethip4-ip4src254-6c4n.py +++ b/resources/traffic_profiles/trex/trex-sl-2n3n-ethip4-ip4src254-6c4n.py @@ -26,7 +26,7 @@ Stream profile: - Destination IP address range: 10.10.10.1 """ -from trex_stl_lib.api import * +from trex.stl.api import * from profile_trex_stateless_base_class import TrafficStreamsBaseClass diff --git a/resources/traffic_profiles/trex/trex-sl-2n3n-ethip4-ip4src254-8c1n.py b/resources/traffic_profiles/trex/trex-sl-2n3n-ethip4-ip4src254-8c1n.py index 20d654df23..2ed83154b5 100644..100755 --- a/resources/traffic_profiles/trex/trex-sl-2n3n-ethip4-ip4src254-8c1n.py +++ b/resources/traffic_profiles/trex/trex-sl-2n3n-ethip4-ip4src254-8c1n.py @@ -26,7 +26,7 @@ Stream profile: - Destination IP address range: 10.10.10.1 """ -from trex_stl_lib.api import * +from trex.stl.api import * from profile_trex_stateless_base_class import TrafficStreamsBaseClass diff --git a/resources/traffic_profiles/trex/trex-sl-2n3n-ethip4-ip4src254-8c2n.py b/resources/traffic_profiles/trex/trex-sl-2n3n-ethip4-ip4src254-8c2n.py index 36d618fad6..c214fae91e 100644..100755 --- a/resources/traffic_profiles/trex/trex-sl-2n3n-ethip4-ip4src254-8c2n.py +++ b/resources/traffic_profiles/trex/trex-sl-2n3n-ethip4-ip4src254-8c2n.py @@ -26,7 +26,7 @@ Stream profile: - Destination IP address range: 10.10.10.1 """ -from trex_stl_lib.api import * +from trex.stl.api import * from profile_trex_stateless_base_class import TrafficStreamsBaseClass diff --git a/resources/traffic_profiles/trex/trex-sl-3n-dot1qip4-vlan100ip4src254ip4dst254.py b/resources/traffic_profiles/trex/trex-sl-3n-dot1qip4-vlan100ip4src254ip4dst254.py index ed37a37fa3..3c3206df8e 100755 --- a/resources/traffic_profiles/trex/trex-sl-3n-dot1qip4-vlan100ip4src254ip4dst254.py +++ b/resources/traffic_profiles/trex/trex-sl-3n-dot1qip4-vlan100ip4src254ip4dst254.py @@ -1,4 +1,4 @@ -# Copyright (c) 2018 Cisco and/or its affiliates. +# Copyright (c) 2019 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: @@ -26,7 +26,7 @@ Stream profile: - Destination IP address range: 10.0.0.1 - 10.0.0.254 """ -from trex_stl_lib.api import * +from trex.stl.api import * from profile_trex_stateless_base_class import TrafficStreamsBaseClass diff --git a/resources/traffic_profiles/trex/trex-sl-3n-dot1qip4-vlan10ip4src254ip4dst254.py b/resources/traffic_profiles/trex/trex-sl-3n-dot1qip4-vlan10ip4src254ip4dst254.py index e75ab1ca4f..b07793f89d 100755 --- a/resources/traffic_profiles/trex/trex-sl-3n-dot1qip4-vlan10ip4src254ip4dst254.py +++ b/resources/traffic_profiles/trex/trex-sl-3n-dot1qip4-vlan10ip4src254ip4dst254.py @@ -1,4 +1,4 @@ -# Copyright (c) 2018 Cisco and/or its affiliates. +# Copyright (c) 2019 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: @@ -26,7 +26,7 @@ Stream profile: - Destination IP address range: 10.0.0.1 - 10.0.0.254 """ -from trex_stl_lib.api import * +from trex.stl.api import * from profile_trex_stateless_base_class import TrafficStreamsBaseClass diff --git a/resources/traffic_profiles/trex/trex-sl-3n-dot1qip4-vlan1ip4src254ip4dst254.py b/resources/traffic_profiles/trex/trex-sl-3n-dot1qip4-vlan1ip4src254ip4dst254.py index 94931446ef..c5924b1bec 100755 --- a/resources/traffic_profiles/trex/trex-sl-3n-dot1qip4-vlan1ip4src254ip4dst254.py +++ b/resources/traffic_profiles/trex/trex-sl-3n-dot1qip4-vlan1ip4src254ip4dst254.py @@ -1,4 +1,4 @@ -# Copyright (c) 2018 Cisco and/or its affiliates. +# Copyright (c) 2019 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: @@ -26,7 +26,7 @@ Stream profile: - Destination IP address range: 10.0.0.1 - 10.0.0.254 """ -from trex_stl_lib.api import * +from trex.stl.api import * from profile_trex_stateless_base_class import TrafficStreamsBaseClass diff --git a/resources/traffic_profiles/trex/trex-sl-3n-dot1qip4-vlan1kip4src254ip4dst254.py b/resources/traffic_profiles/trex/trex-sl-3n-dot1qip4-vlan1kip4src254ip4dst254.py index 6e6337ce7c..dda21f470d 100755 --- a/resources/traffic_profiles/trex/trex-sl-3n-dot1qip4-vlan1kip4src254ip4dst254.py +++ b/resources/traffic_profiles/trex/trex-sl-3n-dot1qip4-vlan1kip4src254ip4dst254.py @@ -1,4 +1,4 @@ -# Copyright (c) 2018 Cisco and/or its affiliates. +# Copyright (c) 2019 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: @@ -26,7 +26,7 @@ Stream profile: - Destination IP address range: 10.0.0.1 - 10.0.0.254 """ -from trex_stl_lib.api import * +from trex.stl.api import * from profile_trex_stateless_base_class import TrafficStreamsBaseClass diff --git a/resources/traffic_profiles/trex/trex-sl-3n-ethip4-ip4dst1.py b/resources/traffic_profiles/trex/trex-sl-3n-ethip4-ip4dst1.py index 68b492175b..7c080813ff 100755 --- a/resources/traffic_profiles/trex/trex-sl-3n-ethip4-ip4dst1.py +++ b/resources/traffic_profiles/trex/trex-sl-3n-ethip4-ip4dst1.py @@ -1,4 +1,4 @@ -# Copyright (c) 2017 Cisco and/or its affiliates. +# Copyright (c) 2019 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: @@ -24,7 +24,7 @@ Stream profile: - Destination IP address range: 10.0.0.0 """ -from trex_stl_lib.api import * +from trex.stl.api import * from profile_trex_stateless_base_class import TrafficStreamsBaseClass 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 4ace3963c7..9ffd66fa58 100755 --- a/resources/traffic_profiles/trex/trex-sl-3n-ethip4-ip4dst100.py +++ b/resources/traffic_profiles/trex/trex-sl-3n-ethip4-ip4dst100.py @@ -1,4 +1,4 @@ -# Copyright (c) 2017 Cisco and/or its affiliates. +# Copyright (c) 2019 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: @@ -24,7 +24,7 @@ Stream profile: - Destination IP address range: 10.0.0.0 - 10.0.0.99 """ -from trex_stl_lib.api import * +from trex.stl.api import * from profile_trex_stateless_base_class import TrafficStreamsBaseClass 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 5f0d1ce418..5ee1f0cd9a 100755 --- a/resources/traffic_profiles/trex/trex-sl-3n-ethip4-ip4dst1000.py +++ b/resources/traffic_profiles/trex/trex-sl-3n-ethip4-ip4dst1000.py @@ -1,4 +1,4 @@ -# Copyright (c) 2017 Cisco and/or its affiliates. +# Copyright (c) 2019 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: @@ -24,7 +24,7 @@ Stream profile: - Destination IP address range: 10.0.0.0 - 10.0.3.231 """ -from trex_stl_lib.api import * +from trex.stl.api import * from profile_trex_stateless_base_class import TrafficStreamsBaseClass 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 c562a8e176..e324aa7c2e 100755 --- a/resources/traffic_profiles/trex/trex-sl-3n-ethip4-ip4dst10000.py +++ b/resources/traffic_profiles/trex/trex-sl-3n-ethip4-ip4dst10000.py @@ -1,4 +1,4 @@ -# Copyright (c) 2017 Cisco and/or its affiliates. +# Copyright (c) 2019 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: @@ -24,7 +24,7 @@ Stream profile: - Destination IP address range: 10.0.0.0 - 10.0.39.15 """ -from trex_stl_lib.api import * +from trex.stl.api import * from profile_trex_stateless_base_class import TrafficStreamsBaseClass 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 da873f8746..65b85b4fd6 100755 --- a/resources/traffic_profiles/trex/trex-sl-3n-ethip4-ip4dst100000.py +++ b/resources/traffic_profiles/trex/trex-sl-3n-ethip4-ip4dst100000.py @@ -1,4 +1,4 @@ -# Copyright (c) 2017 Cisco and/or its affiliates. +# Copyright (c) 2019 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: @@ -24,7 +24,7 @@ Stream profile: - Destination IP address range: 10.0.0.0 - 10.1.134.159 """ -from trex_stl_lib.api import * +from trex.stl.api import * from profile_trex_stateless_base_class import TrafficStreamsBaseClass 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 a75e17530c..84df261ddf 100755 --- a/resources/traffic_profiles/trex/trex-sl-3n-ethip4-ip4dst1000000.py +++ b/resources/traffic_profiles/trex/trex-sl-3n-ethip4-ip4dst1000000.py @@ -1,4 +1,4 @@ -# Copyright (c) 2017 Cisco and/or its affiliates. +# Copyright (c) 2019 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: @@ -24,7 +24,7 @@ Stream profile: - Destination IP address range: 10.0.0.0 - 10.15.66.63 """ -from trex_stl_lib.api import * +from trex.stl.api import * from profile_trex_stateless_base_class import TrafficStreamsBaseClass 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 adbf9fb6f3..d83f4240ad 100755 --- a/resources/traffic_profiles/trex/trex-sl-3n-ethip4-ip4dst253.py +++ b/resources/traffic_profiles/trex/trex-sl-3n-ethip4-ip4dst253.py @@ -1,4 +1,4 @@ -# Copyright (c) 2017 Cisco and/or its affiliates. +# Copyright (c) 2019 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: @@ -24,7 +24,7 @@ Stream profile: - Destination IP address range: 1.1.1.2 - 1.1.1.254 """ -from trex_stl_lib.api import * +from trex.stl.api import * from profile_trex_stateless_base_class import TrafficStreamsBaseClass 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 f8cae518c4..7ad8f03a90 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 @@ -1,4 +1,4 @@ -# Copyright (c) 2017 Cisco and/or its affiliates. +# Copyright (c) 2019 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: @@ -24,7 +24,7 @@ Stream profile: - Destination IP address range: 2.1.1.2 - 2.1.1.254 """ -from trex_stl_lib.api import * +from trex.stl.api import * from profile_trex_stateless_base_class import TrafficStreamsBaseClass 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 ee521ddcab..685365aa1d 100755 --- a/resources/traffic_profiles/trex/trex-sl-3n-ethip4-ip4src253.py +++ b/resources/traffic_profiles/trex/trex-sl-3n-ethip4-ip4src253.py @@ -1,4 +1,4 @@ -# Copyright (c) 2017 Cisco and/or its affiliates. +# Copyright (c) 2019 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: @@ -24,7 +24,7 @@ Stream profile: - Destination IP address range: 10.10.10.2 """ -from trex_stl_lib.api import * +from trex.stl.api import * from profile_trex_stateless_base_class import TrafficStreamsBaseClass 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 55238da044..1a0b0475e5 100755 --- a/resources/traffic_profiles/trex/trex-sl-3n-ethip4-ip4src254.py +++ b/resources/traffic_profiles/trex/trex-sl-3n-ethip4-ip4src254.py @@ -1,4 +1,4 @@ -# Copyright (c) 2017 Cisco and/or its affiliates. +# Copyright (c) 2019 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: @@ -24,7 +24,7 @@ Stream profile: - Destination IP address range: 10.10.10.1 """ -from trex_stl_lib.api import * +from trex.stl.api import * from profile_trex_stateless_base_class import TrafficStreamsBaseClass 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 f8bf3aec7c..8036638ed8 100755 --- a/resources/traffic_profiles/trex/trex-sl-3n-ethip4-macsrc100ip4src100.py +++ b/resources/traffic_profiles/trex/trex-sl-3n-ethip4-macsrc100ip4src100.py @@ -1,4 +1,4 @@ -# Copyright (c) 2017 Cisco and/or its affiliates. +# Copyright (c) 2019 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: @@ -26,7 +26,7 @@ Stream profile: - Destination IP address range: 10.0.0.1 """ -from trex_stl_lib.api import * +from trex.stl.api import * from profile_trex_stateless_base_class import TrafficStreamsBaseClass 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 6f97800733..681579fe34 100755 --- a/resources/traffic_profiles/trex/trex-sl-3n-ethip4-macsrc100kip4src100k.py +++ b/resources/traffic_profiles/trex/trex-sl-3n-ethip4-macsrc100kip4src100k.py @@ -1,4 +1,4 @@ -# Copyright (c) 2017 Cisco and/or its affiliates. +# Copyright (c) 2019 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: @@ -26,7 +26,7 @@ Stream profile: - Destination IP address range: 10.0.0.1 """ -from trex_stl_lib.api import * +from trex.stl.api import * from profile_trex_stateless_base_class import TrafficStreamsBaseClass 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 d5b795d4e3..ff1c2061d4 100755 --- a/resources/traffic_profiles/trex/trex-sl-3n-ethip4-macsrc10kip4src10k.py +++ b/resources/traffic_profiles/trex/trex-sl-3n-ethip4-macsrc10kip4src10k.py @@ -1,4 +1,4 @@ -# Copyright (c) 2017 Cisco and/or its affiliates. +# Copyright (c) 2019 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: @@ -26,7 +26,7 @@ Stream profile: - Destination IP address range: 10.0.0.1 """ -from trex_stl_lib.api import * +from trex.stl.api import * from profile_trex_stateless_base_class import TrafficStreamsBaseClass 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 1bc27249b4..6dda8fe2aa 100755 --- a/resources/traffic_profiles/trex/trex-sl-3n-ethip4-macsrc500kdst500k.py +++ b/resources/traffic_profiles/trex/trex-sl-3n-ethip4-macsrc500kdst500k.py @@ -1,4 +1,4 @@ -# Copyright (c) 2018 Cisco and/or its affiliates. +# Copyright (c) 2019 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: @@ -28,7 +28,7 @@ Stream profile: - Destination IP address range: 10.0.0.0 - 10.7.161.31 """ -from trex_stl_lib.api import * +from trex.stl.api import * from profile_trex_stateless_base_class import TrafficStreamsBaseClass 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 bf2c589344..03559115d2 100755 --- a/resources/traffic_profiles/trex/trex-sl-3n-ethip4-macsrc50kdst50k.py +++ b/resources/traffic_profiles/trex/trex-sl-3n-ethip4-macsrc50kdst50k.py @@ -1,4 +1,4 @@ -# Copyright (c) 2018 Cisco and/or its affiliates. +# Copyright (c) 2019 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: @@ -28,7 +28,7 @@ Stream profile: - Destination IP address range: 10.0.0.0 - 10.0.195.79 """ -from trex_stl_lib.api import * +from trex.stl.api import * from profile_trex_stateless_base_class import TrafficStreamsBaseClass 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 0c4e83f5f8..0ce4ca94d1 100755 --- a/resources/traffic_profiles/trex/trex-sl-3n-ethip4-macsrc5kdst5k.py +++ b/resources/traffic_profiles/trex/trex-sl-3n-ethip4-macsrc5kdst5k.py @@ -1,4 +1,4 @@ -# Copyright (c) 2018 Cisco and/or its affiliates. +# Copyright (c) 2019 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: @@ -28,7 +28,7 @@ Stream profile: - Destination IP address range: 10.0.0.0 - 10.0.19.135 """ -from trex_stl_lib.api import * +from trex.stl.api import * from profile_trex_stateless_base_class import TrafficStreamsBaseClass diff --git a/resources/traffic_profiles/trex/trex-sl-3n-ethip4udp-1000u15p.py b/resources/traffic_profiles/trex/trex-sl-3n-ethip4udp-1000u15p.py index c9f6a27b89..2ad2eea734 100755 --- a/resources/traffic_profiles/trex/trex-sl-3n-ethip4udp-1000u15p.py +++ b/resources/traffic_profiles/trex/trex-sl-3n-ethip4udp-1000u15p.py @@ -1,4 +1,4 @@ -# Copyright (c) 2017 Cisco and/or its affiliates. +# Copyright (c) 2019 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: @@ -28,7 +28,7 @@ Stream profile: - Destination UDP port range: 1024 - 16023 """ -from trex_stl_lib.api import * +from trex.stl.api import * from profile_trex_stateless_base_class import TrafficStreamsBaseClass diff --git a/resources/traffic_profiles/trex/trex-sl-3n-ethip4udp-100u1000p-conc.py b/resources/traffic_profiles/trex/trex-sl-3n-ethip4udp-100u1000p-conc.py index 0f7d7e9a39..acc1b31980 100755 --- a/resources/traffic_profiles/trex/trex-sl-3n-ethip4udp-100u1000p-conc.py +++ b/resources/traffic_profiles/trex/trex-sl-3n-ethip4udp-100u1000p-conc.py @@ -1,4 +1,4 @@ -# Copyright (c) 2017 Cisco and/or its affiliates. +# Copyright (c) 2019 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: @@ -28,7 +28,7 @@ Stream profile: - Destination UDP port range: 1001 - 2000 """ -from trex_stl_lib.api import * +from trex.stl.api import * from profile_trex_stateless_base_class import TrafficStreamsBaseClass diff --git a/resources/traffic_profiles/trex/trex-sl-3n-ethip4udp-100u15p.py b/resources/traffic_profiles/trex/trex-sl-3n-ethip4udp-100u15p.py index 87a5d3067d..d1d4016e62 100755 --- a/resources/traffic_profiles/trex/trex-sl-3n-ethip4udp-100u15p.py +++ b/resources/traffic_profiles/trex/trex-sl-3n-ethip4udp-100u15p.py @@ -1,4 +1,4 @@ -# Copyright (c) 2017 Cisco and/or its affiliates. +# Copyright (c) 2019 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: @@ -28,7 +28,7 @@ Stream profile: - Destination UDP port range: 1024 - 2523 """ -from trex_stl_lib.api import * +from trex.stl.api import * from profile_trex_stateless_base_class import TrafficStreamsBaseClass diff --git a/resources/traffic_profiles/trex/trex-sl-3n-ethip4udp-10u1000p-conc.py b/resources/traffic_profiles/trex/trex-sl-3n-ethip4udp-10u1000p-conc.py index f76fadc71f..384037d860 100755 --- a/resources/traffic_profiles/trex/trex-sl-3n-ethip4udp-10u1000p-conc.py +++ b/resources/traffic_profiles/trex/trex-sl-3n-ethip4udp-10u1000p-conc.py @@ -1,4 +1,4 @@ -# Copyright (c) 2017 Cisco and/or its affiliates. +# Copyright (c) 2019 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: @@ -28,7 +28,7 @@ Stream profile: - Destination UDP port range: 1001 - 2000 """ -from trex_stl_lib.api import * +from trex.stl.api import * from profile_trex_stateless_base_class import TrafficStreamsBaseClass diff --git a/resources/traffic_profiles/trex/trex-sl-3n-ethip4udp-10u10p-conc.py b/resources/traffic_profiles/trex/trex-sl-3n-ethip4udp-10u10p-conc.py index a0615273e3..e6d095066b 100755 --- a/resources/traffic_profiles/trex/trex-sl-3n-ethip4udp-10u10p-conc.py +++ b/resources/traffic_profiles/trex/trex-sl-3n-ethip4udp-10u10p-conc.py @@ -1,4 +1,4 @@ -# Copyright (c) 2017 Cisco and/or its affiliates. +# Copyright (c) 2019 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: @@ -28,7 +28,7 @@ Stream profile: - Destination UDP port range: 1001 - 1010 """ -from trex_stl_lib.api import * +from trex.stl.api import * from profile_trex_stateless_base_class import TrafficStreamsBaseClass diff --git a/resources/traffic_profiles/trex/trex-sl-3n-ethip4udp-10u15p.py b/resources/traffic_profiles/trex/trex-sl-3n-ethip4udp-10u15p.py index 74f2f0d1e5..346a9a50de 100755 --- a/resources/traffic_profiles/trex/trex-sl-3n-ethip4udp-10u15p.py +++ b/resources/traffic_profiles/trex/trex-sl-3n-ethip4udp-10u15p.py @@ -1,4 +1,4 @@ -# Copyright (c) 2017 Cisco and/or its affiliates. +# Copyright (c) 201 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: @@ -28,7 +28,7 @@ Stream profile: - Destination UDP port range: 1024 - 1173 """ -from trex_stl_lib.api import * +from trex.stl.api import * from profile_trex_stateless_base_class import TrafficStreamsBaseClass diff --git a/resources/traffic_profiles/trex/trex-sl-3n-ethip4udp-1u15p.py b/resources/traffic_profiles/trex/trex-sl-3n-ethip4udp-1u15p.py index 220ec05e31..19cb9e672d 100755 --- a/resources/traffic_profiles/trex/trex-sl-3n-ethip4udp-1u15p.py +++ b/resources/traffic_profiles/trex/trex-sl-3n-ethip4udp-1u15p.py @@ -1,4 +1,4 @@ -# Copyright (c) 2017 Cisco and/or its affiliates. +# Copyright (c) 2019 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: @@ -28,7 +28,7 @@ Stream profile: - Destination UDP port range: 1024 - 1038 """ -from trex_stl_lib.api import * +from trex.stl.api import * from profile_trex_stateless_base_class import TrafficStreamsBaseClass diff --git a/resources/traffic_profiles/trex/trex-sl-3n-ethip4udp-1u1p.py b/resources/traffic_profiles/trex/trex-sl-3n-ethip4udp-1u1p.py index 939e4ce42c..a4d0842a50 100755 --- a/resources/traffic_profiles/trex/trex-sl-3n-ethip4udp-1u1p.py +++ b/resources/traffic_profiles/trex/trex-sl-3n-ethip4udp-1u1p.py @@ -1,4 +1,4 @@ -# Copyright (c) 2017 Cisco and/or its affiliates. +# Copyright (c) 2019 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: @@ -28,7 +28,7 @@ Stream profile: - Destination UDP port range: 1028 """ -from trex_stl_lib.api import * +from trex.stl.api import * from profile_trex_stateless_base_class import TrafficStreamsBaseClass diff --git a/resources/traffic_profiles/trex/trex-sl-3n-ethip4udp-2000u15p.py b/resources/traffic_profiles/trex/trex-sl-3n-ethip4udp-2000u15p.py index 7d5651812e..45919a656a 100755 --- a/resources/traffic_profiles/trex/trex-sl-3n-ethip4udp-2000u15p.py +++ b/resources/traffic_profiles/trex/trex-sl-3n-ethip4udp-2000u15p.py @@ -1,4 +1,4 @@ -# Copyright (c) 2017 Cisco and/or its affiliates. +# Copyright (c) 2019 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: @@ -28,7 +28,7 @@ Stream profile: - Destination UDP port range: 1024 - 31022 """ -from trex_stl_lib.api import * +from trex.stl.api import * from profile_trex_stateless_base_class import TrafficStreamsBaseClass diff --git a/resources/traffic_profiles/trex/trex-sl-3n-ethip4udp-4000u15p.py b/resources/traffic_profiles/trex/trex-sl-3n-ethip4udp-4000u15p.py index dab23b8627..626acd6e89 100755 --- a/resources/traffic_profiles/trex/trex-sl-3n-ethip4udp-4000u15p.py +++ b/resources/traffic_profiles/trex/trex-sl-3n-ethip4udp-4000u15p.py @@ -1,4 +1,4 @@ -# Copyright (c) 2017 Cisco and/or its affiliates. +# Copyright (c) 2019 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: @@ -28,7 +28,7 @@ Stream profile: - Destination UDP port range: 1024 - 61022 """ -from trex_stl_lib.api import * +from trex.stl.api import * from profile_trex_stateless_base_class import TrafficStreamsBaseClass 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 757e90318b..085787aa6b 100755 --- a/resources/traffic_profiles/trex/trex-sl-3n-ethip6-ip6dst10000.py +++ b/resources/traffic_profiles/trex/trex-sl-3n-ethip6-ip6dst10000.py @@ -1,4 +1,4 @@ -# Copyright (c) 2017 Cisco and/or its affiliates. +# Copyright (c) 2019 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: @@ -24,7 +24,7 @@ Stream profile: - Destination IP address range: 2001:1::0 - 2001:1::270F """ -from trex_stl_lib.api import * +from trex.stl.api import * from profile_trex_stateless_base_class import TrafficStreamsBaseClass 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 fd252d4725..b32943062a 100755 --- a/resources/traffic_profiles/trex/trex-sl-3n-ethip6-ip6dst100000.py +++ b/resources/traffic_profiles/trex/trex-sl-3n-ethip6-ip6dst100000.py @@ -1,4 +1,4 @@ -# Copyright (c) 2017 Cisco and/or its affiliates. +# Copyright (c) 2019 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: @@ -24,7 +24,7 @@ Stream profile: - Destination IP address range: 2001:1::0 - 2001:1::1:869F """ -from trex_stl_lib.api import * +from trex.stl.api import * from profile_trex_stateless_base_class import TrafficStreamsBaseClass 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 700dc7437d..e45d37f833 100755 --- a/resources/traffic_profiles/trex/trex-sl-3n-ethip6-ip6dst1000000.py +++ b/resources/traffic_profiles/trex/trex-sl-3n-ethip6-ip6dst1000000.py @@ -1,4 +1,4 @@ -# Copyright (c) 2017 Cisco and/or its affiliates. +# Copyright (c) 2019 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: @@ -24,7 +24,7 @@ Stream profile: - Destination IP address range: 2001:1::0 - 2001:1::F:423F """ -from trex_stl_lib.api import * +from trex.stl.api import * from profile_trex_stateless_base_class import TrafficStreamsBaseClass 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 eb306bfe69..8bce54f85b 100755 --- a/resources/traffic_profiles/trex/trex-sl-3n-ethip6-ip6src253.py +++ b/resources/traffic_profiles/trex/trex-sl-3n-ethip6-ip6src253.py @@ -1,4 +1,4 @@ -# Copyright (c) 2017 Cisco and/or its affiliates. +# Copyright (c) 2019 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: @@ -24,7 +24,7 @@ Stream profile: - Destination IP address range: 2001:1::2 """ -from trex_stl_lib.api import * +from trex.stl.api import * from profile_trex_stateless_base_class import TrafficStreamsBaseClass diff --git a/resources/traffic_profiles/trex/trex-sl-ethip4-vxlansrc253.py b/resources/traffic_profiles/trex/trex-sl-ethip4-vxlansrc253.py index 1018c13c53..69de6e9335 100644..100755 --- a/resources/traffic_profiles/trex/trex-sl-ethip4-vxlansrc253.py +++ b/resources/traffic_profiles/trex/trex-sl-ethip4-vxlansrc253.py @@ -1,4 +1,4 @@ -# Copyright (c) 2018 Cisco and/or its affiliates. +# Copyright (c) 2019 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: @@ -35,7 +35,7 @@ Stream profile: """ -from trex_stl_lib.api import * +from trex.stl.api import * from profile_trex_stateless_base_class import TrafficStreamsBaseClass # RFC 7348 - Virtual eXtensible Local Area Network (VXLAN): |