| | # Test Variables required for test teardown
| | Set Test Variable | ${framesize}
| | ${get_framesize}= | Get Frame Size | ${framesize}
-| | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize}
+| | ${max_rate}= | Calculate pps | ${s_limit} | ${get_framesize}
| | ...
| | Given Add '${wt}' worker threads and '${rxq}' rxqueues in 3-node single-link circular topology
-| | And Add PCI devices to DUTs in 3-node single link topology
+| | And Add PCI devices to all DUTs
| | And Run Keyword If | ${get_framesize} < ${1522}
| | ... | Add no multi seg to all DUTs
| | And Apply startup configuration on all VPP DUTs
*** Test Cases ***
| tc01-64B-1t1c-eth-l2xcbase-mrr
| | [Documentation]
-| | ... | [Cfg] DUT runs L2XC config with 1 thread, 1 phy core,\
+| | ... | [Cfg] DUT runs L2XC config with 1 phy core,\
| | ... | 1 receive queue per NIC port.
| | ... | [Ver] Measure MaxReceivedRate for 64B frames using single trial\
| | ... | throughput test.
-| | [Tags] | 64B | 1T1C | STHREAD
+| | [Tags] | 64B | 1C
| | ...
| | [Template] | Check RR for l2xcbase
| | framesize=${64} | wt=1 | rxq=1
| tc02-1518B-1t1c-eth-l2xcbase-mrr
| | [Documentation]
-| | ... | [Cfg] DUT runs L2XC config with 1 thread, 1 phy core,\
+| | ... | [Cfg] DUT runs L2XC config with 1 phy core,\
| | ... | 1 receive queue per NIC port.
| | ... | [Ver] Measure MaxReceivedRate for 1518B frames using single\
| | ... | trial throughput test.
-| | [Tags] | 1518B | 1T1C | STHREAD
+| | [Tags] | 1518B | 1C
| | ...
| | [Template] | Check RR for l2xcbase
| | framesize=${1518} | wt=1 | rxq=1
| tc03-9000B-1t1c-eth-l2xcbase-mrr
| | [Documentation]
-| | ... | [Cfg] DUT runs L2XC config with 1 thread, 1 phy core,\
+| | ... | [Cfg] DUT runs L2XC config with 1 phy core,\
| | ... | 1 receive queue per NIC port.
| | ... | [Ver] Measure MaxReceivedRate for 9000B frames using single\
| | ... | trial throughput test.
-| | [Tags] | 9000B | 1T1C | STHREAD
+| | [Tags] | 9000B | 1C
| | ...
| | [Template] | Check RR for l2xcbase
| | framesize=${9000} | wt=1 | rxq=1
-| tc04-64B-2t2c-eth-l2xcbase-mrr
+| tc04-IMIX-1t1c-eth-l2xcbase-mrr
| | [Documentation]
-| | ... | [Cfg] DUT runs L2XC config with 2 threads, 2 phy cores,\
+| | ... | [Cfg] DUT runs L2XC config with 1 phy core,\
+| | ... | 1 receive queue per NIC port.
+| | ... | [Ver] Measure MaxReceivedRate for IMIX frames using single\
+| | ... | trial throughput test.
+| | ... | IMIX_v4_1 = (28x64B;16x570B;4x1518B)
+| | [Tags] | IMIX | 1C
+| | ...
+| | [Template] | Check RR for l2xcbase
+| | framesize=IMIX_v4_1 | wt=1 | rxq=1
+
+| tc05-64B-2t2c-eth-l2xcbase-mrr
+| | [Documentation]
+| | ... | [Cfg] DUT runs L2XC config with 2 phy cores,\
| | ... | 1 receive queue per NIC port.
| | ... | [Ver] Measure MaxReceivedRate for 64B frames using single trial\
| | ... | throughput test.
-| | [Tags] | 64B | 2T2C | MTHREAD
+| | [Tags] | 64B | 2C
| | ...
| | [Template] | Check RR for l2xcbase
| | framesize=${64} | wt=2 | rxq=1
-| tc05-1518B-2t2c-eth-l2xcbase-mrr
+| tc06-1518B-2t2c-eth-l2xcbase-mrr
| | [Documentation]
-| | ... | [Cfg] DUT runs L2XC config with 2 threads, 2 phy cores,\
+| | ... | [Cfg] DUT runs L2XC config with 2 phy cores,\
| | ... | 1 receive queue per NIC port.
| | ... | [Ver] Measure MaxReceivedRate for 1518B frames using single\
| | ... | trial throughput test.
-| | [Tags] | 1518B | 2T2C | MTHREAD
+| | [Tags] | 1518B | 2C
| | ...
| | [Template] | Check RR for l2xcbase
| | framesize=${1518} | wt=2 | rxq=1
-| tc06-9000B-2t2c-eth-l2xcbase-mrr
+| tc07-9000B-2t2c-eth-l2xcbase-mrr
| | [Documentation]
-| | ... | [Cfg] DUT runs L2XC config with 2 threads, 2 phy cores,\
+| | ... | [Cfg] DUT runs L2XC config with 2 phy cores,\
| | ... | 1 receive queue per NIC port.
| | ... | [Ver] Measure MaxReceivedRate for 9000B frames using single\
| | ... | trial throughput test.
-| | [Tags] | 9000B | 2T2C | MTHREAD
+| | [Tags] | 9000B | 2C
| | ...
| | [Template] | Check RR for l2xcbase
| | framesize=${9000} | wt=2 | rxq=1
-| tc07-64B-4t4c-eth-l2xcbase-mrr
+| tc08-IMIX-2t2c-eth-l2xcbase-mrr
+| | [Documentation]
+| | ... | [Cfg] DUT runs L2XC config with 2 phy cores,\
+| | ... | 1 receive queue per NIC port.
+| | ... | [Ver] Measure MaxReceivedRate for IMIX frames using single\
+| | ... | trial throughput test.
+| | ... | IMIX_v4_1 = (28x64B;16x570B;4x1518B)
+| | [Tags] | IMIX | 2C
+| | ...
+| | [Template] | Check RR for l2xcbase
+| | framesize=IMIX_v4_1 | wt=2 | rxq=1
+
+| tc09-64B-4t4c-eth-l2xcbase-mrr
| | [Documentation]
-| | ... | [Cfg] DUT runs L2XC config with 4 threads, 4 phy cores,\
+| | ... | [Cfg] DUT runs L2XC config with 4 phy cores,\
| | ... | 2 receive queues per NIC port.
| | ... | [Ver] Measure MaxReceivedRate for 64B frames using single trial\
| | ... | throughput test.
-| | [Tags] | 64B | 4T4C | MTHREAD
+| | [Tags] | 64B | 4C
| | ...
| | [Template] | Check RR for l2xcbase
| | framesize=${64} | wt=4 | rxq=2
-| tc08-1518B-4t4c-eth-l2xcbase-mrr
+| tc10-1518B-4t4c-eth-l2xcbase-mrr
| | [Documentation]
-| | ... | [Cfg] DUT runs L2XC config with 4 threads, 4 phy cores,\
+| | ... | [Cfg] DUT runs L2XC config with 4 phy cores,\
| | ... | 2 receive queues per NIC port.
| | ... | [Ver] Measure MaxReceivedRate for 1518B frames using single\
| | ... | trial throughput test.
-| | [Tags] | 1518B | 4T4C | MTHREAD
+| | [Tags] | 1518B | 4C
| | ...
| | [Template] | Check RR for l2xcbase
| | framesize=${1518} | wt=4 | rxq=2
-| tc09-9000B-4t4c-eth-l2xcbase-mrr
+| tc11-9000B-4t4c-eth-l2xcbase-mrr
| | [Documentation]
-| | ... | [Cfg] DUT runs L2XC config with 4 threads, 4 phy cores,\
+| | ... | [Cfg] DUT runs L2XC config with 4 phy cores,\
| | ... | 2 receive queues per NIC port.
| | ... | [Ver] Measure MaxReceivedRate for 9000B frames using single\
| | ... | trial throughput test.
-| | [Tags] | 9000B | 4T4C | MTHREAD
+| | [Tags] | 9000B | 4C
| | ...
| | [Template] | Check RR for l2xcbase
| | framesize=${9000} | wt=4 | rxq=2
+
+| tc12-IMIX-4t4c-eth-l2xcbase-mrr
+| | [Documentation]
+| | ... | [Cfg] DUT runs L2XC config with 4 phy cores,\
+| | ... | 2 receive queues per NIC port.
+| | ... | [Ver] Measure MaxReceivedRate for IMIX frames using single\
+| | ... | trial throughput test.
+| | ... | IMIX_v4_1 = (28x64B;16x570B;4x1518B)
+| | [Tags] | IMIX | 4C
+| | ...
+| | [Template] | Check RR for l2xcbase
+| | framesize=IMIX_v4_1 | wt=4 | rxq=2