| ...
| Suite Teardown | Tear down 3-node performance topology with container
| ...
-| Test Setup | Set up performance test
+| Test Setup | Run Keywords
+| ... | Set up performance test
+| ... | AND | Restart VPP in all 'VNF' containers
| ...
| Test Teardown | Tear down performance mrr test
| ...
# LXC container
| ${container_count}= | ${1}
| ${container_engine}= | Docker
-| ${container_image}= | ubuntu
+| ${container_image}= | ubuntu:xenial-20180412
+| ${container_install_dkms}= | ${FALSE}
+| ${container_chain_topology}= | chain
# CPU settings
| ${system_cpus}= | ${1}
| ${vpp_cpus}= | ${5}
-| ${container_cpus}= | ${3}
+| ${container_cpus}= | ${5}
*** Keywords ***
| Check RR for l2xcbase-eth-2memif-1dcr
| | ${max_rate}= | Calculate pps | ${s_limit} | ${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
-| | And Initialize L2 xconnect for '1' memif pairs in 3-node circular topology
+| | And Initialize L2 xconnect for '1' memif pairs and '${rxq}' rxqueues in 3-node circular topology
| | Then Traffic should pass with maximum rate | ${perf_trial_duration}
| | ... | ${max_rate}pps | ${framesize} | ${traffic_profile}
| | [Template] | Check RR for l2xcbase-eth-2memif-1dcr
| | framesize=${64} | wt=1 | rxq=1
-| tc02-IMIX-1t1c-eth-l2xcbase-eth-2memif-1dcr-mrr
+| tc02-1518B-1t1c-eth-l2xcbase-eth-2memif-1dcr-mrr
+| | [Documentation]
+| | ... | [Cfg] DUT runs L2XC switching config with 1 thread, 1 phy core,\
+| | ... | 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 l2xcbase-eth-2memif-1dcr
+| | framesize=${1518} | wt=1 | rxq=1
+
+| tc03-9000B-1t1c-eth-l2xcbase-eth-2memif-1dcr-mrr
+| | [Documentation]
+| | ... | [Cfg] DUT runs L2XC switching config with 1 thread, 1 phy core,\
+| | ... | 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 l2xcbase-eth-2memif-1dcr
+| | framesize=${9000} | wt=1 | rxq=1
+
+| tc04-IMIX-1t1c-eth-l2xcbase-eth-2memif-1dcr-mrr
| | [Documentation]
| | ... | [Cfg] DUT runs L2XC switching config with 1 thread, 1 phy core,\
| | ... | 1 receive queue per NIC port.
| | [Template] | Check RR for l2xcbase-eth-2memif-1dcr
| | framesize=IMIX_v4_1 | wt=1 | rxq=1
-| tc03-1518B-1t1c-eth-l2xcbase-eth-2memif-1dcr-mrr
+| tc05-64B-2t2c-eth-l2xcbase-eth-2memif-1dcr-mrr
| | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 1 thread, 1 phy core,\
+| | ... | [Cfg] DUT runs L2XC switching 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 l2xcbase-eth-2memif-1dcr
+| | framesize=${64} | wt=2 | rxq=1
+
+| tc06-1518B-2t2c-eth-l2xcbase-eth-2memif-1dcr-mrr
+| | [Documentation]
+| | ... | [Cfg] DUT runs L2XC switching config with 2 threads, 1 phy cores,\
| | ... | 1 receive queue per NIC port.
| | ... | [Ver] Measure MaxReceivedRate for 1518B frames using single trial\
| | ... | throughput test.
| | ...
-| | [Tags] | 1518B | 1T1C | STHREAD
+| | [Tags] | 1518B | 2T2C | MTHREAD
| | [Template] | Check RR for l2xcbase-eth-2memif-1dcr
-| | framesize=${1518} | wt=1 | rxq=1
+| | framesize=${1518} | wt=2 | rxq=1
-| tc04-64B-2t2c-eth-l2xcbase-eth-2memif-1dcr-mrr
+| tc07-9000B-2t2c-eth-l2xcbase-eth-2memif-1dcr-mrr
| | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 2 thread, 2 phy core,\
+| | ... | [Cfg] DUT runs L2XC switching config with 2 threads, 1 phy cores,\
| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Measure MaxReceivedRate for 64B frames using single trial\
+| | ... | [Ver] Measure MaxReceivedRate for 9000B frames using single trial\
| | ... | throughput test.
| | ...
-| | [Tags] | 64B | 2T2C | MTHREAD
+| | [Tags] | 9000B | 2T2C | MTHREAD
| | [Template] | Check RR for l2xcbase-eth-2memif-1dcr
-| | framesize=${64} | wt=2 | rxq=1
+| | framesize=${9000} | wt=2 | rxq=1
-| tc05-IMIX-2t2c-eth-l2xcbase-eth-2memif-1dcr-mrr
+| tc08-IMIX-2t2c-eth-l2xcbase-eth-2memif-1dcr-mrr
| | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 2 thread, 2 phy core,\
+| | ... | [Cfg] DUT runs L2XC switching config with 2 threads, 2 phy cores,\
| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Measure MaxReceivedRate forIMIX_v4_1 frames using single trial\
+| | ... | [Ver] Measure MaxReceivedRate for IMIX_v4_1 frames using single trial\
| | ... | throughput test.
| | ... | IMIX_v4_1 = (28x64B;16x570B;4x1518B)
| | ...
| | [Template] | Check RR for l2xcbase-eth-2memif-1dcr
| | framesize=IMIX_v4_1 | wt=2 | rxq=1
-| tc06-1518B-2t2c-eth-l2xcbase-eth-2memif-1dcr-mrr
+| tc09-64B-4t4c-eth-l2xcbase-eth-2memif-1dcr-mrr
| | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 2 thread, 1 phy core,\
-| | ... | 1 receive queue per NIC port.
+| | ... | [Cfg] DUT runs L2XC switching 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 l2xcbase-eth-2memif-1dcr
+| | framesize=${64} | wt=4 | rxq=2
+
+| tc10-1518B-4t4c-eth-l2xcbase-eth-2memif-1dcr-mrr
+| | [Documentation]
+| | ... | [Cfg] DUT runs L2XC switching 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 | 2T2C | MTHREAD
+| | [Tags] | 1518B | 4T4C | MTHREAD
| | [Template] | Check RR for l2xcbase-eth-2memif-1dcr
-| | framesize=${1518} | wt=2 | rxq=1
+| | framesize=${1518} | wt=4 | rxq=2
+
+| tc11-9000B-4t4c-eth-l2xcbase-eth-2memif-1dcr-mrr
+| | [Documentation]
+| | ... | [Cfg] DUT runs L2XC switching 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 l2xcbase-eth-2memif-1dcr
+| | framesize=${9000} | wt=4 | rxq=2
+
+| tc12-IMIX-4t4c-eth-l2xcbase-eth-2memif-1dcr-mrr
+| | [Documentation]
+| | ... | [Cfg] DUT runs L2XC switching config with 4 threads, 4 phy cores,\
+| | ... | 2 receive queues 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 l2xcbase-eth-2memif-1dcr
+| | framesize=IMIX_v4_1 | wt=4 | rxq=2