X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=tests%2Fvpp%2Fperf%2Fip4%2F10ge2p1x520-ethip4-ip4base-mrr.robot;h=7a1a6cdac8af83cf7b567146cda3676735fa12cc;hp=59216416eb3094beb7aae92b933b1575567ff80f;hb=70068307d35abcd40abbcd9275bcb836d2cdbae6;hpb=c520b53736604e1eb5fbc328b585c78d5ffef0d9

diff --git a/tests/vpp/perf/ip4/10ge2p1x520-ethip4-ip4base-mrr.robot b/tests/vpp/perf/ip4/10ge2p1x520-ethip4-ip4base-mrr.robot
index 59216416eb..7a1a6cdac8 100644
--- a/tests/vpp/perf/ip4/10ge2p1x520-ethip4-ip4base-mrr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x520-ethip4-ip4base-mrr.robot
@@ -45,19 +45,20 @@
 # X520-DA2 bandwidth limit
 | ${s_limit}= | ${10000000000}
 # Traffic profile:
-| ${traffic_profile} | trex-sl-3n-ethip4-ip4src253
+| ${traffic_profile}= | trex-sl-3n-ethip4-ip4src253
 
 *** Keywords ***
 | Check RR for ethip4-ip4base
+| | ...
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv4 routing config with ${wt} thread(s), ${wt}\
 | | ... | phy core(s), ${rxq} receive queue(s) per NIC port.
 | | ... | [Ver] Measure MaxReceivedRate for ${framesize} frames using single\
 | | ... | trial throughput test.
 | | ...
-| | [Arguments] | ${framesize} | ${wt} | ${rxq}
+| | [Arguments] | ${wt} | ${rxq} | ${framesize}
 | | ...
-| | # Test Variables required for test teardown
+| | # Test Variables required for test execution and test teardown
 | | Set Test Variable | ${framesize}
 | | ${get_framesize}= | Get Frame Size | ${framesize}
 | | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize}
@@ -67,7 +68,7 @@
 | | And Run Keyword If | ${get_framesize} < ${1522}
 | | ... | Add no multi seg to all DUTs
 | | And Apply startup configuration on all VPP DUTs
-| | And Initialize IPv4 forwarding in 3-node circular topology
+| | When Initialize IPv4 forwarding in 3-node circular topology
 | | Then Traffic should pass with maximum rate | ${perf_trial_duration}
 | | ... | ${max_rate}pps | ${framesize} | ${traffic_profile}
 
@@ -78,10 +79,11 @@
 | | ... | 1 receive queue per NIC port.
 | | ... | [Ver] Measure MaxReceivedRate for 64B frames using single trial\
 | | ... | throughput test.
+| | ...
 | | [Tags] | 64B | 1T1C | STHREAD
 | | ...
 | | [Template] | Check RR for ethip4-ip4base
-| | framesize=${64} | wt=1 | rxq=1
+| | wt=1 | rxq=1 | framesize=${64}
 
 | tc02-1518B-1t1c-ethip4-ip4base-mrr
 | | [Documentation]
@@ -89,10 +91,11 @@
 | | ... | 1 receive queue per NIC port.
 | | ... | [Ver] Measure MaxReceivedRate for 1518B frames using single\
 | | ... | trial throughput test.
+| | ...
 | | [Tags] | 1518B | 1T1C | STHREAD
 | | ...
 | | [Template] | Check RR for ethip4-ip4base
-| | framesize=${1518} | wt=1 | rxq=1
+| | wt=1 | rxq=1 | framesize=${1518}
 
 | tc03-9000B-1t1c-ethip4-ip4base-mrr
 | | [Documentation]
@@ -100,73 +103,119 @@
 | | ... | 1 receive queue per NIC port.
 | | ... | [Ver] Measure MaxReceivedRate for 9000B frames using single\
 | | ... | trial throughput test.
+| | ...
 | | [Tags] | 9000B | 1T1C | STHREAD
 | | ...
 | | [Template] | Check RR for ethip4-ip4base
-| | framesize=${9000} | wt=1 | rxq=1
+| | wt=1 | rxq=1 | framesize=${9000}
+
+| tc04-IMIX-1t1c-ethip4-ip4base-mrr
+| | [Documentation]
+| | ... | [Cfg] DUT runs IPv4 routing config with \
+| | ... | 1 thread, 1 phy core, 1 receive queue per NIC port.
+| | ... | [Ver] Measure MaxReceivedRate for IMIX_v4_1 frames using single trial\
+| | ... | throughput test.
+| | ... | IMIX_v4_1 = (28x64B; 16x570B; 4x1518B)
+| | ...
+| | [Tags] | IMIX | 1T1C | STHREAD
+| | ...
+| | [Template] | Check RR for ethip4-ip4base
+| | wt=1 | rxq=1 | framesize=IMIX_v4_1
 
-| tc04-64B-2t2c-ethip4-ip4base-mrr
+| tc05-64B-2t2c-ethip4-ip4base-mrr
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv4 routing config with 2 threads, 2 phy cores,\
 | | ... | 1 receive queue per NIC port.
 | | ... | [Ver] Measure MaxReceivedRate for 64B frames using single trial\
 | | ... | throughput test.
