1 files changed, 27 insertions, 33 deletions

diff --git a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-12memif-6pipe-6dcr-vppip4-ndrpdr.robot b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-12memif-6pipe-6dcr-vppip4-ndrpdr.robot
index fc19fcc58d..eea72f8cd5 100644
--- a/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-12memif-6pipe-6dcr-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/container_memif/2n-10ge2p1x710-eth-l2bd-12memif-6pipe-6dcr-vppip4-ndrpdr.robot
@@ -20,16 +20,13 @@
 | ...
 | Suite Setup | Run Keywords
 | ... | Set up 2-node performance topology with DUT's NIC model | L3
-| ... | Intel-X710
+| ... | ${nic_name}
 | ... | AND | Set up performance test suite with MEMIF
-| ...
 | Suite Teardown | Tear down 2-node performance topology
 | ...
 | Test Setup | Set up performance test
-| ...
 | Test Teardown | Run Keywords
-| ... | Tear down performance discovery test | ${min_rate}pps
-| ... | ${framesize} | ${traffic_profile}
+| ... | Tear down performance test
 | ... | AND | Tear down performance test with container
 | ...
 | Test Template | Local Template
@@ -41,16 +38,16 @@
 | ... | single links between nodes.
 | ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 bridge domain.
 | ... | *[Cfg] DUT configuration:* DUT1 is configured with two L2 bridge domains
-| ... | and MAC learning enabled. DUT1 tested with 2p10GE NIC X710 by Intel.
+| ... | and MAC learning enabled. DUT1 tested with ${nic_name}.\
 | ... | Container is connected to VPP via Memif interface. Container is running
 | ... | same VPP version as running on DUT. Container is limited via cgroup to
 | ... | use cores allocated from pool of isolated CPUs. There are no memory
 | ... | contraints.
-| ... | *[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 librairy.
+| ... | *[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
@@ -58,8 +55,8 @@
 | ... | addresses of the TG node interfaces.
 
 *** Variables ***
-# X710-DA2 bandwidth limit
-| ${s_limit}= | ${10000000000}
+| ${nic_name}= | Intel-X710
+| ${overhead}= | ${0}
 # Traffic profile:
 | ${traffic_profile}= | trex-sl-2n3n-ethip4-ip4src254-6c1n
 # Container
@@ -71,76 +68,73 @@
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD switching 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:*
-| | ... | - framesize - Framesize in Bytes in integer or string (IMIX_v4_1).
+| | ... | - 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] | ${framesize} | ${phy_cores} | ${rxq}=${None}
+| | [Arguments] | ${frame_size} | ${phy_cores} | ${rxq}=${None}
 | | ...
-| | Set Test Variable | ${framesize}
-| | Set Test Variable | ${min_rate} | ${10000}
+| | Set Test Variable | \${frame_size}
 | | ...
 | | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
 | | And Add PCI devices to all DUTs
-| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
-| | ... | ${s_limit} | ${framesize}
+| | Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
 | | And Set up performance test with containers
 | | ... | nf_chains=${6} | nf_nodes=${1} | auto_scale=${False}
 | | And Initialize L2 Bridge Domain for multiple pipelines with memif pairs
 | | ... | nf_chains=${6} | nf_nodes=${1} | auto_scale=${False}
 | | Then Find NDR and PDR intervals using optimized search
-| | ... | ${framesize} | ${traffic_profile} | ${min_rate} | ${max_rate}
 
 *** Test Cases ***
 | tc01-64B-1c-eth-l2bd-12memif-6pipe-6dcr-vppip4-ndrpdr
 | | [Tags] | 64B | 1C
-| | framesize=${64} | phy_cores=${1}
+| | frame_size=${64} | phy_cores=${1}
 
 | tc02-64B-2c-eth-l2bd-12memif-6pipe-6dcr-vppip4-ndrpdr
 | | [Tags] | 64B | 2C
-| | framesize=${64} | phy_cores=${2}
+| | frame_size=${64} | phy_cores=${2}
 
 | tc03-64B-4c-eth-l2bd-12memif-6pipe-6dcr-vppip4-ndrpdr
 | | [Tags] | 64B | 4C
-| | framesize=${64} | phy_cores=${4}
+| | frame_size=${64} | phy_cores=${4}
 
 | tc04-1518B-1c-eth-l2bd-12memif-6pipe-6dcr-vppip4-ndrpdr
 | | [Tags] | 1518B | 1C
-| | framesize=${1518} | phy_cores=${1}
+| | frame_size=${1518} | phy_cores=${1}
 
 | tc05-1518B-2c-eth-l2bd-12memif-6pipe-6dcr-vppip4-ndrpdr
 | | [Tags] | 1518B | 2C
-| | framesize=${1518} | phy_cores=${2}
+| | frame_size=${1518} | phy_cores=${2}
 
 | tc06-1518B-4c-eth-l2bd-12memif-6pipe-6dcr-vppip4-ndrpdr
 | | [Tags] | 1518B | 4C
-| | framesize=${1518} | phy_cores=${4}
+| | frame_size=${1518} | phy_cores=${4}
 
 | tc07-9000B-1c-eth-l2bd-12memif-6pipe-6dcr-vppip4-ndrpdr
 | | [Tags] | 9000B | 1C
-| | framesize=${9000} | phy_cores=${1}
+| | frame_size=${9000} | phy_cores=${1}
 
 | tc08-9000B-2c-eth-l2bd-12memif-6pipe-6dcr-vppip4-ndrpdr
 | | [Tags] | 9000B | 2C
-| | framesize=${9000} | phy_cores=${2}
+| | frame_size=${9000} | phy_cores=${2}
 
 | tc09-9000B-4c-eth-l2bd-12memif-6pipe-6dcr-vppip4-ndrpdr
 | | [Tags] | 9000B | 4C
-| | framesize=${9000} | phy_cores=${4}
+| | frame_size=${9000} | phy_cores=${4}
 
 | tc10-IMIX-1c-eth-l2bd-12memif-6pipe-6dcr-vppip4-ndrpdr
 | | [Tags] | IMIX | 1C
-| | framesize=IMIX_v4_1 | phy_cores=${1}
+| | frame_size=IMIX_v4_1 | phy_cores=${1}
 
 | tc11-IMIX-2c-eth-l2bd-12memif-6pipe-6dcr-vppip4-ndrpdr
 | | [Tags] | IMIX | 2C
-| | framesize=IMIX_v4_1 | phy_cores=${2}
+| | frame_size=IMIX_v4_1 | phy_cores=${2}
 
 | tc12-IMIX-4c-eth-l2bd-12memif-6pipe-6dcr-vppip4-ndrpdr
 | | [Tags] | IMIX | 4C
-| | framesize=IMIX_v4_1 | phy_cores=${4}
+| | frame_size=IMIX_v4_1 | phy_cores=${4}