X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=tests%2Fvpp%2Fperf%2Fvm_vhost%2F10ge2p1x520-eth-l2bdbasemaclrn-eth-2vhostvr256-1vm-mrr.robot;h=82823d848b1eb494cabbff7996d1eaa728f0491c;hp=ba8e13ad7db3b0541e8761c2e6bcf510bdd7b52c;hb=968ad3ffa40059abd9067b17ead3a24adf4973e0;hpb=fdf235ec30b409daef533c5258e2bfbe506c49f8

diff --git a/tests/vpp/perf/vm_vhost/10ge2p1x520-eth-l2bdbasemaclrn-eth-2vhostvr256-1vm-mrr.robot b/tests/vpp/perf/vm_vhost/10ge2p1x520-eth-l2bdbasemaclrn-eth-2vhostvr256-1vm-mrr.robot
index ba8e13ad7d..82823d848b 100644
--- a/tests/vpp/perf/vm_vhost/10ge2p1x520-eth-l2bdbasemaclrn-eth-2vhostvr256-1vm-mrr.robot
+++ b/tests/vpp/perf/vm_vhost/10ge2p1x520-eth-l2bdbasemaclrn-eth-2vhostvr256-1vm-mrr.robot
@@ -50,6 +50,7 @@
 | ... | addresses of the TG node interfaces.
 
 *** Variables ***
+| ${perf_qemu_qsz}= | 256
 # Socket names
 | ${bd_id1}= | 1
 | ${bd_id2}= | 2
@@ -58,7 +59,7 @@
 # X520-DA2 bandwidth limit
 | ${s_limit}= | ${10000000000}
 # Traffic profile:
-| ${traffic_profile} | trex-sl-3n-ethip4-ip4src254
+| ${traffic_profile}= | trex-sl-3n-ethip4-ip4src254
 
 *** Keywords ***
 | Check RR for eth-l2bdbasemaclrn-eth-2vhostvr256-1vm
@@ -71,7 +72,6 @@
 | | [Arguments] | ${framesize} | ${wt} | ${rxq}
 | | ...
 | | # Test Variables required for test and test teardown
-| | Set Test Variable | ${perf_qemu_qsz} | 256
 | | Set Test Variable | ${framesize}
 | | ${get_framesize}= | Get Frame Size | ${framesize}
 | | ${max_rate}= | Calculate pps | ${s_limit} | ${get_framesize}
@@ -79,6 +79,8 @@
 | | ${dut2_vm_refs}= | Create Dictionary
 | | Set Test Variable | ${dut1_vm_refs}
 | | Set Test Variable | ${dut2_vm_refs}
+| | ${jumbo_frames}= | Set Variable If | ${get_framesize} < ${1522}
+| | ... | ${False} | ${True}
 | | ...
 | | 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
@@ -89,21 +91,21 @@
 | | ... | ${bd_id1} | ${bd_id2} | ${sock1} | ${sock2}
 | | ${vm1}= | And Configure guest VM with dpdk-testpmd connected via vhost-user
 | | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1
+| | ... | jumbo_frames=${jumbo_frames}
 | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1}
 | | ${vm2}= | And Configure guest VM with dpdk-testpmd connected via vhost-user
 | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
+| | ... | jumbo_frames=${jumbo_frames}
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
-| | Run Keyword Unless | ${qemu_built} | Set Suite Variable | ${qemu_built}
-| | ... | ${True}
 | | Then Traffic should pass with maximum rate | ${perf_trial_duration}
 | | ... | ${max_rate}pps | ${framesize} | ${traffic_profile}
 
 *** Test Cases ***
-| tc01-64B-1t1c-ethip4-ip4base-eth-2vhostvr256-1vm-mrr
+| tc01-64B-1t1c-eth-l2bdbasemaclrn-eth-2vhostvr256-1vm-mrr
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD switching config with 1 thread, 1 phy core,\
 | | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Measure MaxReceivedRate for ${framesize} frames using single\
