diff options
5 files changed, 179 insertions, 116 deletions
diff --git a/resources/job_specs/report_iterative/3n-icx/vpp-mrr-00.md b/resources/job_specs/report_iterative/3n-icx/vpp-mrr-00.md index 5fc1c45d5b..dcd672d867 100644 --- a/resources/job_specs/report_iterative/3n-icx/vpp-mrr-00.md +++ b/resources/job_specs/report_iterative/3n-icx/vpp-mrr-00.md @@ -365,6 +365,10 @@ 1c AND 64b AND mrr AND cx6dx AND drv_mlx5_core AND eth-l2xcbase 2c AND 64b AND mrr AND cx6dx AND drv_mlx5_core AND eth-l2xcbase 4c AND 64b AND mrr AND cx6dx AND drv_mlx5_core AND eth-l2xcbase +##### eth-l2xcbase-1lbvpplacp +1c AND 64b AND mrr AND cx6dx AND drv_mlx5_core AND eth-l2xcbase-1lbvpplacp +2c AND 64b AND mrr AND cx6dx AND drv_mlx5_core AND eth-l2xcbase-1lbvpplacp +4c AND 64b AND mrr AND cx6dx AND drv_mlx5_core AND eth-l2xcbase-1lbvpplacp ##### eth-l2patch 1c AND 64b AND mrr AND cx6dx AND drv_mlx5_core AND eth-l2patch 2c AND 64b AND mrr AND cx6dx AND drv_mlx5_core AND eth-l2patch @@ -383,6 +387,10 @@ 1c AND 64b AND mrr AND e810cq AND drv_avf AND eth-l2xcbase 2c AND 64b AND mrr AND e810cq AND drv_avf AND eth-l2xcbase 4c AND 64b AND mrr AND e810cq AND drv_avf AND eth-l2xcbase +##### eth-l2xcbase-1lbvpplacp +1c AND 64b AND mrr AND e810cq AND drv_avf AND eth-l2xcbase-1lbvpplacp +2c AND 64b AND mrr AND e810cq AND drv_avf AND eth-l2xcbase-1lbvpplacp +4c AND 64b AND mrr AND e810cq AND drv_avf AND eth-l2xcbase-1lbvpplacp ##### eth-l2patch 1c AND 64b AND mrr AND e810cq AND drv_avf AND eth-l2patch 2c AND 64b AND mrr AND e810cq AND drv_avf AND eth-l2patch @@ -452,4 +460,4 @@ ##### ethip6srhip6-ip6base-srv6proxy-stat 1c AND 78b AND mrr AND e810cq AND drv_avf AND ethip6srhip6-ip6base-srv6proxy-stat 2c AND 78b AND mrr AND e810cq AND drv_avf AND ethip6srhip6-ip6base-srv6proxy-stat -4c AND 78b AND mrr AND e810cq AND drv_avf AND ethip6srhip6-ip6base-srv6proxy-stat
\ No newline at end of file +4c AND 78b AND mrr AND e810cq AND drv_avf AND ethip6srhip6-ip6base-srv6proxy-stat diff --git a/resources/job_specs/report_iterative/3n-icx/vpp-ndrpdr-00.md b/resources/job_specs/report_iterative/3n-icx/vpp-ndrpdr-00.md index ae612f96d1..16f87b7099 100644 --- a/resources/job_specs/report_iterative/3n-icx/vpp-ndrpdr-00.md +++ b/resources/job_specs/report_iterative/3n-icx/vpp-ndrpdr-00.md @@ -365,6 +365,10 @@ 1c AND 64b AND ndrpdr AND cx6dx AND drv_mlx5_core AND eth-l2xcbase 2c AND 64b AND ndrpdr AND cx6dx AND drv_mlx5_core AND eth-l2xcbase 4c AND 64b AND ndrpdr AND cx6dx AND drv_mlx5_core AND eth-l2xcbase +##### eth-l2xcbase-1lbvpplacp +1c AND 64b AND ndrpdr AND cx6dx AND drv_mlx5_core AND eth-l2xcbase-1lbvpplacp +2c AND 64b AND ndrpdr AND cx6dx AND drv_mlx5_core AND eth-l2xcbase-1lbvpplacp +4c AND 64b AND ndrpdr AND cx6dx AND drv_mlx5_core AND eth-l2xcbase-1lbvpplacp ##### eth-l2patch 1c AND 64b AND ndrpdr AND cx6dx AND drv_mlx5_core AND eth-l2patch 2c AND 64b AND ndrpdr AND cx6dx AND drv_mlx5_core AND eth-l2patch @@ -383,6 +387,10 @@ 1c AND 64b AND ndrpdr AND e810cq AND drv_avf AND eth-l2xcbase 2c AND 64b AND ndrpdr AND e810cq AND drv_avf AND eth-l2xcbase 4c AND 64b AND ndrpdr AND e810cq AND drv_avf AND eth-l2xcbase +##### eth-l2xcbase-1lbvpplacp +1c AND 64b AND ndrpdr AND e810cq AND drv_avf AND eth-l2xcbase-1lbvpplacp +2c AND 64b AND ndrpdr AND e810cq AND drv_avf AND eth-l2xcbase-1lbvpplacp +4c AND 64b AND ndrpdr AND e810cq AND drv_avf AND eth-l2xcbase-1lbvpplacp ##### eth-l2patch 1c AND 64b AND ndrpdr AND e810cq AND drv_avf AND eth-l2patch 2c AND 64b AND ndrpdr AND e810cq AND drv_avf AND eth-l2patch @@ -452,4 +460,4 @@ ##### ethip6srhip6-ip6base-srv6proxy-stat 1c AND 78b AND ndrpdr AND e810cq AND drv_avf AND ethip6srhip6-ip6base-srv6proxy-stat 2c AND 78b AND ndrpdr AND e810cq AND drv_avf AND ethip6srhip6-ip6base-srv6proxy-stat -4c AND 78b AND ndrpdr AND e810cq AND drv_avf AND ethip6srhip6-ip6base-srv6proxy-stat
\ No newline at end of file +4c AND 78b AND ndrpdr AND e810cq AND drv_avf AND ethip6srhip6-ip6base-srv6proxy-stat diff --git a/resources/libraries/robot/l2/l2_bridge_domain.robot b/resources/libraries/robot/l2/l2_bridge_domain.robot index 00044e1253..347dd708a5 100644 --- a/resources/libraries/robot/l2/l2_bridge_domain.robot +++ b/resources/libraries/robot/l2/l2_bridge_domain.robot @@ -1,5 +1,5 @@ -# Copyright (c) 2023 Cisco and/or its affiliates. -# Copyright (c) 2023 PANTHEON.tech and/or its affiliates. +# Copyright (c) 2024 Cisco and/or its affiliates. +# Copyright (c) 2024 PANTHEON.tech 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: @@ -458,83 +458,6 @@ | | ... | Add interface to bridge domain | ${dut2} | ${DUT2_${int}2}[0] | | ... | ${bd_id2} -| Initialize L2 bridge domains with Vhost-User and VLAN with VPP link bonding in a 3-node circular topology -| | [Documentation] -| | ... | Create two Vhost-User interfaces on all defined VPP nodes. Create one -| | ... | link bonding (BondEthernet) interface on both VPP nodes. Add one -| | ... | physical interface towards next DUT as a member of BondEthernet -| | ... | interface. Setup VLAN on BondEthernet interfaces between DUTs. Add one -| | ... | Vhost-User interface into L2 bridge domains with learning enabled with -| | ... | physical interface towards TG and other Vhost-User interface into L2 -| | ... | bridge domains with learning enabled with VLAN sub-interface. All -| | ... | interfaces are brought up. -| | -| | ... | *Arguments:* -| | ... | - bd_id1 - Bridge domain ID. Type: integer -| | ... | - bd_id2 - Bridge domain ID. Type: integer -| | ... | - subid - ID of the sub-interface to be created. Type: string -| | ... | - tag_rewrite - Method of tag rewrite. Type: string -| | ... | - bond_mode - Link bonding mode. Type: string -| | ... | - lb_mode - Load balance mode. Type: string -| | ... | - virtio_feature_mask - Enabled Virtio features (Optional). -| | ... | Type: integer -| | -| | ... | *Example:* -| | -| | ... | \| Initialize L2 bridge domains with Vhost-User and VLAN with VPP\ -| | ... | link bonding in a 3-node circular topology \| 1 \| 2 \ -| | ... | \| 10 \| pop-1 \| xor \| l34 \| -| | -| | [Arguments] | ${bd_id1} | ${bd_id2} | ${subid} | ${tag_rewrite} -| | ... | ${bond_mode} | ${lb_mode} | ${virtio_feature_mask}=${None} -| | -| | Set interfaces in path up -| | ${dut1_eth_bond_if1}= | VPP Create Bond Interface -| | ... | ${dut1} | ${bond_mode} | ${lb_mode} -| | FOR | ${pf} | IN RANGE | 1 | ${nic_pfs} + 1 -| | | ${_even}= | Evaluate | ${pf} % 2 -| | | Run Keyword If | not ${even} -| | | ... | VPP Add Bond Member -| | | ... | ${dut1} | ${DUT1_${int}${pf}}[0] | ${dut1_eth_bond_if1} -| | END -| | ${dut2_eth_bond_if1}= | VPP Create Bond Interface -| | ... | ${dut2} | ${bond_mode} | ${lb_mode} -| | FOR | ${pf} | IN RANGE | 1 | ${nic_pfs} + 1 -| | | ${_even}= | Evaluate | ${pf} % 2 -| | | Run Keyword If | ${even} -| | | ... | VPP Add Bond Member -| | | ... | ${dut2} | ${DUT2_${int}${pf}}[0] | ${dut2_eth_bond_if1} -| | END -| | VPP Show Bond Data On All Nodes | ${nodes} | verbose=${TRUE} -| | Initialize VLAN dot1q sub-interfaces in circular topology -| | ... | ${dut1} | ${dut1_eth_bond_if1} -| | ... | ${dut2} | ${dut2_eth_bond_if1} | ${subid} -| | Configure L2 tag rewrite method on interfaces -| | ... | ${dut1} | ${subif_index_1} -| | ... | ${dut2} | ${subif_index_2} | ${tag_rewrite} -| | Configure vhost interfaces | ${dut1} -| | ... | /var/run/vpp/sock-1-${bd_id1} | /var/run/vpp/sock-1-${bd_id2} -| | ... | virtio_feature_mask=${virtio_feature_mask} -| | Add interface to bridge domain -| | ... | ${dut1} | ${DUT1_${int}1}[0] | ${bd_id1} -| | Add interface to bridge domain -| | ... | ${dut1} | ${vhost_if1} | ${bd_id1} -| | Add interface to bridge domain -| | ... | ${dut1} | ${vhost_if2} | ${bd_id2} -| | Add interface to bridge domain -| | ... | ${dut1} | ${subif_index_1} | ${bd_id2} -| | Configure vhost interfaces | ${dut2} -| | ... | /var/run/vpp/sock-1-${bd_id1} | /var/run/vpp/sock-1-${bd_id2} -| | ... | virtio_feature_mask=${virtio_feature_mask} -| | Add interface to bridge domain -| | ... | ${dut2} | ${subif_index_2} | ${bd_id1} -| | Add interface to bridge domain -| | ... | ${dut2} | ${vhost_if1} | ${bd_id1} -| | Add interface to bridge domain -| | ... | ${dut2} | ${vhost_if2} | ${bd_id2} -| | Add interface to bridge domain -| | ... | ${dut2} | ${DUT2_${int}2}[0] | ${bd_id2} - | Initialize L2 Bridge Domain with memif pairs on DUT node | | [Documentation] | | ... | Create pairs of Memif interfaces on DUT node. Put each Memif interface diff --git a/resources/libraries/robot/l2/l2_xconnect.robot b/resources/libraries/robot/l2/l2_xconnect.robot index b782602827..604d3eba9b 100644 --- a/resources/libraries/robot/l2/l2_xconnect.robot +++ b/resources/libraries/robot/l2/l2_xconnect.robot @@ -1,4 +1,4 @@ -# Copyright (c) 2023 Cisco and/or its affiliates. +# Copyright (c) 2024 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: @@ -214,7 +214,7 @@ | | Run Keyword If | '${dut2_status}' == 'PASS' | | ... | Configure L2XC | ${dut2} | ${DUT2_${int}2}[0] | ${vhost_if2} -| Initialize L2 xconnect with Vhost-User and VLAN with VPP link bonding in 3-node circular topology +| Initialize L2 xconnect with link bonding in 3-node circular topology | | [Documentation] | | ... | Create two Vhost-User interfaces on all defined VPP nodes. Create one | | ... | link bonding (BondEthernet) interface on both VPP nodes. Add one @@ -224,60 +224,38 @@ | | ... | other Vhost interface with VLAN sub-interface. All interfaces are | | ... | brought up. | | -| | ... | *Arguments:* -| | ... | - subid - ID of the sub-interface to be created. Type: string -| | ... | - tag_rewrite - Method of tag rewrite. Type: string +| | ... | *Required arguments read from test variables:* | | ... | - bond_mode - Link bonding mode. Type: string | | ... | - lb_mode - Load balance mode. Type: string -| | ... | - virtio_feature_mask - Enabled Virtio features (Optional). +| | ... | *Optional argument read from test variable:* +| | ... | - dut_dut_links - Number of parallel DUT1-DUT2 links. Type: int | | ... | Type: integer | | | | ... | *Example:* | | -| | ... | \| Initialize L2 xconnect with Vhost-User and VLAN with VPP link\ -| | ... | bonding in 3-node circular topology \| 10 \| pop-1 \| xor \| l34 \| +| | ... | \| Initialize L2 xconnect with link bonding in 3-node circular topology | | -| | [Arguments] | ${subid} | ${tag_rewrite} | ${bond_mode} | ${lb_mode} -| | ... | ${virtio_feature_mask}=${None} +| | ${dut_dut_links}= | Get Variable Value | \${dut_dut_links} | ${1} | | -| | Set interfaces in path up | | ${dut1_eth_bond_if1}= | VPP Create Bond Interface | | ... | ${dut1} | ${bond_mode} | ${lb_mode} -| | FOR | ${pf} | IN RANGE | 1 | ${nic_pfs} + 1 -| | | ${_even}= | Evaluate | ${pf} % 2 -| | | Run Keyword If | not ${even} +| | FOR | ${pf} | IN RANGE | 1 | ${dut_dut_links} * 2 + 1 +| | | Run Keyword If | not ${pf} % 2 | | | ... | VPP Add Bond Member | | | ... | ${dut1} | ${DUT1_${int}${pf}}[0] | ${dut1_eth_bond_if1} | | END | | ${dut2_eth_bond_if1}= | VPP Create Bond Interface | | ... | ${dut2} | ${bond_mode} | ${lb_mode} -| | FOR | ${pf} | IN RANGE | 1 | ${nic_pfs} + 1 -| | | ${_even}= | Evaluate | ${pf} % 2 -| | | Run Keyword If | ${even} +| | FOR | ${pf} | IN RANGE | 1 | ${dut_dut_links} * 2 + 1 +| | | Run Keyword If | ${pf} % 2 | | | ... | VPP Add Bond Member | | | ... | ${dut2} | ${DUT2_${int}${pf}}[0] | ${dut2_eth_bond_if1} | | END | | VPP Show Bond Data On All Nodes | ${nodes} | verbose=${TRUE} -| | Initialize VLAN dot1q sub-interfaces in circular topology -| | ... | ${dut1} | ${dut1_eth_bond_if1} -| | ... | ${dut2} | ${dut2_eth_bond_if1} | ${subid} -| | Configure L2 tag rewrite method on interfaces -| | ... | ${dut1} | ${subif_index_1} -| | ... | ${dut2} | ${subif_index_2} | ${tag_rewrite} -| | Configure vhost interfaces -| | ... | ${dut1} | /run/vpp/sock-1-1 | /run/vpp/sock-1-2 -| | ... | virtio_feature_mask=${virtio_feature_mask} -| | Configure L2XC -| | ... | ${dut1} | ${DUT1_${int}1}[0] | ${vhost_if1} -| | Configure L2XC -| | ... | ${dut1} | ${subif_index_1} | ${vhost_if2} -| | Configure vhost interfaces -| | ... | ${dut2} | /run/vpp/sock-1-1 | /run/vpp/sock-1-2 -| | ... | virtio_feature_mask=${virtio_feature_mask} | | Configure L2XC -| | ... | ${dut2} | ${subif_index_2} | ${vhost_if1} +| | ... | ${dut1} | ${DUT1_${int}1}[0] | ${dut1_eth_bond_if1} | | Configure L2XC -| | ... | ${dut2} | ${DUT2_${int}2}[0] | ${vhost_if2} +| | ... | ${dut2} | ${DUT2_${int}2}[0] | ${dut2_eth_bond_if1} | Initialize L2 xconnect with memif pairs on DUT node | | [Documentation] diff --git a/tests/vpp/perf/l2/10ge2p1x710-eth-l2xcbase-1lbvpplacp-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x710-eth-l2xcbase-1lbvpplacp-ndrpdr.robot new file mode 100644 index 0000000000..3b98788514 --- /dev/null +++ b/tests/vpp/perf/l2/10ge2p1x710-eth-l2xcbase-1lbvpplacp-ndrpdr.robot @@ -0,0 +1,146 @@ +# Copyright (c) 2024 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 | ETH | L2XCBASE | BASE +| ... | LBOND | LBOND_1L | LBOND_VPP | LBOND_MODE_LACP | LBOND_LB_L34 +| ... | RXQ_SIZE_0 | TXQ_SIZE_0 | DRV_VFIO_PCI +| ... | eth-l2xcbase-1lbvpplacp +| +| Suite Setup | Setup suite topology interfaces | performance +| Suite Teardown | Tear down suite | performance +| Test Setup | Setup test | performance +| Test Teardown | Tear down test | performance +| +| Test Template | Local Template +| +| Documentation | **RFC2544: Pkt throughput L2XC test cases with link bonding** +| ... | +| ... | - **[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 are configured with VPP \ +| ... | link bonding (mode LACP, transmit policy l34) on link between DUT1 and \ +| ... | DUT2 and L2XC connection to TG-facing interfaces. DUT1/DUT2 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 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 | perfmon_plugin.so | lacp_plugin.so +| ${crypto_type}= | ${None} +| ${nic_name}= | Intel-X710 +| ${nic_driver}= | vfio-pci +| ${nic_rxq_size}= | 0 +| ${nic_txq_size}= | 0 +| ${nic_pfs}= | 2 +| ${nic_vfs}= | 0 +| ${dut_dut_links}= | 1 +| ${osi_layer}= | L2 +| ${overhead}= | ${0} +# Link bonding config +| ${bond_mode}= | lacp +| ${lb_mode}= | l34 +# Traffic profile: +| ${traffic_profile}= | trex-stl-ethip4-ip4src254 + +*** Keywords *** +| Local Template +| | [Documentation] +| | ... | - **[Cfg]** DUT runs L2XC and bonding with ${phy_cores} phy core(s). +| | ... | - **[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 Set Max Rate And Jumbo +| | And Add worker threads to all DUTs | ${phy_cores} | ${rxq} +| | And Pre-initialize layer driver | ${nic_driver} +| | And Apply startup configuration on all VPP DUTs +| | When Initialize layer driver | ${nic_driver} +| | And Initialize layer interface +| | AND Initialize L2 xconnect with link bonding in 3-node circular topology +| | Then Find NDR and PDR intervals using optimized search + +*** Test Cases *** +| 64B-1c-eth-l2xcbase-1lbvpplacp-ndrpdr +| | [Tags] | 64B | 1C +| | frame_size=${64} | phy_cores=${1} + +| 64B-2c-eth-l2xcbase-1lbvpplacp-ndrpdr +| | [Tags] | 64B | 2C +| | frame_size=${64} | phy_cores=${2} + +| 64B-4c-eth-l2xcbase-1lbvpplacp-ndrpdr +| | [Tags] | 64B | 4C +| | frame_size=${64} | phy_cores=${4} + +| 1518B-1c-eth-l2xcbase-1lbvpplacp-ndrpdr +| | [Tags] | 1518B | 1C +| | frame_size=${1518} | phy_cores=${1} + +| 1518B-2c-eth-l2xcbase-1lbvpplacp-ndrpdr +| | [Tags] | 1518B | 2C +| | frame_size=${1518} | phy_cores=${2} + +| 1518B-4c-eth-l2xcbase-1lbvpplacp-ndrpdr +| | [Tags] | 1518B | 4C +| | frame_size=${1518} | phy_cores=${4} + +| 9000B-1c-eth-l2xcbase-1lbvpplacp-ndrpdr +| | [Tags] | 9000B | 1C +| | frame_size=${9000} | phy_cores=${1} + +| 9000B-2c-eth-l2xcbase-1lbvpplacp-ndrpdr +| | [Tags] | 9000B | 2C +| | frame_size=${9000} | phy_cores=${2} + +| 9000B-4c-eth-l2xcbase-1lbvpplacp-ndrpdr +| | [Tags] | 9000B | 4C +| | frame_size=${9000} | phy_cores=${4} + +| IMIX-1c-eth-l2xcbase-1lbvpplacp-ndrpdr +| | [Tags] | IMIX | 1C +| | frame_size=IMIX_v4_1 | phy_cores=${1} + +| IMIX-2c-eth-l2xcbase-1lbvpplacp-ndrpdr +| | [Tags] | IMIX | 2C +| | frame_size=IMIX_v4_1 | phy_cores=${2} + +| IMIX-4c-eth-l2xcbase-1lbvpplacp-ndrpdr +| | [Tags] | IMIX | 4C +| | frame_size=IMIX_v4_1 | phy_cores=${4} |