+| | ...
 | | [Tags] | 64B | 2T2C | MTHREAD
 | | ...
 | | [Template] | Check RR for ethip4-ip4base
-| | framesize=${64} | wt=2 | rxq=1
+| | wt=2 | rxq=1 | framesize=${64}
 
-| tc05-1518B-2t2c-ethip4-ip4base-mrr
+| tc06-1518B-2t2c-ethip4-ip4base-mrr
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv4 routing config with 2 threads, 2 phy cores,\
 | | ... | 1 receive queue per NIC port.
 | | ... | [Ver] Measure MaxReceivedRate for 1518B frames using single\
 | | ... | trial throughput test.
+| | ...
 | | [Tags] | 1518B | 2T2C | MTHREAD
 | | ...
 | | [Template] | Check RR for ethip4-ip4base
-| | framesize=${1518} | wt=2 | rxq=1
+| | wt=2 | rxq=1 | framesize=${1518}
 
-| tc06-9000B-2t2c-ethip4-ip4base-mrr
+| tc07-9000B-2t2c-ethip4-ip4base-mrr
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv4 routing config with 2 threads, 2 phy cores,\
 | | ... | 1 receive queue per NIC port.
 | | ... | [Ver] Measure MaxReceivedRate for 9000B frames using single\
 | | ... | trial throughput test.
+| | ...
 | | [Tags] | 9000B | 2T2C | MTHREAD
 | | ...
 | | [Template] | Check RR for ethip4-ip4base
-| | framesize=${9000} | wt=2 | rxq=1
+| | wt=2 | rxq=1 | framesize=${9000}
+
+| tc08-IMIX-2t2c-ethip4-ip4base-mrr
+| | [Documentation]
+| | ... | [Cfg] DUT runs IPv4 routing config with \
+| | ... | 2 threads, 2 phy cores, 1 receive queue per NIC port.
+| | ... | [Ver] Measure MaxReceivedRate for IMIX_v4_1 frames using single trial\
+| | ... | throughput test.
+| | ... | IMIX_v4_1 = (28x64B; 16x570B; 4x1518B)
+| | ...
+| | [Tags] | IMIX | 2T2C | MTHREAD
+| | ...
+| | [Template] | Check RR for ethip4-ip4base
+| | wt=2 | rxq=1 | framesize=IMIX_v4_1
 
-| tc07-64B-4t4c-ethip4-ip4base-mrr
+| tc09-64B-4t4c-ethip4-ip4base-mrr
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv4 routing config with 4 threads, 4 phy cores,\
 | | ... | 2 receive queues per NIC port.
 | | ... | [Ver] Measure MaxReceivedRate for 64B frames using single trial\
 | | ... | throughput test.
+| | ...
 | | [Tags] | 64B | 4T4C | MTHREAD
 | | ...
 | | [Template] | Check RR for ethip4-ip4base
-| | framesize=${64} | wt=4 | rxq=2
+| | wt=4 | rxq=2 | framesize=${64}
 
-| tc08-1518B-4t4c-ethip4-ip4base-mrr
+| tc10-1518B-4t4c-ethip4-ip4base-mrr
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv4 routing config with 4 threads, 4 phy cores,\
 | | ... | 2 receive queues per NIC port.
 | | ... | [Ver] Measure MaxReceivedRate for 1518B frames using single\
 | | ... | trial throughput test.
+| | ...
 | | [Tags] | 1518B | 4T4C | MTHREAD
 | | ...
 | | [Template] | Check RR for ethip4-ip4base
-| | framesize=${1518} | wt=4 | rxq=2
+| | wt=4 | rxq=2 | framesize=${1518}
 
-| tc09-9000B-4t4c-ethip4-ip4base-mrr
+| tc11-9000B-4t4c-ethip4-ip4base-mrr
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv4 routing config with 4 threads, 4 phy cores,\
 | | ... | 2 receive queues per NIC port.
 | | ... | [Ver] Measure MaxReceivedRate for 9000B frames using single\
 | | ... | trial throughput test.
+| | ...
 | | [Tags] | 9000B | 4T4C | MTHREAD
 | | ...
 | | [Template] | Check RR for ethip4-ip4base
-| | framesize=${9000} | wt=4 | rxq=2
+| | wt=4 | rxq=2 | framesize=${9000}
+
+| tc12-IMIX-4t4c-ethip4-ip4base-mrr
+| | [Documentation]
+| | ... | [Cfg] DUT runs IPv4 routing config with \
+| | ... | 4 threads, 4 phy cores, 2 receive queue per NIC port.
+| | ... | [Ver] Measure MaxReceivedRate for IMIX_v4_1 frames using single trial\
+| | ... | throughput test.
+| | ... | IMIX_v4_1 = (28x64B; 16x570B; 4x1518B)
+| | ...
+| | [Tags] | IMIX | 4T4C | MTHREAD
+| | ...
+| | [Template] | Check RR for ethip4-ip4base
+| | wt=4 | rxq=2 | framesize=IMIX_v4_1