+| | ... | [Ver] Measure MaxReceivedRate for 64B frames using single\
 | | ... | trial throughput test.
 | | ...
 | | [Tags] | 64B | 1T1C | STHREAD
@@ -111,11 +113,11 @@
 | | [Template] | Check RR for eth-l2bdbasemaclrn-eth-2vhostvr256-1vm
 | | framesize=${64} | wt=1 | rxq=1
 
-| tc02-1518B-1t1c-ethip4-ip4base-eth-2vhostvr256-1vm
+| tc02-1518B-1t1c-eth-l2bdbasemaclrn-eth-2vhostvr256-1vm
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD switching config with 1 thread, 1 phy core,\
 | | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Measure MaxReceivedRate for ${framesize} frames using single\
+| | ... | [Ver] Measure MaxReceivedRate for 1518B frames using single\
 | | ... | trial throughput test.
 | | ...
 | | [Tags] | 1518B | 1T1C | STHREAD
@@ -123,23 +125,36 @@
 | | [Template] | Check RR for eth-l2bdbasemaclrn-eth-2vhostvr256-1vm
 | | framesize=${1518} | wt=1 | rxq=1
 
-| tc03-IMIX-1t1c-ethip4-ip4base-eth-2vhostvr256-1vm-mrr
+| tc03-9000B-1t1c-eth-l2bdbasemaclrn-eth-2vhostvr256-1vm
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD switching config with 1 thread, 1 phy core,\
 | | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Measure MaxReceivedRate for ${framesize} frames using single\
+| | ... | [Ver] Measure MaxReceivedRate for 9000B frames using single\
 | | ... | trial throughput test.
 | | ...
+| | [Tags] | 9000B | 1T1C | STHREAD
+| | ...
+| | [Template] | Check RR for eth-l2bdbasemaclrn-eth-2vhostvr256-1vm
+| | framesize=${9000} | wt=1 | rxq=1
+
+| tc04-IMIX-1t1c-eth-l2bdbasemaclrn-eth-2vhostvr256-1vm-mrr
+| | [Documentation]
+| | ... | [Cfg] DUT runs L2BD switching 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 eth-l2bdbasemaclrn-eth-2vhostvr256-1vm
 | | framesize=IMIX_v4_1 | wt=1 | rxq=1
 
-| tc04-64B-2t2c-ethip4-ip4base-eth-2vhostvr256-1vm-mrr
+| tc05-64B-2t2c-eth-l2bdbasemaclrn-eth-2vhostvr256-1vm-mrr
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD switching config with 2 threads, 2 phy cores,\
 | | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Measure MaxReceivedRate for ${framesize} frames using single\
+| | ... | [Ver] Measure MaxReceivedRate for 64B frames using single\
 | | ... | trial throughput test.
 | | ...
 | | [Tags] | 64B | 2T2C | STHREAD
@@ -147,11 +162,11 @@
 | | [Template] | Check RR for eth-l2bdbasemaclrn-eth-2vhostvr256-1vm
 | | framesize=${64} | wt=2 | rxq=1
 
-| tc05-1518B-2t2c-ethip4-ip4base-eth-2vhostvr256-1vm-mrr
+| tc06-1518B-2t2c-eth-l2bdbasemaclrn-eth-2vhostvr256-1vm-mrr
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD switching config with 2 threads, 2 phy cores,\
 | | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Measure MaxReceivedRate for ${framesize} frames using single\
+| | ... | [Ver] Measure MaxReceivedRate for 1518B frames using single\
 | | ... | trial throughput test.
 | | ...
 | | [Tags] | 1518B | 2T2C | STHREAD
@@ -159,23 +174,36 @@
 | | [Template] | Check RR for eth-l2bdbasemaclrn-eth-2vhostvr256-1vm
 | | framesize=${1518} | wt=2 | rxq=1
 
