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=3b287548fcac685b8768aed0f4638a39ec620541;hb=968ad3ffa40059abd9067b17ead3a24adf4973e0;hpb=491d727115e757aa2d5a7df8048fe17b5ceb16ce

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 3b287548fc..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}
@@ -97,13 +97,11 @@
 | | ... | ${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.
@@ -115,7 +113,7 @@
 | | [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.
@@ -127,7 +125,7 @@
 | | [Template] | Check RR for eth-l2bdbasemaclrn-eth-2vhostvr256-1vm
 | | framesize=${1518} | wt=1 | rxq=1
 
-| tc03-9000B-1t1c-ethip4-ip4base-eth-2vhostvr256-1vm
+| 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.
@@ -139,7 +137,7 @@
 | | [Template] | Check RR for eth-l2bdbasemaclrn-eth-2vhostvr256-1vm
 | | framesize=${9000} | wt=1 | rxq=1
 
-| tc04-IMIX-1t1c-ethip4-ip4base-eth-2vhostvr256-1vm-mrr
+| 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.
@@ -152,7 +150,7 @@
 | | [Template] | Check RR for eth-l2bdbasemaclrn-eth-2vhostvr256-1vm
 | | framesize=IMIX_v4_1 | wt=1 | rxq=1
 
-| tc05-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.
@@ -164,7 +162,7 @@
 | | [Template] | Check RR for eth-l2bdbasemaclrn-eth-2vhostvr256-1vm
 | | framesize=${64} | wt=2 | rxq=1
 
-| tc06-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.
@@ -176,7 +174,7 @@
 | | [Template] | Check RR for eth-l2bdbasemaclrn-eth-2vhostvr256-1vm
 | | framesize=${1518} | wt=2 | rxq=1
 
-| tc07-9000B-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.
@@ -188,7 +186,7 @@
 | | [Template] | Check RR for eth-l2bdbasemaclrn-eth-2vhostvr256-1vm
 | | framesize=${9000} | wt=2 | rxq=1
 
-| tc08-IMIX-2t2c-ethip4-ip4base-eth-2vhostvr256-1vm-mrr
+| 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.
@@ -201,7 +199,7 @@
 | | [Template] | Check RR for eth-l2bdbasemaclrn-eth-2vhostvr256-1vm
 | | framesize=IMIX_v4_1 | wt=2 | rxq=1
 
-| tc09-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.
@@ -213,7 +211,7 @@
 | | [Template] | Check RR for eth-l2bdbasemaclrn-eth-2vhostvr256-1vm
 | | framesize=${64} | wt=4 | rxq=2
 
-| tc10-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.
@@ -225,7 +223,7 @@
 | | [Template] | Check RR for eth-l2bdbasemaclrn-eth-2vhostvr256-1vm
 | | framesize=${1518} | wt=4 | rxq=2
 
-| tc11-9000B-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.
@@ -237,7 +235,7 @@
 | | [Template] | Check RR for eth-l2bdbasemaclrn-eth-2vhostvr256-1vm
 | | framesize=${9000} | wt=4 | rxq=2
 
-| tc12-IMIX-4t4c-ethip4-ip4base-eth-2vhostvr256-1vm-mrr
+| 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.