diff options
5 files changed, 15 insertions, 81 deletions
diff --git a/resources/libraries/python/TrafficGenerator.py b/resources/libraries/python/TrafficGenerator.py index f0e2a17ec0..8976dff348 100644 --- a/resources/libraries/python/TrafficGenerator.py +++ b/resources/libraries/python/TrafficGenerator.py @@ -351,6 +351,7 @@ class TrafficGenerator(AbstractMeasurer): trex_cmd.add(f"-c {Constants.TREX_CORE_COUNT}") trex_cmd.add(u"--prefix $(hostname)") trex_cmd.add(u"--hdrh") + trex_cmd.add(u"--no-scapy-server") trex_cmd.add_if(u"--astf", osi_layer == u"L7") # OptionString does not create double space if extra is empty. trex_cmd.add(f"{Constants.TREX_EXTRA_CMDLINE}") diff --git a/resources/libraries/python/VppConfigGenerator.py b/resources/libraries/python/VppConfigGenerator.py index cd225db896..3318f57d63 100644 --- a/resources/libraries/python/VppConfigGenerator.py +++ b/resources/libraries/python/VppConfigGenerator.py @@ -241,6 +241,15 @@ class VppConfigGenerator: path = [u"buffers", u"buffers-per-numa"] self.add_config_item(self._nodeconfig, value, path) + def add_buffers_default_data_size(self, value): + """Increase buffers data-size allocated. + + :param value: Buffers data-size allocated. + :type value: int + """ + path = [u"buffers", u"default data-size"] + self.add_config_item(self._nodeconfig, value, path) + def add_dpdk_dev(self, *devices): """Add DPDK PCI device configuration. diff --git a/resources/libraries/robot/shared/default.robot b/resources/libraries/robot/shared/default.robot index 160ebc887b..04238d7451 100644 --- a/resources/libraries/robot/shared/default.robot +++ b/resources/libraries/robot/shared/default.robot @@ -225,6 +225,10 @@ | | | Run keyword if | ${smt_used} | | | ... | Run keyword | ${dut}.Add Buffers Per Numa | ${215040} | ELSE | | | ... | Run keyword | ${dut}.Add Buffers Per Numa | ${107520} +| | | ${ipsec} | Get Match Count | ${TEST TAGS} | IPSEC +| | | ... | case_insensitive=True +| | | Run keyword if | ${ipsec} and ${jumbo} +| | | ... | ${dut}.Add Buffers Default Data Size | 9200 | | | Run keyword if | ${thr_count_int} > 1 | | | ... | Set Tags | MTHREAD | ELSE | Set Tags | STHREAD | | | Set Tags | ${thr_count_int}T${cpu_count_int}C diff --git a/resources/libraries/robot/tldk/tldk_utils.robot b/resources/libraries/robot/tldk/tldk_utils.robot deleted file mode 100644 index 75e982252c..0000000000 --- a/resources/libraries/robot/tldk/tldk_utils.robot +++ /dev/null @@ -1,80 +0,0 @@ -# Copyright (c) 2017 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. - -*** Settings *** -| Library | resources.libraries.python.NodePath -| Documentation | *Utilities for the path computing, pcap reading* -| ... -| ... | Utilities for the path computing, pcap file reading and also the port -| ... | selection. - -*** Keywords *** -| Path for 2-node testing is set -| | [Documentation] | Compute the path for the 2 node testing. -| | ... -| | ... | *Arguments:* -| | ... | - tg_node - TG node. Type: dictionary -| | ... | - dut_node - DUT node. Type: dictionary -| | ... -| | ... | *Return:* -| | ... | - No value returned. -| | ... -| | ... | *Example:* -| | ... -| | ... | \| Path for 2-node testing is set \| ${nodes['TG']} \ -| | ... | \| ${nodes['DUT1'] \| -| | ... -| | [Arguments] | ${tg_node} | ${dut_node} -| | Append Nodes | ${tg_node} | ${dut_node} -| | Compute Path - -| Pick out the port used to execute test -| | [Documentation] | Pick out the port used to execute the test. -| | ... -| | ... | *Arguments:* -| | ... | - No arguments. -| | ... -| | ... | *Return:* -| | ... | - No value returned. -| | ... -| | ... | *Example:* -| | ... -| | ... | \| Pick out the port used to execute test \| -| | ... -| | ${tg_port} | ${tg_node}= | First Interface -| | ${dut_port} | ${dut_node}= | Last Interface -| | set suite variable | ${tg_node} -| | set suite variable | ${dut_node} -| | set suite variable | ${tg_port} -| | set suite variable | ${dut_port} - -| Get the pcap data -| | [Documentation] | Get the pcap file detailed data. -| | ... -| | ... | *Arguments:* -| | ... | - file_prefix - file prefix. Type: dictionary -| | ... -| | ... | *Return:* -| | ... | - packet_num, dest_ip, is_ipv4 - a tuple of packet_num -| | ... | dest_ip, is_ipv4. Type: tuple(int, str, bool) -| | ... -| | ... | *Example:* -| | ... -| | ... | \| Get the pcap data \| ${tc01_file_prefix} \| -| | ... -| | [Arguments] | ${file_prefix} -| | ${packet_num} | ${dest_ip} | ${is_ipv4}= | Get Pcap Info -| | ... | ${file_prefix} -| | set suite variable | ${packet_num} -| | set suite variable | ${dest_ip} -| | set suite variable | ${is_ipv4} diff --git a/resources/traffic_profiles/trex/trex-sl-2n-ethip4udp-1000u15p.py b/resources/traffic_profiles/trex/trex-sl-2n-ethip4udp-1000u15p.py index 4c306aabc0..077b198d41 100755 --- a/resources/traffic_profiles/trex/trex-sl-2n-ethip4udp-1000u15p.py +++ b/resources/traffic_profiles/trex/trex-sl-2n-ethip4udp-1000u15p.py @@ -108,7 +108,7 @@ class TrafficStreams(TrafficStreamsBaseClass): pkt_offset=u"IP.src" ), STLVmFixIpv4(offset=u"IP"), - STLVmWrFlowVuar( + STLVmWrFlowVar( fv_name=u"tuple.port", pkt_offset=u"UDP.sport" ) |