X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=tests%2Fdpdk%2Fperf%2F2n1l-10ge2p1x710-eth-l2xcbase-testpmd-ndrpdr.robot;h=0b65b37fe3a62bfa30f1a9fbe59bbbb5a656d1a9;hb=1cd46e5b0125f405af0aa6c9aa715f543428f1d7;hp=770c7f0b30133e3a1c62dd85c62e3f311e48710e;hpb=6daa2d791f0e0d41b73668ef3ee233e58987dc37;p=csit.git

diff --git a/tests/dpdk/perf/2n1l-10ge2p1x710-eth-l2xcbase-testpmd-ndrpdr.robot b/tests/dpdk/perf/2n1l-10ge2p1x710-eth-l2xcbase-testpmd-ndrpdr.robot
index 770c7f0b30..0b65b37fe3 100644
--- a/tests/dpdk/perf/2n1l-10ge2p1x710-eth-l2xcbase-testpmd-ndrpdr.robot
+++ b/tests/dpdk/perf/2n1l-10ge2p1x710-eth-l2xcbase-testpmd-ndrpdr.robot
@@ -1,4 +1,4 @@
-# Copyright (c) 2020 Cisco and/or its affiliates.
+# Copyright (c) 2022 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:
@@ -13,105 +13,120 @@
 
 *** Settings ***
 | Resource | resources/libraries/robot/shared/default.robot
-| Resource | resources/libraries/robot/dpdk/default.robot
 | Library | resources.libraries.python.DPDK.DPDKTools
+| Library | resources.libraries.python.DPDK.TestpmdTest
 |
 | Force Tags | 2_NODE_SINGLE_LINK_TOPO | HW_ENV | PERFTEST | NDRPDR | 1NUMA
 | ... | NIC_Intel-X710 | DPDK | ETH | L2XCFWD | BASE
+| ... | DRV_VFIO_PCI
+| ... | RXQ_SIZE_1024 | TXQ_SIZE_1024
 | ... | eth-l2xcbase-testpmd
 |
-| Suite Setup | Setup suite single link | performance | dpdk
+| Suite Setup | Setup suite topology interfaces | performance | dpdk
 | Suite Teardown | Tear down suite | performance | dpdk
+| Test Setup | Start Test Export
+| Test Teardown | Finalize Test Export
 |
 | Test Template | Local Template
 |
-| Documentation | *Raw results L2 routing test cases*
-| ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology\
+| Documentation | **Raw results L2 routing test cases**
+| ... |
+| ... | - **[Top] Network Topologies:** TG-DUT1-TG 2-node circular topology \
 | ... | with single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 frame forwarding.
-| ... | *[Cfg] DUT configuration:* DUT1 run the DPDK testpmd\
-| ... | application and use the io forwarding mode. DUT1 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 static payload.\
+| ... |
+| ... | - **[Enc] Packet Encapsulations:** Eth-IPv4 for L2 frame forwarding.
+| ... |
+| ... | - **[Cfg] DUT configuration:** DUT1 run the DPDK testpmd \
+| ... | application and use the io forwarding mode. DUT1 tested with \
+| ... | 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 static payload \
 | ... | MAC addresses are matching MAC addresses of the TG node interfaces.
 
 *** Variables ***
-| ${osi_layer}= | L2
+| ${crypto_type}= | ${None}
 | ${nic_name}= | Intel-X710
+| ${nic_driver}= | vfio-pci
 | ${nic_rxq_size}= | 1024
 | ${nic_txq_size}= | 1024
+| ${nic_pfs}= | 2
+| ${nic_vfs}= | 0
+| ${osi_layer}= | L2
 | ${overhead}= | ${0}
 # Traffic profile:
-| ${traffic_profile}= | trex-sl-3n-ethip4-ip4src254
+| ${traffic_profile}= | trex-stl-3n-ethip4-ip4src254
 
 *** Keywords ***
 | Local Template
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config.\
+| | ... | - **[Cfg]** DUT runs L2 frame forwarding config. \
 | | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads.
-| | ... | [Ver] Measure NDR and PDR values using MLRsearch algorithm.\
+| | ... | - **[Ver]** Measure NDR and PDR values using MLRsearch algorithm.
 | |
 | | [Arguments] | ${frame_size} | ${phy_cores} | ${rxq}=${None}
 | |
 | | Set Test Variable | \${frame_size}
 | |
-| | Set Max Rate And Jumbo
-| | Given Start L2FWD on all DUTs | ${phy_cores} | ${rxq} | ${jumbo}
+| | Given Set Max Rate And Jumbo
+| | And Pre-initialize layer driver | ${nic_driver}
+| | When Start testpmd on all DUTs | ${nodes} | ${topology_info}
+| | ... | ${phy_cores} | ${rxq} | ${jumbo}
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2xcbase-testpmd-ndrpdr
+| 64B-1c-eth-l2xcbase-testpmd-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2xcbase-testpmd-ndrpdr
+| 64B-2c-eth-l2xcbase-testpmd-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2xcbase-testpmd-ndrpdr
+| 64B-4c-eth-l2xcbase-testpmd-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2xcbase-testpmd-ndrpdr
+| 1518B-1c-eth-l2xcbase-testpmd-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2xcbase-testpmd-ndrpdr
+| 1518B-2c-eth-l2xcbase-testpmd-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2xcbase-testpmd-ndrpdr
+| 1518B-4c-eth-l2xcbase-testpmd-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2xcbase-testpmd-ndrpdr
+| 9000B-1c-eth-l2xcbase-testpmd-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2xcbase-testpmd-ndrpdr
+| 9000B-2c-eth-l2xcbase-testpmd-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2xcbase-testpmd-ndrpdr
+| 9000B-4c-eth-l2xcbase-testpmd-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2xcbase-testpmd-ndrpdr
+| IMIX-1c-eth-l2xcbase-testpmd-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2xcbase-testpmd-ndrpdr
+| IMIX-2c-eth-l2xcbase-testpmd-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2xcbase-testpmd-ndrpdr
+| IMIX-4c-eth-l2xcbase-testpmd-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}