-| tc06-IMIX-2t2c-ethip4-ip4base-eth-2vhostvr256-1vm-mrr
+| tc07-9000B-2t2c-eth-l2bdbasemaclrn-eth-2vhostvr256-1vm-mrr
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD switching config with 2 threads, 2 phy cores,\
 | | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Measure MaxReceivedRate for ${framesize} frames using single\
+| | ... | [Ver] Measure MaxReceivedRate for 9000B frames using single\
 | | ... | trial throughput test.
 | | ...
+| | [Tags] | 9000B | 2T2C | STHREAD
+| | ...
+| | [Template] | Check RR for eth-l2bdbasemaclrn-eth-2vhostvr256-1vm
+| | framesize=${9000} | wt=2 | rxq=1
+
+| tc08-IMIX-2t2c-eth-l2bdbasemaclrn-eth-2vhostvr256-1vm-mrr
+| | [Documentation]
+| | ... | [Cfg] DUT runs L2BD switching 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 | STHREAD
 | | ...
 | | [Template] | Check RR for eth-l2bdbasemaclrn-eth-2vhostvr256-1vm
 | | framesize=IMIX_v4_1 | wt=2 | rxq=1
 
-| tc07-64B-4t4c-ethip4-ip4base-eth-2vhostvr256-1vm-mrr
+| tc09-64B-4t4c-eth-l2bdbasemaclrn-eth-2vhostvr256-1vm-mrr
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD switching config with 4 threads, 4 phy cores,\
 | | ... | 2 receive queues per NIC port.
-| | ... | [Ver] Measure MaxReceivedRate for ${framesize} frames using single\
+| | ... | [Ver] Measure MaxReceivedRate for 64B frames using single\
 | | ... | trial throughput test.
 | | ...
 | | [Tags] | 64B | 4T4C | STHREAD
@@ -183,11 +211,11 @@
 | | [Template] | Check RR for eth-l2bdbasemaclrn-eth-2vhostvr256-1vm
 | | framesize=${64} | wt=4 | rxq=2
 
-| tc08-1518B-4t4c-ethip4-ip4base-eth-2vhostvr256-1vm-mrr
+| tc10-1518B-4t4c-eth-l2bdbasemaclrn-eth-2vhostvr256-1vm-mrr
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD switching config with 4 threads, 4 phy cores,\
 | | ... | 2 receive queues per NIC port.
-| | ... | [Ver] Measure MaxReceivedRate for ${framesize} frames using single\
+| | ... | [Ver] Measure MaxReceivedRate for 1518B frames using single\
 | | ... | trial throughput test.
 | | ...
 | | [Tags] | 1518B | 4T4C | STHREAD
@@ -195,12 +223,25 @@
 | | [Template] | Check RR for eth-l2bdbasemaclrn-eth-2vhostvr256-1vm
 | | framesize=${1518} | wt=4 | rxq=2
 
-| tc09-IMIX-4t4c-ethip4-ip4base-eth-2vhostvr256-1vm-mrr
+| tc11-9000B-4t4c-eth-l2bdbasemaclrn-eth-2vhostvr256-1vm-mrr
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD switching config with 4 threads, 4 phy cores,\
 | | ... | 2 receive queues per NIC port.
-| | ... | [Ver] Measure MaxReceivedRate for ${framesize} frames using single\
+| | ... | [Ver] Measure MaxReceivedRate for 9000B frames using single\
+| | ... | trial throughput test.
+| | ...
+| | [Tags] | 9000B | 4T4C | STHREAD
+| | ...
+| | [Template] | Check RR for eth-l2bdbasemaclrn-eth-2vhostvr256-1vm
+| | framesize=${9000} | wt=4 | rxq=2
+
+| tc12-IMIX-4t4c-eth-l2bdbasemaclrn-eth-2vhostvr256-1vm-mrr
+| | [Documentation]
+| | ... | [Cfg] DUT runs L2BD 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 | STHREAD
 | | ...