diff options
13 files changed, 595 insertions, 71 deletions
diff --git a/resources/libraries/robot/shared/interfaces.robot b/resources/libraries/robot/shared/interfaces.robot index e249cd5d4e..55d0a3d844 100644 --- a/resources/libraries/robot/shared/interfaces.robot +++ b/resources/libraries/robot/shared/interfaces.robot @@ -252,10 +252,14 @@ | | ... | | ${dut_str}= | Convert To Lowercase | ${dut} | | :FOR | ${id} | IN RANGE | 1 | ${count} + 1 +| | | ${if1_vlan}= | Get Variable Value | \${${dut_str}_vlan1} | | | ${default}= | Evaluate | ${100} + ${id} - ${1} -| | | ${if1_vlan}= | Get Variable Value | \${${dut_str}_vlan1} | ${default} +| | | ${if1_vlan}= | Set Variable If | '${if1_vlan}' == '${NONE}' +| | | ... | ${default} | ${if1_vlan} +| | | ${if2_vlan}= | Get Variable Value | \${${dut_str}_vlan2} | | | ${default}= | Evaluate | ${200} + ${id} - ${1} -| | | ${if2_vlan}= | Get Variable Value | \${${dut_str}_vlan2} | ${default} +| | | ${if2_vlan}= | Set Variable If | '${if2_vlan}' == '${NONE}' +| | | ... | ${default} | ${if2_vlan} | | | ${if1_name} | ${if1_index}= | Run Keyword If | | | ... | ${create} or ${id} == ${1} | | | ... | Create Vlan Subinterface diff --git a/resources/traffic_profiles/trex/trex-sl-dot1qip4-vlan1ip4src254ip4dst254-bvi.py b/resources/traffic_profiles/trex/trex-sl-dot1qip4-vlan1ip4src254ip4dst254-bvi.py new file mode 100755 index 0000000000..24deddf694 --- /dev/null +++ b/resources/traffic_profiles/trex/trex-sl-dot1qip4-vlan1ip4src254ip4dst254-bvi.py @@ -0,0 +1,118 @@ +# 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: +# +# 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. + +"""Stream profile for T-rex traffic generator. + +Stream profile: + - Two streams sent in directions 0 --> 1 and 1 --> 0 at the same time. + - Packet: ETH / DOT1Q / IP / + - Direction 0 --> 1: + - Destination MAC address: ba:dc:00:ff:ee:01 + - VLAN range: 100 + - Source IP address range: 10.10.10.1 - 10.10.10.254 + - Destination IP address range: 20.20.20.1 - 20.20.20.254 + - Direction 1 --> 0: + - Destination MAC address: ba:dc:00:ff:ee:01 + - VLAN range: 200 + - Source IP address range: 20.20.20.1 - 20.20.20.254 + - Destination IP address range: 10.10.10.1 - 10.10.10.254 +""" + +from trex.stl.api import * +from profile_trex_stateless_base_class import TrafficStreamsBaseClass + + +class TrafficStreams(TrafficStreamsBaseClass): + """Stream profile.""" + + def __init__(self): + """Initialization and setting of streams' parameters.""" + + super(TrafficStreamsBaseClass, self).__init__() + + # VLAN IDs + self.p1_vlan_start = 100 + self.p2_vlan_start = 200 + + # IPs used in packet headers. + self.p1_src_start_ip = '10.10.10.1' + self.p1_src_end_ip = '10.10.10.254' + + self.p1_dst_start_ip = '20.20.20.1' + self.p1_dst_end_ip = '20.20.20.254' + + self.p2_src_start_ip = '20.20.20.1' + self.p2_src_end_ip = '20.20.20.254' + + self.p2_dst_start_ip = '10.10.10.1' + self.p2_dst_end_ip = '10.10.10.254' + + def define_packets(self): + """Defines the packets to be sent from the traffic generator. + + Packet definition: | ETH | DOT1Q | IP | + + :returns: Packets to be sent from the traffic generator. + :rtype: tuple + """ + + # Direction 0 --> 1 + base_pkt_a = (Ether(dst='ba:dc:00:ff:ee:01') / + Dot1Q(vlan=self.p1_vlan_start) / + IP(src=self.p1_src_start_ip, + dst=self.p1_dst_start_ip, + proto=61)) + # Direction 1 --> 0 + base_pkt_b = (Ether(dst='ba:dc:00:ff:ee:01') / + Dot1Q(vlan=self.p2_vlan_start) / + IP(src=self.p2_src_start_ip, + dst=self.p2_dst_start_ip, + proto=61)) + + # Direction 0 --> 1 + vm1 = STLScVmRaw([STLVmFlowVar(name="ip_src", + min_value=self.p1_src_start_ip, + max_value=self.p1_src_end_ip, + size=4, op="random"), + STLVmWrFlowVar(fv_name="ip_src", pkt_offset="IP.src"), + STLVmFlowVar(name="ip_dst", + min_value=self.p1_dst_start_ip, + max_value=self.p1_dst_end_ip, + size=4, op="random"), + STLVmWrFlowVar(fv_name="ip_dst", pkt_offset="IP.dst"), + STLVmFixIpv4(offset="IP")]) + # Direction 1 --> 0 + vm2 = STLScVmRaw([STLVmFlowVar(name="ip_src", + min_value=self.p2_src_start_ip, + max_value=self.p2_src_end_ip, + size=4, op="random"), + STLVmWrFlowVar(fv_name="ip_src", pkt_offset="IP.src"), + STLVmFlowVar(name="ip_dst", + min_value=self.p2_dst_start_ip, + max_value=self.p2_dst_end_ip, + size=4, op="random"), + STLVmWrFlowVar(fv_name="ip_dst", pkt_offset="IP.dst"), + STLVmFixIpv4(offset="IP")]) + + return base_pkt_a, base_pkt_b, vm1, vm2 + + +def register(): + """Register this traffic profile to T-rex. + + Do not change this function. + + :returns: Traffic streams. + :rtype: Object + """ + return TrafficStreams() diff --git a/resources/traffic_profiles/trex/trex-sl-dot1qip4-vlan1ip4src254ip4dst254.py b/resources/traffic_profiles/trex/trex-sl-dot1qip4-vlan1ip4src254ip4dst254.py index be58eb4e3e..bf5151905c 100755 --- a/resources/traffic_profiles/trex/trex-sl-dot1qip4-vlan1ip4src254ip4dst254.py +++ b/resources/traffic_profiles/trex/trex-sl-dot1qip4-vlan1ip4src254ip4dst254.py @@ -65,13 +65,13 @@ class TrafficStreams(TrafficStreamsBaseClass): """ # Direction 0 --> 1 - base_pkt_a = (Ether(dst='ba:dc:00:ff:ee:01') / + base_pkt_a = (Ether() / Dot1Q(vlan=self.p1_vlan_start) / IP(src=self.p1_src_start_ip, dst=self.p1_dst_start_ip, proto=61)) # Direction 1 --> 0 - base_pkt_b = (Ether(dst='ba:dc:00:ff:ee:01') / + base_pkt_b = (Ether() / Dot1Q(vlan=self.p2_vlan_start) / IP(src=self.p2_src_start_ip, dst=self.p2_dst_start_ip, diff --git a/tests/vpp/perf/container_memif/10ge2p1x710-eth-l2xcbase-eth-1memif-1dcr-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x710-avf-dot1q-ip4base-ndrpdr.robot index ee3d1369ec..d301e48fac 100644 --- a/tests/vpp/perf/container_memif/10ge2p1x710-eth-l2xcbase-eth-1memif-1dcr-ndrpdr.robot +++ b/tests/vpp/perf/ip4/10ge2p1x710-avf-dot1q-ip4base-ndrpdr.robot @@ -15,56 +15,56 @@ | Resource | resources/libraries/robot/shared/default.robot | ... | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR -| ... | NIC_Intel-X710 | ETH | L2XCFWD | BASE | MEMIF | SINGLE_MEMIF | DOCKER +| ... | NIC_Intel-X710 | ETH | IP4FWD | BASE | DOT1Q | IP4BASE | DRV_AVF | ... -| Suite Setup | Setup suite single link | performance -| Suite Teardown | Tear down suite | performance +| Suite Setup | Setup suite single link | performance_avf +| Suite Teardown | Tear down suite | performance | vifs | Test Setup | Setup test -| Test Teardown | Tear down test | performance | container +| Test Teardown | Tear down test | performance | ... | Test Template | Local Template | ... -| Documentation | *RFC2544: Pkt throughput L2XC test cases* +| Documentation | *RFC2544: Pkt throughput IPv4 routing with IEEE 802.1Q test\ +| ... | cases* | ... -| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology +| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology\ | ... | with single links between nodes. -| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 cross connect. -| ... | *[Cfg] DUT configuration:* DUT1 and DUT2 configured with L2 cross- -| ... | connect. DUT1 and DUT2 tested with ${nic_name}.\ -| ... | Container is connected to VPP via Memif interface running same VPP -| ... | version as running on DUT. Resources are limited via cgroup to use 5 -| ... | cores allocated from pool of isolated CPUs. There are no memory -| ... | contraints. Cross Horizontal topology with packets flowing via DUT (VPP) -| ... | to Container, then via horizontal memif to the next Container, and so on -| ... | until the last Container then to NIC (in last Container). Single -| ... | Container is supported as of now. +| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for IPv4 routing. IEEE 802.1Q\ +| ... | tagging is applied on link between DUT1 and DUT2. +| ... | *[Cfg] DUT configuration:* DUT1 and DUT2 are configured with IPv4\ +| ... | routing and two static IPv4 /30 route entries. DUT1 and DUT2 tested\ +| ... | with ${nic_name} with VF enabled. | ... | *[Ver] TG verification:* TG finds and reports throughput NDR (Non Drop\ | ... | Rate) with zero packet loss tolerance and throughput PDR (Partial Drop\ | ... | Rate) with non-zero packet loss tolerance (LT) expressed in percentage\ | ... | of packets transmitted. NDR and PDR are discovered for different\ | ... | Ethernet L2 frame sizes using MLRsearch library.\ -| ... | Test packets are generated by TG on links to DUTs. TG traffic profile -| ... | contains two L3 flow-groups (flow-group per direction, 254 flows per -| ... | flow-group) with all packets containing Ethernet header, IPv4 header -| ... | with IP protocol=61 and static payload. MAC addresses are matching MAC +| ... | Test packets are\ +| ... | generated by TG on links to DUTs. TG traffic profile contains two L3\ +| ... | flow-groups (flow-group per direction, 254 flows per flow-group) with\ +| ... | all packets containing Ethernet header, IPv4 header with IP\ +| ... | protocol=61 and static payload. MAC addresses are matching MAC\ | ... | addresses of the TG node interfaces. +| ... | *[Ref] Applicable standard specifications:* RFC2544. *** Variables *** -| @{plugins_to_enable}= | dpdk_plugin.so | memif_plugin.so +| @{plugins_to_enable}= | dpdk_plugin.so | avf_plugin.so +| ${osi_layer}= | L3 | ${nic_name}= | Intel-X710 -| ${osi_layer}= | L2 -| ${overhead}= | ${0} -# Traffic profile +| ${overhead}= | ${4} +| ${subid}= | 10 +| ${tag_rewrite}= | pop-1 +# TG subnets used by T-Rex +| ${tg_if1_net}= | 10.10.10.0 +| ${tg_if2_net}= | 20.20.20.0 +# Traffic profile: | ${traffic_profile}= | trex-sl-3n-ethip4-ip4src254 -# Container -| ${container_engine}= | Docker -| ${container_chain_topology}= | cross_horiz *** Keywords *** | Local Template | | [Documentation] -| | ... | [Cfg] DUT runs L2XC switching config. -| | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads. +| | ... | [Cfg] Each DUT runs IPv4 routing with VLAN and uses ${phy_cores}\ +| | ... | physical core(s) for worker threads. | | ... | [Ver] Measure NDR and PDR values using MLRsearch algorithm.\ | | ... | | ... | *Arguments:* @@ -78,58 +78,59 @@ | | Set Test Variable | \${frame_size} | | ... | | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq} -| | And Add single PCI device to all DUTs -| | And Set Max Rate And Jumbo And Handle Multi Seg +| | And Add DPDK no PCI to all DUTs +| | And Set Max Rate And Jumbo | | And Apply startup configuration on all VPP DUTs -| | When Start containers for test -| | And Initialize L2 xconnect for single memif +| | When Initialize AVF interfaces +| | And Initialize IPv4 forwarding with VLAN dot1q sub-interfaces in circular topology +| | ... | ${tg_if1_net} | ${tg_if2_net} | ${subid} | ${tag_rewrite} | | Then Find NDR and PDR intervals using optimized search *** Test Cases *** -| tc01-64B-1c-eth-l2xcbase-eth-1memif-1dcr-ndrpdr +| tc01-64B-1c-avf-dot1q-ip4base-ndrpdr | | [Tags] | 64B | 1C | | frame_size=${64} | phy_cores=${1} -| tc02-64B-2c-eth-l2xcbase-eth-1memif-1dcr-ndrpdr +| tc02-64B-2c-avf-dot1q-ip4base-ndrpdr | | [Tags] | 64B | 2C | | frame_size=${64} | phy_cores=${2} -| tc03-64B-4c-eth-l2xcbase-eth-1memif-1dcr-ndrpdr +| tc03-64B-4c-avf-dot1q-ip4base-ndrpdr | | [Tags] | 64B | 4C | | frame_size=${64} | phy_cores=${4} -| tc04-1518B-1c-eth-l2xcbase-eth-1memif-1dcr-ndrpdr +| tc04-1518B-1c-avf-dot1q-ip4base-ndrpdr | | [Tags] | 1518B | 1C | | frame_size=${1518} | phy_cores=${1} -| tc05-1518B-2c-eth-l2xcbase-eth-1memif-1dcr-ndrpdr +| tc05-1518B-2c-avf-dot1q-ip4base-ndrpdr | | [Tags] | 1518B | 2C | | frame_size=${1518} | phy_cores=${2} -| tc06-1518B-4c-eth-l2xcbase-eth-1memif-1dcr-ndrpdr +| tc06-1518B-4c-avf-dot1q-ip4base-ndrpdr | | [Tags] | 1518B | 4C | | frame_size=${1518} | phy_cores=${4} -| tc07-9000B-1c-eth-l2xcbase-eth-1memif-1dcr-ndrpdr +| tc07-9000B-1c-avf-dot1q-ip4base-ndrpdr | | [Tags] | 9000B | 1C | | frame_size=${9000} | phy_cores=${1} -| tc08-9000B-2c-eth-l2xcbase-eth-1memif-1dcr-ndrpdr +| tc08-9000B-2c-avf-dot1q-ip4base-ndrpdr | | [Tags] | 9000B | 2C | | frame_size=${9000} | phy_cores=${2} -| tc09-9000B-4c-eth-l2xcbase-eth-1memif-1dcr-ndrpdr +| tc09-9000B-4c-avf-dot1q-ip4base-ndrpdr | | [Tags] | 9000B | 4C | | frame_size=${9000} | phy_cores=${4} -| tc10-IMIX-1c-eth-l2xcbase-eth-1memif-1dcr-ndrpdr +| tc10-IMIX-1c-avf-dot1q-ip4base-ndrpdr | | [Tags] | IMIX | 1C | | frame_size=IMIX_v4_1 | phy_cores=${1} -| tc11-IMIX-2c-eth-l2xcbase-eth-1memif-1dcr-ndrpdr +| tc11-IMIX-2c-avf-dot1q-ip4base-ndrpdr | | [Tags] | IMIX | 2C | | frame_size=IMIX_v4_1 | phy_cores=${2} -| tc12-IMIX-4c-eth-l2xcbase-eth-1memif-1dcr-ndrpdr +| tc12-IMIX-4c-avf-dot1q-ip4base-ndrpdr | | [Tags] | IMIX | 4C | | frame_size=IMIX_v4_1 | phy_cores=${4} diff --git a/tests/vpp/perf/ip4/10ge2p1x710-dot1q-ip4base-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x710-dot1q-ip4base-ndrpdr.robot index 8373afbca0..dfb3bef6f9 100644 --- a/tests/vpp/perf/ip4/10ge2p1x710-dot1q-ip4base-ndrpdr.robot +++ b/tests/vpp/perf/ip4/10ge2p1x710-dot1q-ip4base-ndrpdr.robot @@ -33,7 +33,7 @@ | ... | tagging is applied on link between DUT1 and DUT2. | ... | *[Cfg] DUT configuration:* DUT1 and DUT2 are configured with IPv4\ | ... | routing and two static IPv4 /30 route entries. DUT1 and DUT2 tested\ -| ... | with ${nic_name}.\ +| ... | with ${nic_name}. | ... | *[Ver] TG verification:* TG finds and reports throughput NDR (Non Drop\ | ... | Rate) with zero packet loss tolerance and throughput PDR (Partial Drop\ | ... | Rate) with non-zero packet loss tolerance (LT) expressed in percentage\ diff --git a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-avf-dot1q-ip4base-ndrpdr.robot b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-avf-dot1q-ip4base-ndrpdr.robot new file mode 100644 index 0000000000..b962529184 --- /dev/null +++ b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-avf-dot1q-ip4base-ndrpdr.robot @@ -0,0 +1,136 @@ +# 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: +# +# 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 *** +| Resource | resources/libraries/robot/shared/default.robot +| ... +| Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR +| ... | NIC_Intel-X710 | ETH | IP4FWD | BASE | DOT1Q | IP4BASE | DRV_AVF +| ... +| Suite Setup | Setup suite single link | performance_avf +| Suite Teardown | Tear down suite | performance | vifs +| Test Setup | Setup test +| Test Teardown | Tear down test | performance +| ... +| Test Template | Local Template +| ... +| Documentation | *RFC2544: Pkt throughput IPv4 routing with IEEE 802.1Q test\ +| ... | cases* +| ... +| ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology with\ +| ... | single links between nodes. +| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for IPv4 routing. IEEE 802.1Q\ +| ... | tagging is applied on link between DUT1-if2 and TG-if2. +| ... | *[Cfg] DUT configuration:* DUT1 is configured with IPv4 routing and\ +| ... | two static IPv4 /30 route entries. DUT1 is tested with ${nic_name}.\ +| ... | with VF enabled. +| ... | *[Ver] TG verification:* TG finds and reports throughput NDR (Non Drop\ +| ... | Rate) with zero packet loss tolerance and throughput PDR (Partial Drop\ +| ... | Rate) with non-zero packet loss tolerance (LT) expressed in percentage\ +| ... | of packets transmitted. NDR and PDR are discovered for different\ +| ... | Ethernet L2 frame sizes using MLRsearch library.\ +| ... | Test packets are\ +| ... | generated by TG on links to DUT1. TG traffic profile contains two L3\ +| ... | flow-groups (flow-group per direction, 254 flows per flow-group) with\ +| ... | all packets containing Ethernet header, IPv4 header with IP\ +| ... | protocol=61 and static payload. MAC addresses are matching MAC\ +| ... | addresses of the TG node interfaces. +| ... | *[Ref] Applicable standard specifications:* RFC2544. + +*** Variables *** +| @{plugins_to_enable}= | dpdk_plugin.so | avf_plugin.so +| ${osi_layer}= | L3 +| ${nic_name}= | Intel-X710 +| ${overhead}= | ${4} +| ${subid}= | 10 +| ${tag_rewrite}= | pop-1 +# TG subnets used by T-Rex +| ${tg_if1_net}= | 10.10.10.0 +| ${tg_if2_net}= | 20.20.20.0 +# Traffic profile: +| ${traffic_profile}= | trex-sl-2n-dot1qip4asym-ip4src254 + +*** Keywords *** +| Local Template +| | [Documentation] +| | ... | [Cfg] Each DUT runs IPv4 routing with VLAN and uses ${phy_cores}\ +| | ... | physical core(s) for worker threads. +| | ... | [Ver] Measure NDR and PDR values using MLRsearch algorithm.\ +| | ... +| | ... | *Arguments:* +| | ... | - frame_size - Framesize in Bytes in integer or string (IMIX_v4_1). +| | ... | Type: integer, string +| | ... | - phy_cores - Number of physical cores. Type: integer +| | ... | - rxq - Number of RX queues, default value: ${None}. Type: integer +| | ... +| | [Arguments] | ${frame_size} | ${phy_cores} | ${rxq}=${None} +| | ... +| | Set Test Variable | \${frame_size} +| | ... +| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq} +| | And Add DPDK no PCI to all DUTs +| | And Set Max Rate And Jumbo +| | And Apply startup configuration on all VPP DUTs +| | When Initialize AVF interfaces +| | And Initialize IPv4 forwarding with VLAN dot1q sub-interfaces in circular topology +| | ... | ${tg_if1_net} | ${tg_if2_net} | ${subid} | ${tag_rewrite} +| | Then Find NDR and PDR intervals using optimized search + +*** Test Cases *** +| tc01-64B-1c-avf-dot1q-ip4base-ndrpdr +| | [Tags] | 64B | 1C +| | frame_size=${64} | phy_cores=${1} + +| tc02-64B-2c-avf-dot1q-ip4base-ndrpdr +| | [Tags] | 64B | 2C +| | frame_size=${64} | phy_cores=${2} + +| tc03-64B-4c-avf-dot1q-ip4base-ndrpdr +| | [Tags] | 64B | 4C +| | frame_size=${64} | phy_cores=${4} + +| tc04-1518B-1c-avf-dot1q-ip4base-ndrpdr +| | [Tags] | 1518B | 1C +| | frame_size=${1518} | phy_cores=${1} + +| tc05-1518B-2c-avf-dot1q-ip4base-ndrpdr +| | [Tags] | 1518B | 2C +| | frame_size=${1518} | phy_cores=${2} + +| tc06-1518B-4c-avf-dot1q-ip4base-ndrpdr +| | [Tags] | 1518B | 4C +| | frame_size=${1518} | phy_cores=${4} + +| tc07-9000B-1c-avf-dot1q-ip4base-ndrpdr +| | [Tags] | 9000B | 1C +| | frame_size=${9000} | phy_cores=${1} + +| tc08-9000B-2c-avf-dot1q-ip4base-ndrpdr +| | [Tags] | 9000B | 2C +| | frame_size=${9000} | phy_cores=${2} + +| tc09-9000B-4c-avf-dot1q-ip4base-ndrpdr +| | [Tags] | 9000B | 4C +| | frame_size=${9000} | phy_cores=${4} + +| tc10-IMIX-1c-avf-dot1q-ip4base-ndrpdr +| | [Tags] | IMIX | 1C +| | frame_size=IMIX_v4_1 | phy_cores=${1} + +| tc11-IMIX-2c-avf-dot1q-ip4base-ndrpdr +| | [Tags] | IMIX | 2C +| | frame_size=IMIX_v4_1 | phy_cores=${2} + +| tc12-IMIX-4c-avf-dot1q-ip4base-ndrpdr +| | [Tags] | IMIX | 4C +| | frame_size=IMIX_v4_1 | phy_cores=${4} diff --git a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-dot1q-ip4base-ndrpdr.robot b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-dot1q-ip4base-ndrpdr.robot index 954e36dcdc..77cd70a812 100644 --- a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-dot1q-ip4base-ndrpdr.robot +++ b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-dot1q-ip4base-ndrpdr.robot @@ -32,7 +32,7 @@ | ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for IPv4 routing. IEEE 802.1Q\ | ... | tagging is applied on link between DUT1-if2 and TG-if2. | ... | *[Cfg] DUT configuration:* DUT1 is configured with IPv4 routing and\ -| ... | two static IPv4 /30 route entries. DUT1 is tested with ${nic_name}.\ +| ... | two static IPv4 /30 route entries. DUT1 is tested with ${nic_name}. | ... | *[Ver] TG verification:* TG finds and reports throughput NDR (Non Drop\ | ... | Rate) with zero packet loss tolerance and throughput PDR (Partial Drop\ | ... | Rate) with non-zero packet loss tolerance (LT) expressed in percentage\ diff --git a/tests/vpp/perf/l2/10ge2p1x710-avf-dot1q-l2bdbasemaclrn-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x710-avf-dot1q-l2bdbasemaclrn-ndrpdr.robot new file mode 100644 index 0000000000..fb4ae166bc --- /dev/null +++ b/tests/vpp/perf/l2/10ge2p1x710-avf-dot1q-l2bdbasemaclrn-ndrpdr.robot @@ -0,0 +1,135 @@ +# 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: +# +# 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 *** +| Resource | resources/libraries/robot/shared/default.robot +| ... +| Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR +| ... | NIC_Intel-X710 | BASE | DOT1Q | L2BDMACLRN | DRV_AVF +| ... +| Suite Setup | Setup suite single link | performance_avf +| Suite Teardown | Tear down suite | performance | vifs +| Test Setup | Setup test +| Test Teardown | Tear down test | performance +| ... +| Test Template | Local Template +| ... +| Documentation | *RFC2544: Pkt throughput L2BD with IEEE 802.1Q test cases* +| ... +| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology\ +| ... | with single links between nodes. +| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 switching of IPv4. IEEE\ +| ... | 802.1Q tagging is applied on link between DUT1 and DUT2. +| ... | *[Cfg] DUT configuration:* DUT1 and DUT2 are configured with L2 bridge\ +| ... | domain and MAC learning enabled. DUT1 and DUT2 are tested +| ... | with ${nic_name} with VF enabled. +| ... | *[Ver] TG verification:* TG finds and reports throughput NDR (Non Drop\ +| ... | Rate) with zero packet loss tolerance and throughput PDR (Partial Drop\ +| ... | Rate) with non-zero packet loss tolerance (LT) expressed in percentage\ +| ... | of packets transmitted. NDR and PDR are discovered for different\ +| ... | Ethernet L2 frame sizes using MLRsearch library.\ +| ... | Test packets are\ +| ... | generated by TG on links to DUTs. TG traffic profile contains two L3\ +| ... | flow-groups (flow-group per direction, 254 flows per flow-group) with\ +| ... | all packets containing Ethernet header, IPv4 header with IP protocol=61\ +| ... | and static payload. MAC addresses are matching MAC addresses of the TG\ +| ... | node interfaces. +| ... | *[Ref] Applicable standard specifications:* RFC2544. + +*** Variables *** +| @{plugins_to_enable}= | dpdk_plugin.so | avf_plugin.so +| ${osi_layer}= | L2 +| ${nic_name}= | Intel-X710 +| ${overhead}= | ${4} +| ${subid}= | 10 +| ${tag_rewrite}= | pop-1 +# Bridge domain IDs +| ${bd_id1}= | 1 +| ${bd_id2}= | 2 +# Traffic profile: +| ${traffic_profile}= | trex-sl-3n-ethip4-ip4src254 + +*** Keywords *** +| Local Template +| | [Documentation] +| | ... | [Cfg] Each DUT runs L2BD config with VLAN and uses ${phy_cores}\ +| | ... | physical core(s) for worker threads. +| | ... | [Ver] Measure NDR and PDR values using MLRsearch algorithm.\ +| | ... +| | ... | *Arguments:* +| | ... | - frame_size - Framesize in Bytes in integer or string (IMIX_v4_1). +| | ... | Type: integer, string +| | ... | - phy_cores - Number of physical cores. Type: integer +| | ... | - rxq - Number of RX queues, default value: ${None}. Type: integer +| | ... +| | [Arguments] | ${frame_size} | ${phy_cores} | ${rxq}=${None} +| | ... +| | Set Test Variable | \${frame_size} +| | ... +| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq} +| | And Add DPDK no PCI to all DUTs +| | And Set Max Rate And Jumbo +| | And Apply startup configuration on all VPP DUTs +| | When Initialize AVF interfaces +| | And Initialize L2 bridge domains with VLAN dot1q sub-interfaces in circular topology +| | ... | ${bd_id1} | ${bd_id2} | ${subid} | ${tag_rewrite} +| | Then Find NDR and PDR intervals using optimized search + +*** Test Cases *** +| tc01-64B-1c-avf-dot1q-l2bdbasemaclrn-ndrpdr +| | [Tags] | 64B | 1C +| | frame_size=${64} | phy_cores=${1} + +| tc02-64B-2c-avf-dot1q-l2bdbasemaclrn-ndrpdr +| | [Tags] | 64B | 2C +| | frame_size=${64} | phy_cores=${2} + +| tc03-64B-4c-avf-dot1q-l2bdbasemaclrn-ndrpdr +| | [Tags] | 64B | 4C +| | frame_size=${64} | phy_cores=${4} + +| tc04-1518B-1c-avf-dot1q-l2bdbasemaclrn-ndrpdr +| | [Tags] | 1518B | 1C +| | frame_size=${1518} | phy_cores=${1} + +| tc05-1518B-2c-avf-dot1q-l2bdbasemaclrn-ndrpdr +| | [Tags] | 1518B | 2C +| | frame_size=${1518} | phy_cores=${2} + +| tc06-1518B-4c-avf-dot1q-l2bdbasemaclrn-ndrpdr +| | [Tags] | 1518B | 4C +| | frame_size=${1518} | phy_cores=${4} + +| tc07-9000B-1c-avf-dot1q-l2bdbasemaclrn-ndrpdr +| | [Tags] | 9000B | 1C +| | frame_size=${9000} | phy_cores=${1} + +| tc08-9000B-2c-avf-dot1q-l2bdbasemaclrn-ndrpdr +| | [Tags] | 9000B | 2C +| | frame_size=${9000} | phy_cores=${2} + +| tc09-9000B-4c-avf-dot1q-l2bdbasemaclrn-ndrpdr +| | [Tags] | 9000B | 4C +| | frame_size=${9000} | phy_cores=${4} + +| tc10-IMIX-1c-avf-dot1q-l2bdbasemaclrn-ndrpdr +| | [Tags] | IMIX | 1C +| | frame_size=IMIX_v4_1 | phy_cores=${1} + +| tc11-IMIX-2c-avf-dot1q-l2bdbasemaclrn-ndrpdr +| | [Tags] | IMIX | 2C +| | frame_size=IMIX_v4_1 | phy_cores=${2} + +| tc12-IMIX-4c-avf-dot1q-l2bdbasemaclrn-ndrpdr +| | [Tags] | IMIX | 4C +| | frame_size=IMIX_v4_1 | phy_cores=${4} diff --git a/tests/vpp/perf/l2/10ge2p1x710-avf-eth-l2bdbasemaclrn-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x710-avf-eth-l2bdbasemaclrn-ndrpdr.robot index f94caf3378..81b0b9a515 100644 --- a/tests/vpp/perf/l2/10ge2p1x710-avf-eth-l2bdbasemaclrn-ndrpdr.robot +++ b/tests/vpp/perf/l2/10ge2p1x710-avf-eth-l2bdbasemaclrn-ndrpdr.robot @@ -30,8 +30,8 @@ | ... | with single links between nodes. | ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 bridge-domain. | ... | *[Cfg] DUT configuration:* DUT1 and DUT2 are configured with L2 bridge-\ -| ... | domain and MAC learning enabled. DUT1 and DUT2 tested with ${nic_name} -| ... | with VF enabled.\ +| ... | domain and MAC learning enabled. DUT1 and DUT2 tested with ${nic_name}\ +| ... | with VF enabled. | ... | *[Ver] TG verification:* TG finds and reports throughput NDR (Non Drop\ | ... | Rate) with zero packet loss tolerance and throughput PDR (Partial Drop\ | ... | Rate) with non-zero packet loss tolerance (LT) expressed in percentage\ diff --git a/tests/vpp/perf/l2/10ge2p1x710-dot1q-l2bdbasemaclrn-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x710-dot1q-l2bdbasemaclrn-ndrpdr.robot index 505f0798a4..701d1e3bfb 100644 --- a/tests/vpp/perf/l2/10ge2p1x710-dot1q-l2bdbasemaclrn-ndrpdr.robot +++ b/tests/vpp/perf/l2/10ge2p1x710-dot1q-l2bdbasemaclrn-ndrpdr.robot @@ -31,8 +31,8 @@ | ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 switching of IPv4. IEEE\ | ... | 802.1Q tagging is applied on link between DUT1 and DUT2. | ... | *[Cfg] DUT configuration:* DUT1 and DUT2 are configured with L2 bridge\ -| ... | domain and MAC learning enabled. DUT1 and DUT2 are tested -| ... | with ${nic_name}.\ +| ... | domain and MAC learning enabled. DUT1 and DUT2 are tested\ +| ... | with ${nic_name}. | ... | *[Ver] TG verification:* TG finds and reports throughput NDR (Non Drop\ | ... | Rate) with zero packet loss tolerance and throughput PDR (Partial Drop\ | ... | Rate) with non-zero packet loss tolerance (LT) expressed in percentage\ diff --git a/tests/vpp/perf/l2/2n1l-10ge2p1x710-avf-dot1q-l2bdbasemaclrn-gbp-ndrpdr.robot b/tests/vpp/perf/l2/2n1l-10ge2p1x710-avf-dot1q-l2bdbasemaclrn-gbp-ndrpdr.robot index b582bcaf9e..d8ffffe932 100644 --- a/tests/vpp/perf/l2/2n1l-10ge2p1x710-avf-dot1q-l2bdbasemaclrn-gbp-ndrpdr.robot +++ b/tests/vpp/perf/l2/2n1l-10ge2p1x710-avf-dot1q-l2bdbasemaclrn-gbp-ndrpdr.robot @@ -32,7 +32,7 @@ | ... | *[Enc] Packet Encapsulations:* Dot1q-IPv4 for L2 switching of IPv4. \ | ... | IEEE 802.1Q tagging is applied on both links TG-DUT1 . | ... | *[Cfg] DUT configuration:* DUT1 is configured with:\ -| ... | 2 VLAN subinterfaces (VID 200 and 300),\ +| ... | 2 VLAN subinterfaces (VID 100 and 200),\ | ... | 1 L2 BD with the 2 VLAN subinterfaces and a BVI,\ | ... | 1 GBP L3 RD,\ | ... | 1 GBP L2 BD with the L2 BD,\ @@ -61,7 +61,7 @@ | ${nic_name}= | Intel-X710 | ${overhead}= | ${4} # Traffic profile: -| ${traffic_profile}= | trex-sl-dot1qip4-vlan1ip4src254ip4dst254 +| ${traffic_profile}= | trex-sl-dot1qip4-vlan1ip4src254ip4dst254-bvi *** Keywords *** | Local template diff --git a/tests/vpp/perf/l2/2n1l-10ge2p1x710-avf-dot1q-l2bdbasemaclrn-ndrpdr.robot b/tests/vpp/perf/l2/2n1l-10ge2p1x710-avf-dot1q-l2bdbasemaclrn-ndrpdr.robot new file mode 100644 index 0000000000..720d024924 --- /dev/null +++ b/tests/vpp/perf/l2/2n1l-10ge2p1x710-avf-dot1q-l2bdbasemaclrn-ndrpdr.robot @@ -0,0 +1,132 @@ +# 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: +# +# 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 *** +| Resource | resources/libraries/robot/shared/default.robot +| ... +| Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR +| ... | NIC_Intel-X710 | DOT1Q | L2BDMACLRN | BASE | DRV_AVF +| ... +| Suite Setup | Setup suite single link | performance_avf +| Suite Teardown | Tear down suite | performance | vifs +| Test Setup | Setup test +| Test Teardown | Tear down test | performance +| ... +| Test Template | Local template +| ... +| Documentation | *RFC2544: Pkt throughput L2BD with IEEE 802.1Q test cases* +| ... +| ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology\ +| ... | with single links between nodes. +| ... | *[Enc] Packet Encapsulations:* Dot1q-IPv4 for L2 switching of IPv4.\ +| ... | IEEE 802.1Q tagging is applied on both links TG-DUT1 . +| ... | *[Cfg] DUT configuration:* DUT1 is configured with:\ +| ... | 2 VLAN subinterfaces (VID 100 and 200),\ +| ... | 1 L2 BD with the 2 VLAN subinterfaces,\ +| ... | DUT1 tested with ${nic_name} with VF enabled. +| ... | *[Ver] TG verification:* TG finds and reports throughput NDR (Non Drop\ +| ... | Rate) with zero packet loss tolerance and throughput PDR (Partial Drop\ +| ... | Rate) with non-zero packet loss tolerance (LT) expressed in percentage\ +| ... | of packets transmitted. NDR and PDR are discovered for different\ +| ... | Ethernet L2 frame sizes using MLRsearch library.\ +| ... | Test packets are generated by TG on\ +| ... | links to DUT. TG traffic profile contains two L3 flow-groups\ +| ... | (flow-group per direction, 254 flows per flow-group) with all packets\ +| ... | containing Ethernet header including IEEE 802.1Q tagging, IPv4 header\ +| ... | with IP protocol=61 and static payload. MAC addresses are matching MAC\ +| ... | addresses of the TG node interfaces. +| ... | *[Ref] Applicable standard specifications:* RFC2544. + +*** Variables *** +| @{plugins_to_enable}= | dpdk_plugin.so | avf_plugin.so +| ${osi_layer}= | L2 +| ${nic_name}= | Intel-X710 +| ${overhead}= | ${4} +# Traffic profile: +| ${traffic_profile}= | trex-sl-dot1qip4-vlan1ip4src254ip4dst254 + +*** Keywords *** +| Local template +| | [Documentation] +| | ... | [Cfg] DUT runs L2BD with VLAN with ${phy_cores} physical core(s) for\ +| | ... | worker threads. +| | ... | [Ver] Measure NDR and PDR values using MLRsearch algorithm.\ +| | ... +| | ... | *Arguments:* +| | ... | - frame_size - Framesize in Bytes in integer or string (IMIX_v4_1). +| | ... | Type: integer, string +| | ... | - phy_cores - Number of physical cores. Type: integer +| | ... | - rxq - Number of RX queues, default value: ${None}. Type: integer +| | ... +| | [Arguments] | ${frame_size} | ${phy_cores} | ${rxq}=${None} +| | ... +| | Set Test Variable | \${frame_size} +| | ... +| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq} +| | And Add DPDK no PCI to all DUTs +| | And Set Max Rate And Jumbo +| | And Apply startup configuration on all VPP DUTs +| | When Initialize AVF interfaces +| | And Initialize layer interface +| | And Initialize layer dot1q +| | And Initialize L2 bridge domain +| | Then Find NDR and PDR intervals using optimized search + +*** Test Cases *** +| tc01-64B-1c-avf-dot1q-l2bdbasemaclrn-ndrpdr +| | [Tags] | 64B | 1C +| | frame_size=${64} | phy_cores=${1} + +| tc02-64B-2c-avf-dot1q-l2bdbasemaclrn-ndrpdr +| | [Tags] | 64B | 2C +| | frame_size=${64} | phy_cores=${2} + +| tc03-64B-4c-avf-dot1q-l2bdbasemaclrn-ndrpdr +| | [Tags] | 64B | 4C +| | frame_size=${64} | phy_cores=${4} + +| tc04-1518B-1c-avf-dot1q-l2bdbasemaclrn-ndrpdr +| | [Tags] | 1518B | 1C +| | frame_size=${1518} | phy_cores=${1} + +| tc05-1518B-2c-avf-dot1q-l2bdbasemaclrn-ndrpdr +| | [Tags] | 1518B | 2C +| | frame_size=${1518} | phy_cores=${2} + +| tc06-1518B-4c-avf-dot1q-l2bdbasemaclrn-ndrpdr +| | [Tags] | 1518B | 4C +| | frame_size=${1518} | phy_cores=${4} + +| tc07-9000B-1c-avf-dot1q-l2bdbasemaclrn-ndrpdr +| | [Tags] | 9000B | 1C +| | frame_size=${9000} | phy_cores=${1} + +| tc08-9000B-2c-avf-dot1q-l2bdbasemaclrn-ndrpdr +| | [Tags] | 9000B | 2C +| | frame_size=${9000} | phy_cores=${2} + +| tc09-9000B-4c-avf-dot1q-l2bdbasemaclrn-ndrpdr +| | [Tags] | 9000B | 4C +| | frame_size=${9000} | phy_cores=${4} + +| tc10-IMIX-1c-avf-dot1q-l2bdbasemaclrn-ndrpdr +| | [Tags] | IMIX | 1C +| | frame_size=IMIX_v4_1 | phy_cores=${1} + +| tc11-IMIX-2c-avf-dot1q-l2bdbasemaclrn-ndrpdr +| | [Tags] | IMIX | 2C +| | frame_size=IMIX_v4_1 | phy_cores=${2} + +| tc12-IMIX-4c-avf-dot1q-l2bdbasemaclrn-ndrpdr +| | [Tags] | IMIX | 4C +| | frame_size=IMIX_v4_1 | phy_cores=${4} diff --git a/tests/vpp/perf/l2/2n1l-10ge2p1x710-dot1q-l2bdbasemaclrn-ndrpdr.robot b/tests/vpp/perf/l2/2n1l-10ge2p1x710-dot1q-l2bdbasemaclrn-ndrpdr.robot index 2a54da47a5..59591472c3 100644 --- a/tests/vpp/perf/l2/2n1l-10ge2p1x710-dot1q-l2bdbasemaclrn-ndrpdr.robot +++ b/tests/vpp/perf/l2/2n1l-10ge2p1x710-dot1q-l2bdbasemaclrn-ndrpdr.robot @@ -28,10 +28,12 @@ | ... | ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology with\ | ... | single links between nodes. -| ... | *[Enc] Packet Encapsulations:* Dot1q-IPv4 for L2 switching of IPv4. \ -| ... | IEEE 802.1Q tagging is applied on link between DUT1-if2 and TG-if2. -| ... | *[Cfg] DUT configuration:* DUT1 is configured with L2 bridge domain\ -| ... | and MAC learning enabled. DUT1 is tested with ${nic_name}.\ +| ... | *[Enc] Packet Encapsulations:* Dot1q-IPv4 for L2 switching of IPv4.\ +| ... | IEEE 802.1Q tagging is applied on both links TG-DUT1 . +| ... | *[Cfg] DUT configuration:* DUT1 is configured with:\ +| ... | 2 VLAN subinterfaces (VID 100 and 200),\ +| ... | 1 L2 BD with the 2 VLAN subinterfaces,\ +| ... | DUT1 tested with ${nic_name} with VF enabled. | ... | *[Ver] TG verification:* TG finds and reports throughput NDR (Non Drop\ | ... | Rate) with zero packet loss tolerance and throughput PDR (Partial Drop\ | ... | Rate) with non-zero packet loss tolerance (LT) expressed in percentage\ @@ -50,19 +52,14 @@ | ${osi_layer}= | L2 | ${nic_name}= | Intel-X710 | ${overhead}= | ${4} -| ${subid}= | 10 -| ${tag_rewrite}= | pop-1 -# Bridge domain IDs -| ${bd_id1}= | 1 -| ${bd_id2}= | 2 # Traffic profile: -| ${traffic_profile}= | trex-sl-2n-dot1qip4asym-ip4src254 +| ${traffic_profile}= | trex-sl-dot1qip4-vlan1ip4src254ip4dst254 *** Keywords *** | Local Template | | [Documentation] -| | ... | [Cfg] Each DUT runs L2BD config with VLAN and uses ${phy_cores}\ -| | ... | physical core(s) for worker threads. +| | ... | [Cfg] DUT runs L2BD with VLAN with ${phy_cores} physical core(s) for\ +| | ... | worker threads. | | ... | [Ver] Measure NDR and PDR values using MLRsearch algorithm.\ | | ... | | ... | *Arguments:* @@ -79,8 +76,9 @@ | | And Add PCI devices to all DUTs | | And Set Max Rate And Jumbo And Handle Multi Seg | | And Apply startup configuration on all VPP DUTs -| | When Initialize L2 bridge domains with VLAN dot1q sub-interfaces in circular topology -| | ... | ${bd_id1} | ${bd_id2} | ${subid} | ${tag_rewrite} +| | And Initialize layer interface +| | And Initialize layer dot1q +| | And Initialize L2 bridge domain | | Then Find NDR and PDR intervals using optimized search *** Test Cases *** |