Use QEMU virtio queue size 1024 for perf tests

- use Build QEMU KW to apply patch to increase default virtio queue size - remove Set Scheduler Policy Change-Id: I04a7febd6366abd324d42f781645a8a0b520b325 Signed-off-by: Jan Gelety <jgelety@cisco.com>
author: Jan Gelety <jgelety@cisco.com> 2017-04-13 17:01:13 +0200
committer: Peter Mikus <pmikus@cisco.com> 2017-04-19 11:22:36 +0000
commit: 1cb9b4af51c289045a729cc9cbfc5f34aa54e948 (patch)
tree: 6b8fe6044ed82436babbfc14f38fb02148c95a4b /tests
parent: 25b577d61445aa0607725a0172b72b5c01582b73 (diff)
15 files changed, 4 insertions, 256 deletions
diff --git a/tests/perf/10ge2p1x520-dot1q-l2bdbasemaclrn-eth-2vhost-1vm-ndrpdrdisc.robot b/tests/perf/10ge2p1x520-dot1q-l2bdbasemaclrn-eth-2vhost-1vm-ndrpdrdisc.robot
index 1e78f1dc53..3dc54ae375 100644
--- a/tests/perf/10ge2p1x520-dot1q-l2bdbasemaclrn-eth-2vhost-1vm-ndrpdrdisc.robot
+++ b/tests/perf/10ge2p1x520-dot1q-l2bdbasemaclrn-eth-2vhost-1vm-ndrpdrdisc.robot
@@ -68,7 +68,6 @@
 | ${sock1}= | /tmp/sock-1-${bd_id1}
 | ${sock2}= | /tmp/sock-1-${bd_id2}
 
-
 *** Test Cases ***
 | tc01-64B-1t1c-dot1q-l2bdbasemaclrn-eth-2vhost-1vm-ndrdisc
 | | [Documentation]
@@ -100,7 +99,6 @@
 | | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
 | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
-| | And Setup scheduler policy for VPP on all DUTs
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
 | | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
 | | ... | ${threshold}
@@ -135,7 +133,6 @@
 | | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
 | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
-| | And Setup scheduler policy for VPP on all DUTs
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
 | | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
 | | ... | ${threshold} | ${perf_pdr_loss_acceptance}
@@ -171,7 +168,6 @@
 | | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
 | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
-| | And Setup scheduler policy for VPP on all DUTs
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
 | | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
 | | ... | ${threshold}
@@ -206,7 +202,6 @@
 | | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
 | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
-| | And Setup scheduler policy for VPP on all DUTs
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
 | | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
 | | ... | ${threshold} | ${perf_pdr_loss_acceptance}
@@ -244,7 +239,6 @@
 | | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
 | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
-| | And Setup scheduler policy for VPP on all DUTs
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
 | | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
 | | ... | ${threshold}
@@ -281,7 +275,6 @@
 | | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
 | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
-| | And Setup scheduler policy for VPP on all DUTs
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
 | | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
 | | ... | ${threshold} | ${perf_pdr_loss_acceptance}
@@ -317,7 +310,6 @@
 | | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
 | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
-| | And Setup scheduler policy for VPP on all DUTs
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
 | | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
 | | ... | ${threshold}
@@ -352,7 +344,6 @@
 | | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
 | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
-| | And Setup scheduler policy for VPP on all DUTs
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
 | | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
 | | ... | ${threshold} | ${perf_pdr_loss_acceptance}
@@ -388,7 +379,6 @@
 | | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
 | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
-| | And Setup scheduler policy for VPP on all DUTs
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
 | | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
 | | ... | ${threshold}
@@ -423,7 +413,6 @@
 | | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
 | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
-| | And Setup scheduler policy for VPP on all DUTs
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
 | | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
 | | ... | ${threshold} | ${perf_pdr_loss_acceptance}
@@ -461,7 +450,6 @@
 | | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
 | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
-| | And Setup scheduler policy for VPP on all DUTs
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
 | | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
 | | ... | ${threshold}
@@ -498,7 +486,6 @@
 | | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
 | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
-| | And Setup scheduler policy for VPP on all DUTs
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
 | | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
 | | ... | ${threshold} | ${perf_pdr_loss_acceptance}
@@ -534,7 +521,6 @@
 | | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
 | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
-| | And Setup scheduler policy for VPP on all DUTs
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
 | | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
 | | ... | ${threshold}
@@ -569,7 +555,6 @@
 | | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
 | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
-| | And Setup scheduler policy for VPP on all DUTs
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
 | | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
 | | ... | ${threshold} | ${perf_pdr_loss_acceptance}
@@ -605,7 +590,6 @@
 | | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
 | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
-| | And Setup scheduler policy for VPP on all DUTs
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
 | | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
 | | ... | ${threshold}
@@ -640,7 +624,6 @@
 | | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
 | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
-| | And Setup scheduler policy for VPP on all DUTs
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
 | | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
 | | ... | ${threshold} | ${perf_pdr_loss_acceptance}
@@ -678,7 +661,6 @@
 | | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
 | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
-| | And Setup scheduler policy for VPP on all DUTs
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
 | | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
 | | ... | ${threshold}
@@ -715,7 +697,6 @@
 | | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
 | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
-| | And Setup scheduler policy for VPP on all DUTs
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
 | | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
 | | ... | ${threshold} | ${perf_pdr_loss_acceptance}
diff --git a/tests/perf/10ge2p1x520-dot1q-l2xcbase-eth-2vhost-1vm-ndrpdrdisc.robot b/tests/perf/10ge2p1x520-dot1q-l2xcbase-eth-2vhost-1vm-ndrpdrdisc.robot
index 575bda7b59..4475073d25 100644
--- a/tests/perf/10ge2p1x520-dot1q-l2xcbase-eth-2vhost-1vm-ndrpdrdisc.robot
+++ b/tests/perf/10ge2p1x520-dot1q-l2xcbase-eth-2vhost-1vm-ndrpdrdisc.robot
@@ -95,7 +95,6 @@
 | | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
 | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
-| | And Setup scheduler policy for VPP on all DUTs
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
 | | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
 | | ... | ${threshold}
@@ -129,7 +128,6 @@
 | | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
 | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
-| | And Setup scheduler policy for VPP on all DUTs
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
 | | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
 | | ... | ${threshold} | ${perf_pdr_loss_acceptance}
@@ -164,7 +162,6 @@
 | | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
 | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
-| | And Setup scheduler policy for VPP on all DUTs
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
 | | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
 | | ... | ${threshold}
@@ -198,7 +195,6 @@
 | | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
 | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
-| | And Setup scheduler policy for VPP on all DUTs
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
 | | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
 | | ... | ${threshold} | ${perf_pdr_loss_acceptance}
@@ -235,7 +231,6 @@
 | | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
 | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
-| | And Setup scheduler policy for VPP on all DUTs
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
 | | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
 | | ... | ${threshold}
@@ -271,7 +266,6 @@
 | | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
 | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
-| | And Setup scheduler policy for VPP on all DUTs
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
 | | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
 | | ... | ${threshold} | ${perf_pdr_loss_acceptance}
@@ -306,7 +300,6 @@
 | | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
 | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
-| | And Setup scheduler policy for VPP on all DUTs
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
 | | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
 | | ... | ${threshold}
@@ -340,7 +333,6 @@
 | | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
 | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
-| | And Setup scheduler policy for VPP on all DUTs
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
 | | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
 | | ... | ${threshold} | ${perf_pdr_loss_acceptance}
@@ -375,7 +367,6 @@
 | | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
 | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
-| | And Setup scheduler policy for VPP on all DUTs
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
 | | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
 | | ... | ${threshold}
@@ -409,7 +400,6 @@
 | | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
 | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
-| | And Setup scheduler policy for VPP on all DUTs
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
 | | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
 | | ... | ${threshold} | ${perf_pdr_loss_acceptance}
@@ -446,7 +436,6 @@
 | | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
 | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
-| | And Setup scheduler policy for VPP on all DUTs
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
 | | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
 | | ... | ${threshold}
@@ -482,7 +471,6 @@
 | | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
 | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
-| | And Setup scheduler policy for VPP on all DUTs
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
 | | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
 | | ... | ${threshold} | ${perf_pdr_loss_acceptance}
@@ -517,7 +505,6 @@
 | | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
 | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
-| | And Setup scheduler policy for VPP on all DUTs
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
 | | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
 | | ... | ${threshold}
@@ -551,7 +538,6 @@
 | | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
 | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
-| | And Setup scheduler policy for VPP on all DUTs
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
 | | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
 | | ... | ${threshold} | ${perf_pdr_loss_acceptance}
@@ -586,7 +572,6 @@
 | | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
 | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
-| | And Setup scheduler policy for VPP on all DUTs
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
 | | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
 | | ... | ${threshold}
@@ -620,7 +605,6 @@
 | | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
 | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
-| | And Setup scheduler policy for VPP on all DUTs
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
 | | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
 | | ... | ${threshold} | ${perf_pdr_loss_acceptance}
@@ -657,7 +641,6 @@
 | | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
 | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
-| | And Setup scheduler policy for VPP on all DUTs
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
 | | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
 | | ... | ${threshold}
@@ -693,7 +676,6 @@
 | | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
 | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
-| | And Setup scheduler policy for VPP on all DUTs
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
 | | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
 | | ... | ${threshold} | ${perf_pdr_loss_acceptance}
diff --git a/tests/perf/10ge2p1x520-eth-l2bdbasemaclrn-eth-2vhost-1vm-ndrpdrdisc.robot b/tests/perf/10ge2p1x520-eth-l2bdbasemaclrn-eth-2vhost-1vm-ndrpdrdisc.robot
index 3f4309a91a..02a6d8a749 100644
--- a/tests/perf/10ge2p1x520-eth-l2bdbasemaclrn-eth-2vhost-1vm-ndrpdrdisc.robot
+++ b/tests/perf/10ge2p1x520-eth-l2bdbasemaclrn-eth-2vhost-1vm-ndrpdrdisc.robot
@@ -91,7 +91,6 @@
 | | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
 | | ...     | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
-| | And Setup scheduler policy for VPP on all DUTs
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
 | | ...                                       | ${binary_max} | 3-node-bridge
 | | ...                                       | ${min_rate} | ${max_rate}
@@ -123,7 +122,6 @@
 | | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
 | | ...     | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
-| | And Setup scheduler policy for VPP on all DUTs
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
 | | ...                                       | ${binary_max} | 3-node-bridge
 | | ...                                       | ${min_rate} | ${max_rate}
@@ -157,7 +155,6 @@
 | | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
 | | ...     | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
-| | And Setup scheduler policy for VPP on all DUTs
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
 | | ...                                       | ${binary_max} | 3-node-bridge
 | | ...                                       | ${min_rate} | ${max_rate}
@@ -189,7 +186,6 @@
 | | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
 | | ...     | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
-| | And Setup scheduler policy for VPP on all DUTs
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
 | | ...                                       | ${binary_max} | 3-node-bridge
 | | ...                                       | ${min_rate} | ${max_rate}
@@ -224,7 +220,6 @@
 | | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
 | | ...     | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
-| | And Setup scheduler policy for VPP on all DUTs
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
 | | ...                                       | ${binary_max} | 3-node-bridge
 | | ...                                       | ${min_rate} | ${max_rate}
@@ -257,7 +252,6 @@
 | | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
 | | ...     | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
-| | And Setup scheduler policy for VPP on all DUTs
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
 | | ...                                       | ${binary_max} | 3-node-bridge
 | | ...                                       | ${min_rate} | ${max_rate}
@@ -291,7 +285,6 @@
 | | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
 | | ...     | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
-| | And Setup scheduler policy for VPP on all DUTs
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
 | | ...                                       | ${binary_max} | 3-node-bridge
 | | ...                                       | ${min_rate} | ${max_rate}
@@ -323,7 +316,6 @@
 | | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
 | | ...     | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
-| | And Setup scheduler policy for VPP on all DUTs
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
 | | ...                                       | ${binary_max} | 3-node-bridge
 | | ...                                       | ${min_rate} | ${max_rate}
@@ -357,7 +349,6 @@
 | | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
 | | ...     | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
-| | And Setup scheduler policy for VPP on all DUTs
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
 | | ...                                       | ${binary_max} | 3-node-bridge
 | | ...                                       | ${min_rate} | ${max_rate}
@@ -389,7 +380,6 @@
 | | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
 | | ...     | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
-| | And Setup scheduler policy for VPP on all DUTs
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
 | | ...                                       | ${binary_max} | 3-node-bridge
 | | ...                                       | ${min_rate} | ${max_rate}
@@ -424,7 +414,6 @@
 | | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
 | | ...     | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
-| | And Setup scheduler policy for VPP on all DUTs
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
 | | ...                                       | ${binary_max} | 3-node-bridge
 | | ...                                       | ${min_rate} | ${max_rate}
@@ -457,7 +446,6 @@
 | | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
 | | ...     | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
-| | And Setup scheduler policy for VPP on all DUTs
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
 | | ...                                       | ${binary_max} | 3-node-bridge
 | | ...                                       | ${min_rate} | ${max_rate}
@@ -491,7 +479,6 @@
 | | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
 | | ...     | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
-| | And Setup scheduler policy for VPP on all DUTs
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
 | | ...                                       | ${binary_max} | 3-node-bridge
 | | ...                                       | ${min_rate} | ${max_rate}
@@ -523,7 +510,6 @@
 | | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
 | | ...     | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
-| | And Setup scheduler policy for VPP on all DUTs
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
 | | ...                                       | ${binary_max} | 3-node-bridge
 | | ...                                       | ${min_rate} | ${max_rate}
@@ -557,7 +543,6 @@
 | | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
 | | ...     | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
-| | And Setup scheduler policy for VPP on all DUTs
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
 | | ...                                       | ${binary_max} | 3-node-bridge
 | | ...                                       | ${min_rate} | ${max_rate}
@@ -589,7 +574,6 @@
 | | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
 | | ...     | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
-| | And Setup scheduler policy for VPP on all DUTs
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
 | | ...                                       | ${binary_max} | 3-node-bridge
 | | ...                                       | ${min_rate} | ${max_rate}
@@ -624,7 +608,6 @@
 | | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
 | | ...     | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
-| | And Setup scheduler policy for VPP on all DUTs
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
 | | ...                                       | ${binary_max} | 3-node-bridge
 | | ...                                       | ${min_rate} | ${max_rate}
@@ -657,7 +640,6 @@
 | | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
 | | ...     | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
-| | And Setup scheduler policy for VPP on all DUTs
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
 | | ...                                       | ${binary_max} | 3-node-bridge
 | | ...                                       | ${min_rate} | ${max_rate}
diff --git a/tests/perf/10ge2p1x520-eth-l2bdbasemaclrn-eth-4vhost-2vm-ndrpdrdisc.robot b/tests/perf/10ge2p1x520-eth-l2bdbasemaclrn-eth-4vhost-2vm-ndrpdrdisc.robot
index 0f2b6ddc80..66a2a36de2 100644
--- a/tests/perf/10ge2p1x520-eth-l2bdbasemaclrn-eth-4vhost-2vm-ndrpdrdisc.robot
+++ b/tests/perf/10ge2p1x520-eth-l2bdbasemaclrn-eth-4vhost-2vm-ndrpdrdisc.robot
@@ -84,7 +84,6 @@
 | | And   Apply startup configuration on all VPP DUTs
 | | When  L2 bridge domains with Vhost-User for '2' VMs initialized in a 3-node circular topology
 | | And   '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology
-| | And   Setup scheduler policy for VPP on all DUTs
 | | Then  Find NDR using binary search and pps
 | | ...   | ${framesize} | ${binary_min} | ${binary_max} | 3-node-bridge
 | | ...   | ${min_rate} | ${max_rate} | ${threshold}
@@ -111,7 +110,6 @@
 | | And   Apply startup configuration on all VPP DUTs
 | | When  L2 bridge domains with Vhost-User for '2' VMs initialized in a 3-node circular topology
 | | And   '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology
-| | And   Setup scheduler policy for VPP on all DUTs
 | | Then  Find PDR using binary search and pps
 | | ...   | ${framesize} | ${binary_min} | ${binary_max} | 3-node-bridge
 | | ...   | ${min_rate} | ${max_rate} | ${threshold}
@@ -139,7 +137,6 @@
 | | And   Apply startup configuration on all VPP DUTs
 | | When  L2 bridge domains with Vhost-User for '2' VMs initialized in a 3-node circular topology
 | | And   '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology
-| | And   Setup scheduler policy for VPP on all DUTs
 | | Then  Find NDR using binary search and pps
 | | ...   | ${framesize} | ${binary_min} | ${binary_max} | 3-node-bridge
 | | ...   | ${min_rate} | ${max_rate} | ${threshold}
@@ -166,7 +163,6 @@
 | | And   Apply startup configuration on all VPP DUTs
 | | When  L2 bridge domains with Vhost-User for '2' VMs initialized in a 3-node circular topology
 | | And   '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology
-| | And   Setup scheduler policy for VPP on all DUTs
 | | Then  Find PDR using binary search and pps
 | | ...   | ${framesize} | ${binary_min} | ${binary_max} | 3-node-bridge
 | | ...   | ${min_rate} | ${max_rate} | ${threshold}
@@ -195,7 +191,6 @@
 | | And   Apply startup configuration on all VPP DUTs
 | | When  L2 bridge domains with Vhost-User for '2' VMs initialized in a 3-node circular topology
 | | And   '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology
-| | And   Setup scheduler policy for VPP on all DUTs
 | | Then  Find NDR using binary search and pps
 | | ...   | ${framesize} | ${binary_min} | ${binary_max} | 3-node-bridge
 | | ...   | ${min_rate} | ${max_rate} | ${threshold}
@@ -223,7 +218,6 @@
 | | And   Apply startup configuration on all VPP DUTs
 | | When  L2 bridge domains with Vhost-User for '2' VMs initialized in a 3-node circular topology
 | | And   '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology
-| | And   Setup scheduler policy for VPP on all DUTs
 | | Then  Find PDR using binary search and pps
 | | ...   | ${framesize} | ${binary_min} | ${binary_max} | 3-node-bridge
 | | ...   | ${min_rate} | ${max_rate} | ${threshold}
@@ -251,7 +245,6 @@
 | | And   Apply startup configuration on all VPP DUTs
 | | When  L2 bridge domains with Vhost-User for '2' VMs initialized in a 3-node circular topology
 | | And   '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology
-| | And   Setup scheduler policy for VPP on all DUTs
 | | Then  Find NDR using binary search and pps
 | | ...   | ${framesize} | ${binary_min} | ${binary_max} | 3-node-bridge
 | | ...   | ${min_rate} | ${max_rate} | ${threshold}
@@ -278,7 +271,6 @@
 | | And   Apply startup configuration on all VPP DUTs
 | | When  L2 bridge domains with Vhost-User for '2' VMs initialized in a 3-node circular topology
 | | And   '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology
-| | And   Setup scheduler policy for VPP on all DUTs
 | | Then  Find PDR using binary search and pps
 | | ...   | ${framesize} | ${binary_min} | ${binary_max} | 3-node-bridge
 | | ...   | ${min_rate} | ${max_rate} | ${threshold}
@@ -306,7 +298,6 @@
 | | And   Apply startup configuration on all VPP DUTs
 | | When  L2 bridge domains with Vhost-User for '2' VMs initialized in a 3-node circular topology
 | | And   '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology
-| | And   Setup scheduler policy for VPP on all DUTs
 | | Then  Find NDR using binary search and pps
 | | ...   | ${framesize} | ${binary_min} | ${binary_max} | 3-node-bridge
 | | ...   | ${min_rate} | ${max_rate} | ${threshold}
@@ -333,7 +324,6 @@
 | | And   Apply startup configuration on all VPP DUTs
 | | When  L2 bridge domains with Vhost-User for '2' VMs initialized in a 3-node circular topology
 | | And   '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology
-| | And   Setup scheduler policy for VPP on all DUTs
 | | Then  Find PDR using binary search and pps
 | | ...   | ${framesize} | ${binary_min} | ${binary_max} | 3-node-bridge
 | | ...   | ${min_rate} | ${max_rate} | ${threshold}
@@ -362,7 +352,6 @@
 | | And   Apply startup configuration on all VPP DUTs
 | | When  L2 bridge domains with Vhost-User for '2' VMs initialized in a 3-node circular topology
 | | And   '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology
-| | And   Setup scheduler policy for VPP on all DUTs
 | | Then  Find NDR using binary search and pps
 | | ...   | ${framesize} | ${binary_min} | ${binary_max} | 3-node-bridge
 | | ...   | ${min_rate} | ${max_rate} | ${threshold}
@@ -390,7 +379,6 @@
 | | And   Apply startup configuration on all VPP DUTs
 | | When  L2 bridge domains with Vhost-User for '2' VMs initialized in a 3-node circular topology
 | | And   '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology
-| | And   Setup scheduler policy for VPP on all DUTs
 | | Then  Find PDR using binary search and pps
 | | ...   | ${framesize} | ${binary_min} | ${binary_max} | 3-node-bridge
 | | ...   | ${min_rate} | ${max_rate} | ${threshold}
@@ -418,7 +406,6 @@
 | | And   Apply startup configuration on all VPP DUTs
 | | When  L2 bridge domains with Vhost-User for '2' VMs initialized in a 3-node circular topology
 | | And   '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology
-| | And   Setup scheduler policy for VPP on all DUTs
 | | Then  Find NDR using binary search and pps
 | | ...   | ${framesize} | ${binary_min} | ${binary_max} | 3-node-bridge
 | | ...   | ${min_rate} | ${max_rate} | ${threshold}
@@ -445,7 +432,6 @@
 | | And   Apply startup configuration on all VPP DUTs
 | | When  L2 bridge domains with Vhost-User for '2' VMs initialized in a 3-node circular topology
 | | And   '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology
-| | And   Setup scheduler policy for VPP on all DUTs
 | | Then  Find PDR using binary search and pps
 | | ...   | ${framesize} | ${binary_min} | ${binary_max} | 3-node-bridge
 | | ...   | ${min_rate} | ${max_rate} | ${threshold}
@@ -473,7 +459,6 @@
 | | And   Apply startup configuration on all VPP DUTs
 | | When  L2 bridge domains with Vhost-User for '2' VMs initialized in a 3-node circular topology
 | | And   '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology
-| | And   Setup scheduler policy for VPP on all DUTs
 | | Then  Find NDR using binary search and pps
 | | ...   | ${framesize} | ${binary_min} | ${binary_max} | 3-node-bridge
 | | ...   | ${min_rate} | ${max_rate} | ${threshold}
@@ -500,7 +485,6 @@
 | | And   Apply startup configuration on all VPP DUTs
 | | When  L2 bridge domains with Vhost-User for '2' VMs initialized in a 3-node circular topology
 | | And   '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology
-| | And   Setup scheduler policy for VPP on all DUTs
 | | Then  Find PDR using binary search and pps
 | | ...   | ${framesize} | ${binary_min} | ${binary_max} | 3-node-bridge
 | | ...   | ${min_rate} | ${max_rate} | ${threshold}
@@ -529,7 +513,6 @@
 | | And   Apply startup configuration on all VPP DUTs
 | | When  L2 bridge domains with Vhost-User for '2' VMs initialized in a 3-node circular topology
 | | And   '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology
-| | And   Setup scheduler policy for VPP on all DUTs
 | | Then  Find NDR using binary search and pps
 | | ...   | ${framesize} | ${binary_min} | ${binary_max} | 3-node-bridge
 | | ...   | ${min_rate} | ${max_rate} | ${threshold}
@@ -557,7 +540,6 @@
 | | And   Apply startup configuration on all VPP DUTs
 | | When  L2 bridge domains with Vhost-User for '2' VMs initialized in a 3-node circular topology
 | | And   '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology
-| | And   Setup scheduler policy for VPP on all DUTs
 | | Then  Find PDR using binary search and pps
 | | ...   | ${framesize} | ${binary_min} | ${binary_max} | 3-node-bridge
 | | ...   | ${min_rate} | ${max_rate} | ${threshold}
diff --git a/tests/perf/10ge2p1x520-eth-l2xcbase-eth-2vhost-1vm-ndrpdrdisc.robot b/tests/perf/10ge2p1x520-eth-l2xcbase-eth-2vhost-1vm-ndrpdrdisc.robot
index 97f0bf511f..2611485268 100644
--- a/tests/perf/10ge2p1x520-eth-l2xcbase-eth-2vhost-1vm-ndrpdrdisc.robot
+++ b/tests/perf/10ge2p1x520-eth-l2xcbase-eth-2vhost-1vm-ndrpdrdisc.robot
@@ -62,6 +62,7 @@
 # X520-DA2 bandwidth limit
 | ${s_limit} | ${10000000000}
 
+
 *** Test Cases ***
 | tc01-64B-1t1c-eth-l2xcbase-eth-2vhost-1vm-ndrdisc
 | | [Documentation]
@@ -89,7 +90,6 @@
 | | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
 | | ...     | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
-| | And Setup scheduler policy for VPP on all DUTs
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
 | | ...                                       | ${binary_max} | 3-node-xconnect
 | | ...                                       | ${min_rate} | ${max_rate}
@@ -121,7 +121,6 @@
 | | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
 | | ...     | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
-| | And Setup scheduler policy for VPP on all DUTs
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
 | | ...                                       | ${binary_max} | 3-node-xconnect
 | | ...                                       | ${min_rate} | ${max_rate}
@@ -155,7 +154,6 @@
 | | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
 | | ...     | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
-| | And Setup scheduler policy for VPP on all DUTs
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
 | | ...                                       | ${binary_max} | 3-node-xconnect
 | | ...                                       | ${min_rate} | ${max_rate}
@@ -187,7 +185,6 @@
 | | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
 | | ...     | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
-| | And Setup scheduler policy for VPP on all DUTs
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
 | | ...                                       | ${binary_max} | 3-node-xconnect
 | | ...                                       | ${min_rate} | ${max_rate}
@@ -222,7 +219,6 @@
 | | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
 | | ...     | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
-| | And Setup scheduler policy for VPP on all DUTs
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
 | | ...                                       | ${binary_max} | 3-node-xconnect
 | | ...                                       | ${min_rate} | ${max_rate}
@@ -255,7 +251,6 @@
 | | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
 | | ...     | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
-| | And Setup scheduler policy for VPP on all DUTs
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
 | | ...                                       | ${binary_max} | 3-node-xconnect
 | | ...                                       | ${min_rate} | ${max_rate}
@@ -289,7 +284,6 @@
 | | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
 | | ...     | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
-| | And Setup scheduler policy for VPP on all DUTs
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
 | | ...                                       | ${binary_max} | 3-node-xconnect
 | | ...                                       | ${min_rate} | ${max_rate}
@@ -321,7 +315,6 @@
 | | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
 | | ...     | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
-| | And Setup scheduler policy for VPP on all DUTs
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
 | | ...                                       | ${binary_max} | 3-node-xconnect
 | | ...                                       | ${min_rate} | ${max_rate}
@@ -355,7 +348,6 @@
 | | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
 | | ...     | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
-| | And Setup scheduler policy for VPP on all DUTs
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
 | | ...                                       | ${binary_max} | 3-node-xconnect
 | | ...                                       | ${min_rate} | ${max_rate}
@@ -387,7 +379,6 @@
 | | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
 | | ...     | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
-| | And Setup scheduler policy for VPP on all DUTs
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
 | | ...                                       | ${binary_max} | 3-node-xconnect
 | | ...                                       | ${min_rate} | ${max_rate}
@@ -422,7 +413,6 @@
 | | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
 | | ...     | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
-| | And Setup scheduler policy for VPP on all DUTs
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
 | | ...                                       | ${binary_max} | 3-node-xconnect
 | | ...                                       | ${min_rate} | ${max_rate}
@@ -455,7 +445,6 @@
 | | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
 | | ...     | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
-| | And Setup scheduler policy for VPP on all DUTs
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
 | | ...                                       | ${binary_max} | 3-node-xconnect
 | | ...                                       | ${min_rate} | ${max_rate}
@@ -489,7 +478,6 @@
 | | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
 | | ...     | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
-| | And Setup scheduler policy for VPP on all DUTs
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
 | | ...                                       | ${binary_max} | 3-node-xconnect
 | | ...                                       | ${min_rate} | ${max_rate}
@@ -521,7 +509,6 @@
 | | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
 | | ...     | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
-| | And Setup scheduler policy for VPP on all DUTs
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
 | | ...                                       | ${binary_max} | 3-node-xconnect
 | | ...                                       | ${min_rate} | ${max_rate}
@@ -555,7 +542,6 @@
 | | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
 | | ...     | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
-| | And Setup scheduler policy for VPP on all DUTs
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
 | | ...                                       | ${binary_max} | 3-node-xconnect
 | | ...                                       | ${min_rate} | ${max_rate}
@@ -587,7 +573,6 @@
 | | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
 | | ...     | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
-| | And Setup scheduler policy for VPP on all DUTs
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
 | | ...                                       | ${binary_max} | 3-node-xconnect
 | | ...                                       | ${min_rate} | ${max_rate}
@@ -622,7 +607,6 @@
 | | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
 | | ...     | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
-| | And Setup scheduler policy for VPP on all DUTs
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
 | | ...                                       | ${binary_max} | 3-node-xconnect
 | | ...                                       | ${min_rate} | ${max_rate}
@@ -655,7 +639,6 @@
 | | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
 | | ...     | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
-| | And Setup scheduler policy for VPP on all DUTs
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
 | | ...                                       | ${binary_max} | 3-node-xconnect
 | | ...                                       | ${min_rate} | ${max_rate}
diff --git a/tests/perf/10ge2p1x520-eth-l2xcbase-eth-4vhost-2vm-ndrpdrdisc.robot b/tests/perf/10ge2p1x520-eth-l2xcbase-eth-4vhost-2vm-ndrpdrdisc.robot
index d58458f72b..12b3234539 100644
--- a/tests/perf/10ge2p1x520-eth-l2xcbase-eth-4vhost-2vm-ndrpdrdisc.robot
+++ b/tests/perf/10ge2p1x520-eth-l2xcbase-eth-4vhost-2vm-ndrpdrdisc.robot
@@ -85,7 +85,6 @@
 | | And   Apply startup configuration on all VPP DUTs
 | | When  L2 xconnect with Vhost-User for '2' initialized in a 3-node circular topology
 | | And   '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology
-| | And   Setup scheduler policy for VPP on all DUTs
 | | Then  Find NDR using binary search and pps
 | | ...   | ${framesize} | ${binary_min} | ${binary_max} | 3-node-xconnect
 | | ...   | ${min_rate} | ${max_rate} | ${threshold}
@@ -112,7 +111,6 @@
 | | And   Apply startup configuration on all VPP DUTs
 | | When  L2 xconnect with Vhost-User for '2' initialized in a 3-node circular topology
 | | And   '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology
-| | And   Setup scheduler policy for VPP on all DUTs
 | | Then  Find PDR using binary search and pps
 | | ...   | ${framesize} | ${binary_min} | ${binary_max} | 3-node-xconnect
 | | ...   | ${min_rate} | ${max_rate} | ${threshold}
@@ -140,7 +138,6 @@
 | | And   Apply startup configuration on all VPP DUTs
 | | When  L2 xconnect with Vhost-User for '2' initialized in a 3-node circular topology
 | | And   '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology
-| | And   Setup scheduler policy for VPP on all DUTs
 | | Then  Find NDR using binary search and pps
 | | ...   | ${framesize} | ${binary_min} | ${binary_max} | 3-node-xconnect
 | | ...   | ${min_rate} | ${max_rate} | ${threshold}
@@ -167,7 +164,6 @@
 | | And   Apply startup configuration on all VPP DUTs
 | | When  L2 xconnect with Vhost-User for '2' initialized in a 3-node circular topology
 | | And   '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology
-| | And   Setup scheduler policy for VPP on all DUTs
 | | Then  Find PDR using binary search and pps
 | | ...   | ${framesize} | ${binary_min} | ${binary_max} | 3-node-xconnect
 | | ...   | ${min_rate} | ${max_rate} | ${threshold}
@@ -196,7 +192,6 @@
 | | And   Apply startup configuration on all VPP DUTs
 | | When  L2 xconnect with Vhost-User for '2' initialized in a 3-node circular topology
 | | And   '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology
-| | And   Setup scheduler policy for VPP on all DUTs
 | | Then  Find NDR using binary search and pps
 | | ...   | ${framesize} | ${binary_min} | ${binary_max} | 3-node-xconnect
 | | ...   | ${min_rate} | ${max_rate} | ${threshold}
@@ -224,7 +219,6 @@
 | | And   Apply startup configuration on all VPP DUTs
 | | When  L2 xconnect with Vhost-User for '2' initialized in a 3-node circular topology
 | | And   '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology
-| | And   Setup scheduler policy for VPP on all DUTs
 | | Then  Find PDR using binary search and pps
 | | ...   | ${framesize} | ${binary_min} | ${binary_max} | 3-node-xconnect
 | | ...   | ${min_rate} | ${max_rate} | ${threshold}
@@ -252,7 +246,6 @@
 | | And   Apply startup configuration on all VPP DUTs
 | | When  L2 xconnect with Vhost-User for '2' initialized in a 3-node circular topology
 | | And   '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology
-| | And   Setup scheduler policy for VPP on all DUTs
 | | Then  Find NDR using binary search and pps
 | | ...   | ${framesize} | ${binary_min} | ${binary_max} | 3-node-xconnect
 | | ...   | ${min_rate} | ${max_rate} | ${threshold}
@@ -279,7 +272,6 @@
 | | And   Apply startup configuration on all VPP DUTs
 | | When  L2 xconnect with Vhost-User for '2' initialized in a 3-node circular topology
 | | And   '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology
-| | And   Setup scheduler policy for VPP on all DUTs
 | | Then  Find PDR using binary search and pps
 | | ...   | ${framesize} | ${binary_min} | ${binary_max} | 3-node-xconnect
 | | ...   | ${min_rate} | ${max_rate} | ${threshold}
@@ -307,7 +299,6 @@
 | | And   Apply startup configuration on all VPP DUTs
 | | When  L2 xconnect with Vhost-User for '2' initialized in a 3-node circular topology
 | | And   '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology
-| | And   Setup scheduler policy for VPP on all DUTs
 | | Then  Find NDR using binary search and pps
 | | ...   | ${framesize} | ${binary_min} | ${binary_max} | 3-node-xconnect
 | | ...   | ${min_rate} | ${max_rate} | ${threshold}
@@ -334,7 +325,6 @@
 | | And   Apply startup configuration on all VPP DUTs
 | | When  L2 xconnect with Vhost-User for '2' initialized in a 3-node circular topology
 | | And   '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology
-| | And   Setup scheduler policy for VPP on all DUTs
 | | Then  Find PDR using binary search and pps
 | | ...   | ${framesize} | ${binary_min} | ${binary_max} | 3-node-xconnect
 | | ...   | ${min_rate} | ${max_rate} | ${threshold}
@@ -363,7 +353,6 @@
 | | And   Apply startup configuration on all VPP DUTs
 | | When  L2 xconnect with Vhost-User for '2' initialized in a 3-node circular topology
 | | And   '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology
-| | And   Setup scheduler policy for VPP on all DUTs
 | | Then  Find NDR using binary search and pps
 | | ...   | ${framesize} | ${binary_min} | ${binary_max} | 3-node-xconnect
 | | ...   | ${min_rate} | ${max_rate} | ${threshold}
@@ -391,7 +380,6 @@
 | | And   Apply startup configuration on all VPP DUTs
 | | When  L2 xconnect with Vhost-User for '2' initialized in a 3-node circular topology
 | | And   '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology
-| | And   Setup scheduler policy for VPP on all DUTs
 | | Then  Find PDR using binary search and pps
 | | ...   | ${framesize} | ${binary_min} | ${binary_max} | 3-node-xconnect
 | | ...   | ${min_rate} | ${max_rate} | ${threshold}
@@ -419,7 +407,6 @@
 | | And   Apply startup configuration on all VPP DUTs
 | | When  L2 xconnect with Vhost-User for '2' initialized in a 3-node circular topology
 | | And   '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology
-| | And   Setup scheduler policy for VPP on all DUTs
 | | Then  Find NDR using binary search and pps
 | | ...   | ${framesize} | ${binary_min} | ${binary_max} | 3-node-xconnect
 | | ...   | ${min_rate} | ${max_rate} | ${threshold}
@@ -446,7 +433,6 @@
 | | And   Apply startup configuration on all VPP DUTs
 | | When  L2 xconnect with Vhost-User for '2' initialized in a 3-node circular topology
 | | And   '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology
-| | And   Setup scheduler policy for VPP on all DUTs
 | | Then  Find PDR using binary search and pps
 | | ...   | ${framesize} | ${binary_min} | ${binary_max} | 3-node-xconnect
 | | ...   | ${min_rate} | ${max_rate} | ${threshold}
@@ -474,7 +460,6 @@
 | | And   Apply startup configuration on all VPP DUTs
 | | When  L2 xconnect with Vhost-User for '2' initialized in a 3-node circular topology
 | | And   '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology
-| | And   Setup scheduler policy for VPP on all DUTs
 | | Then  Find NDR using binary search and pps
 | | ...   | ${framesize} | ${binary_min} | ${binary_max} | 3-node-xconnect
 | | ...   | ${min_rate} | ${max_rate} | ${threshold}
@@ -501,7 +486,6 @@
 | | And   Apply startup configuration on all VPP DUTs
 | | When  L2 xconnect with Vhost-User for '2' initialized in a 3-node circular topology
 | | And   '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology
-| | And   Setup scheduler policy for VPP on all DUTs
 | | Then  Find PDR using binary search and pps
 | | ...   | ${framesize} | ${binary_min} | ${binary_max} | 3-node-xconnect
 | | ...   | ${min_rate} | ${max_rate} | ${threshold}
@@ -530,7 +514,6 @@
 | | And   Apply startup configuration on all VPP DUTs
 | | When  L2 xconnect with Vhost-User for '2' initialized in a 3-node circular topology
 | | And   '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology
-| | And   Setup scheduler policy for VPP on all DUTs
 | | Then  Find NDR using binary search and pps
 | | ...   | ${framesize} | ${binary_min} | ${binary_max} | 3-node-xconnect
 | | ...   | ${min_rate} | ${max_rate} | ${threshold}
@@ -558,7 +541,6 @@
 | | And   Apply startup configuration on all VPP DUTs
 | | When  L2 xconnect with Vhost-User for '2' initialized in a 3-node circular topology
 | | And   '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology
-| | And   Setup scheduler policy for VPP on all DUTs
 | | Then  Find PDR using binary search and pps
 | | ...   | ${framesize} | ${binary_min} | ${binary_max} | 3-node-xconnect
 | | ...   | ${min_rate} | ${max_rate} | ${threshold}
diff --git a/tests/perf/10ge2p1x520-ethip4-ip4base-eth-2vhost-1vm-ndrpdrdisc.robot b/tests/perf/10ge2p1x520-ethip4-ip4base-eth-2vhost-1vm-ndrpdrdisc.robot
index bde5fe832c..20bb018df7 100644
--- a/tests/perf/10ge2p1x520-ethip4-ip4base-eth-2vhost-1vm-ndrpdrdisc.robot
+++ b/tests/perf/10ge2p1x520-ethip4-ip4base-eth-2vhost-1vm-ndrpdrdisc.robot
@@ -92,7 +92,6 @@
 | | ...     | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | ${dut2_vif1_mac}
 | | ...     | ${dut2_vif2_mac}
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
-| | And Setup scheduler policy for VPP on all DUTs
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
 | | ...                                       | ${binary_max} | 3-node-IPv4
 | | ...                                       | ${min_rate} | ${max_rate}
@@ -126,7 +125,6 @@
 | | ...     | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | ${dut2_vif1_mac}
 | | ...     | ${dut2_vif2_mac}
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
-| | And Setup scheduler policy for VPP on all DUTs
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
 | | ...                                       | ${binary_max} | 3-node-IPv4
 | | ...                                       | ${min_rate} | ${max_rate}
@@ -162,7 +160,6 @@
 | | ...     | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | ${dut2_vif1_mac}
 | | ...     | ${dut2_vif2_mac}
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
-| | And Setup scheduler policy for VPP on all DUTs
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
 | | ...                                       | ${binary_max} | 3-node-IPv4
 | | ...                                       | ${min_rate} | ${max_rate}
@@ -196,7 +193,6 @@
 | | ...     | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | ${dut2_vif1_mac}
 | | ...     | ${dut2_vif2_mac}
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
-| | And Setup scheduler policy for VPP on all DUTs
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
 | | ...                                       | ${binary_max} | 3-node-IPv4
 | | ...                                       | ${min_rate} | ${max_rate}
@@ -233,7 +229,6 @@
 | | ...     | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | ${dut2_vif1_mac}
 | | ...     | ${dut2_vif2_mac}
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
-| | And Setup scheduler policy for VPP on all DUTs
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
 | | ...                                       | ${binary_max} | 3-node-IPv4
 | | ...                                       | ${min_rate} | ${max_rate}
@@ -268,7 +263,6 @@
 | | ...     | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | ${dut2_vif1_mac}
 | | ...     | ${dut2_vif2_mac}
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
-| | And Setup scheduler policy for VPP on all DUTs
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
 | | ...                                       | ${binary_max} | 3-node-IPv4
 | | ...                                       | ${min_rate} | ${max_rate}
@@ -304,7 +298,6 @@
 | | ...     | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | ${dut2_vif1_mac}
 | | ...     | ${dut2_vif2_mac}
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
-| | And Setup scheduler policy for VPP on all DUTs
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
 | | ...                                       | ${binary_max} | 3-node-IPv4
 | | ...                                       | ${min_rate} | ${max_rate}
@@ -338,7 +331,6 @@
 | | ...     | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | ${dut2_vif1_mac}
 | | ...     | ${dut2_vif2_mac}
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
-| | And Setup scheduler policy for VPP on all DUTs
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
 | | ...                                       | ${binary_max} | 3-node-IPv4
 | | ...                                       | ${min_rate} | ${max_rate}
@@ -374,7 +366,6 @@
 | | ...     | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | ${dut2_vif1_mac}
 | | ...     | ${dut2_vif2_mac}
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
-| | And Setup scheduler policy for VPP on all DUTs
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
 | | ...                                       | ${binary_max} | 3-node-IPv4
 | | ...                                       | ${min_rate} | ${max_rate}
@@ -408,7 +399,6 @@
 | | ...     | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | ${dut2_vif1_mac}
 | | ...     | ${dut2_vif2_mac}
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
-| | And Setup scheduler policy for VPP on all DUTs
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
 | | ...                                       | ${binary_max} | 3-node-IPv4
 | | ...                                       | ${min_rate} | ${max_rate}
@@ -445,7 +435,6 @@
 | | ...     | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | ${dut2_vif1_mac}
 | | ...     | ${dut2_vif2_mac}
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
-| | And Setup scheduler policy for VPP on all DUTs
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
 | | ...                                       | ${binary_max} | 3-node-IPv4
 | | ...                                       | ${min_rate} | ${max_rate}
@@ -480,7 +469,6 @@
 | | ...     | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | ${dut2_vif1_mac}
 | | ...     | ${dut2_vif2_mac}
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
-| | And Setup scheduler policy for VPP on all DUTs
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
 | | ...                                       | ${binary_max} | 3-node-IPv4
 | | ...                                       | ${min_rate} | ${max_rate}
@@ -516,7 +504,6 @@
 | | ...     | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | ${dut2_vif1_mac}
 | | ...     | ${dut2_vif2_mac}
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
-| | And Setup scheduler policy for VPP on all DUTs
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
 | | ...                                       | ${binary_max} | 3-node-IPv4
 | | ...                                       | ${min_rate} | ${max_rate}
@@ -550,7 +537,6 @@
 | | ...     | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | ${dut2_vif1_mac}
 | | ...     | ${dut2_vif2_mac}
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
-| | And Setup scheduler policy for VPP on all DUTs
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
 | | ...                                       | ${binary_max} | 3-node-IPv4
 | | ...                                       | ${min_rate} | ${max_rate}
@@ -586,7 +572,6 @@
 | | ...     | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | ${dut2_vif1_mac}
 | | ...     | ${dut2_vif2_mac}
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
-| | And Setup scheduler policy for VPP on all DUTs
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
 | | ...                                       | ${binary_max} | 3-node-IPv4
 | | ...                                       | ${min_rate} | ${max_rate}
@@ -620,7 +605,6 @@
 | | ...     | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | ${dut2_vif1_mac}
 | | ...     | ${dut2_vif2_mac}
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
-| | And Setup scheduler policy for VPP on all DUTs
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
 | | ...                                       | ${binary_max} | 3-node-IPv4
 | | ...                                       | ${min_rate} | ${max_rate}
@@ -657,7 +641,6 @@
 | | ...     | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | ${dut2_vif1_mac}
 | | ...     | ${dut2_vif2_mac}
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
-| | And Setup scheduler policy for VPP on all DUTs
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
 | | ...                                       | ${binary_max} | 3-node-IPv4
 | | ...                                       | ${min_rate} | ${max_rate}
@@ -692,7 +675,6 @@
 | | ...     | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | ${dut2_vif1_mac}
 | | ...     | ${dut2_vif2_mac}
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
-| | And Setup scheduler policy for VPP on all DUTs
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
 | | ...                                       | ${binary_max} | 3-node-IPv4
 | | ...                                       | ${min_rate} | ${max_rate}
diff --git a/tests/perf/10ge2p1x520-ethip4-ip4base-eth-4vhost-2vm-ndrpdrdisc.robot b/tests/perf/10ge2p1x520-ethip4-ip4base-eth-4vhost-2vm-ndrpdrdisc.robot
index 21e3c44ae9..3aa624cf21 100644
--- a/tests/perf/10ge2p1x520-ethip4-ip4base-eth-4vhost-2vm-ndrpdrdisc.robot
+++ b/tests/perf/10ge2p1x520-ethip4-ip4base-eth-4vhost-2vm-ndrpdrdisc.robot
@@ -86,7 +86,6 @@
 | | And   Apply startup configuration on all VPP DUTs
 | | When  IPv4 forwarding with Vhost-User for '2' VMs initialized in a 3-node circular topology
 | | And   '2' Guest VMs with dpdk-testpmd-mac connected via vhost-user is setup in a 3-node circular topology
-| | And   Setup scheduler policy for VPP on all DUTs
 | | Then  Find NDR using binary search and pps
 | | ...   | ${framesize} | ${binary_min} | ${binary_max} | 3-node-IPv4
 | | ...   | ${min_rate} | ${max_rate} | ${threshold}
@@ -113,7 +112,6 @@
 | | And   Apply startup configuration on all VPP DUTs
 | | When  IPv4 forwarding with Vhost-User for '2' VMs initialized in a 3-node circular topology
 | | And   '2' Guest VMs with dpdk-testpmd-mac connected via vhost-user is setup in a 3-node circular topology
-| | And   Setup scheduler policy for VPP on all DUTs
 | | Then  Find PDR using binary search and pps
 | | ...   | ${framesize} | ${binary_min} | ${binary_max} | 3-node-IPv4
 | | ...   | ${min_rate} | ${max_rate} | ${threshold}
@@ -141,7 +139,6 @@
 | | And   Apply startup configuration on all VPP DUTs
 | | When  IPv4 forwarding with Vhost-User for '2' VMs initialized in a 3-node circular topology
 | | And   '2' Guest VMs with dpdk-testpmd-mac connected via vhost-user is setup in a 3-node circular topology
-| | And   Setup scheduler policy for VPP on all DUTs
 | | Then  Find NDR using binary search and pps
 | | ...   | ${framesize} | ${binary_min} | ${binary_max} | 3-node-IPv4
 | | ...   | ${min_rate} | ${max_rate} | ${threshold}
@@ -168,7 +165,6 @@
 | | And   Apply startup configuration on all VPP DUTs
 | | When  IPv4 forwarding with Vhost-User for '2' VMs initialized in a 3-node circular topology
 | | And   '2' Guest VMs with dpdk-testpmd-mac connected via vhost-user is setup in a 3-node circular topology
-| | And   Setup scheduler policy for VPP on all DUTs
 | | Then  Find PDR using binary search and pps
 | | ...   | ${framesize} | ${binary_min} | ${binary_max} | 3-node-IPv4
 | | ...   | ${min_rate} | ${max_rate} | ${threshold}
@@ -197,7 +193,6 @@
 | | And   Apply startup configuration on all VPP DUTs
 | | When  IPv4 forwarding with Vhost-User for '2' VMs initialized in a 3-node circular topology
 | | And   '2' Guest VMs with dpdk-testpmd-mac connected via vhost-user is setup in a 3-node circular topology
-| | And   Setup scheduler policy for VPP on all DUTs
 | | Then  Find NDR using binary search and pps
 | | ...   | ${framesize} | ${binary_min} | ${binary_max} | 3-node-IPv4
 | | ...   | ${min_rate} | ${max_rate} | ${threshold}
@@ -225,7 +220,6 @@
 | | And   Apply startup configuration on all VPP DUTs
 | | When  IPv4 forwarding with Vhost-User for '2' VMs initialized in a 3-node circular topology
 | | And   '2' Guest VMs with dpdk-testpmd-mac connected via vhost-user is setup in a 3-node circular topology
-| | And   Setup scheduler policy for VPP on all DUTs
 | | Then  Find PDR using binary search and pps
 | | ...   | ${framesize} | ${binary_min} | ${binary_max} | 3-node-IPv4
 | | ...   | ${min_rate} | ${max_rate} | ${threshold}
@@ -253,7 +247,6 @@
 | | And   Apply startup configuration on all VPP DUTs
 | | When  IPv4 forwarding with Vhost-User for '2' VMs initialized in a 3-node circular topology
 | | And   '2' Guest VMs with dpdk-testpmd-mac connected via vhost-user is setup in a 3-node circular topology
-| | And   Setup scheduler policy for VPP on all DUTs
 | | Then  Find NDR using binary search and pps
 | | ...   | ${framesize} | ${binary_min} | ${binary_max} | 3-node-IPv4
 | | ...   | ${min_rate} | ${max_rate} | ${threshold}
@@ -280,7 +273,6 @@
 | | And   Apply startup configuration on all VPP DUTs
 | | When  IPv4 forwarding with Vhost-User for '2' VMs initialized in a 3-node circular topology
 | | And   '2' Guest VMs with dpdk-testpmd-mac connected via vhost-user is setup in a 3-node circular topology
-| | And   Setup scheduler policy for VPP on all DUTs
 | | Then  Find PDR using binary search and pps
 | | ...   | ${framesize} | ${binary_min} | ${binary_max} | 3-node-IPv4
 | | ...   | ${min_rate} | ${max_rate} | ${threshold}
@@ -308,7 +300,6 @@
 | | And   Apply startup configuration on all VPP DUTs
 | | When  IPv4 forwarding with Vhost-User for '2' VMs initialized in a 3-node circular topology
 | | And   '2' Guest VMs with dpdk-testpmd-mac connected via vhost-user is setup in a 3-node circular topology
-| | And   Setup scheduler policy for VPP on all DUTs
 | | Then  Find NDR using binary search and pps
 | | ...   | ${framesize} | ${binary_min} | ${binary_max} | 3-node-IPv4
 | | ...   | ${min_rate} | ${max_rate} | ${threshold}
@@ -335,7 +326,6 @@
 | | And   Apply startup configuration on all VPP DUTs
 | | When  IPv4 forwarding with Vhost-User for '2' VMs initialized in a 3-node circular topology
 | | And   '2' Guest VMs with dpdk-testpmd-mac connected via vhost-user is setup in a 3-node circular topology
-| | And   Setup scheduler policy for VPP on all DUTs
 | | Then  Find PDR using binary search and pps
 | | ...   | ${framesize} | ${binary_min} | ${binary_max} | 3-node-IPv4
 | | ...   | ${min_rate} | ${max_rate} | ${threshold}
@@ -364,7 +354,6 @@
 | | And   Apply startup configuration on all VPP DUTs
 | | When  IPv4 forwarding with Vhost-User for '2' VMs initialized in a 3-node circular topology
 | | And   '2' Guest VMs with dpdk-testpmd-mac connected via vhost-user is setup in a 3-node circular topology
-| | And   Setup scheduler policy for VPP on all DUTs
 | | Then  Find NDR using binary search and pps
 | | ...   | ${framesize} | ${binary_min} | ${binary_max} | 3-node-IPv4
 | | ...   | ${min_rate} | ${max_rate} | ${threshold}
@@ -392,7 +381,6 @@
 | | And   Apply startup configuration on all VPP DUTs
 | | When  IPv4 forwarding with Vhost-User for '2' VMs initialized in a 3-node circular topology
 | | And   '2' Guest VMs with dpdk-testpmd-mac connected via vhost-user is setup in a 3-node circular topology
-| | And   Setup scheduler policy for VPP on all DUTs
 | | Then  Find PDR using binary search and pps
 | | ...   | ${framesize} | ${binary_min} | ${binary_max} | 3-node-IPv4
 | | ...   | ${min_rate} | ${max_rate} | ${threshold}
@@ -420,7 +408,6 @@
 | | And   Apply startup configuration on all VPP DUTs
 | | When  IPv4 forwarding with Vhost-User for '2' VMs initialized in a 3-node circular topology
 | | And   '2' Guest VMs with dpdk-testpmd-mac connected via vhost-user is setup in a 3-node circular topology
-| | And   Setup scheduler policy for VPP on all DUTs
 | | Then  Find NDR using binary search and pps
 | | ...   | ${framesize} | ${binary_min} | ${binary_max} | 3-node-IPv4
 | | ...   | ${min_rate} | ${max_rate} | ${threshold}
@@ -447,7 +434,6 @@
 | | And   Apply startup configuration on all VPP DUTs
 | | When  IPv4 forwarding with Vhost-User for '2' VMs initialized in a 3-node circular topology
 | | And   '2' Guest VMs with dpdk-testpmd-mac connected via vhost-user is setup in a 3-node circular topology
-| | And   Setup scheduler policy for VPP on all DUTs
 | | Then  Find PDR using binary search and pps
 | | ...   | ${framesize} | ${binary_min} | ${binary_max} | 3-node-IPv4
 | | ...   | ${min_rate} | ${max_rate} | ${threshold}
@@ -475,7 +461,6 @@
 | | And   Apply startup configuration on all VPP DUTs
 | | When  IPv4 forwarding with Vhost-User for '2' VMs initialized in a 3-node circular topology
 | | And   '2' Guest VMs with dpdk-testpmd-mac connected via vhost-user is setup in a 3-node circular topology
-| | And   Setup scheduler policy for VPP on all DUTs
 | | Then  Find NDR using binary search and pps
 | | ...   | ${framesize} | ${binary_min} | ${binary_max} | 3-node-IPv4
 | | ...   | ${min_rate} | ${max_rate} | ${threshold}
@@ -502,7 +487,6 @@
 | | And   Apply startup configuration on all VPP DUTs
 | | When  IPv4 forwarding with Vhost-User for '2' VMs initialized in a 3-node circular topology
 | | And   '2' Guest VMs with dpdk-testpmd-mac connected via vhost-user is setup in a 3-node circular topology
-| | And   Setup scheduler policy for VPP on all DUTs
 | | Then  Find PDR using binary search and pps
 | | ...   | ${framesize} | ${binary_min} | ${binary_max} | 3-node-IPv4
 | | ...   | ${min_rate} | ${max_rate} | ${threshold}
@@ -531,7 +515,6 @@
 | | And   Apply startup configuration on all VPP DUTs
 | | When  IPv4 forwarding with Vhost-User for '2' VMs initialized in a 3-node circular topology
 | | And   '2' Guest VMs with dpdk-testpmd-mac connected via vhost-user is setup in a 3-node circular topology
-| | And   Setup scheduler policy for VPP on all DUTs
 | | Then  Find NDR using binary search and pps
 | | ...   | ${framesize} | ${binary_min} | ${binary_max} | 3-node-IPv4
 | | ...   | ${min_rate} | ${max_rate} | ${threshold}
@@ -559,7 +542,6 @@
 | | And   Apply startup configuration on all VPP DUTs
 | | When  IPv4 forwarding with Vhost-User for '2' VMs initialized in a 3-node circular topology
 | | And   '2' Guest VMs with dpdk-testpmd-mac connected via vhost-user is setup in a 3-node circular topology
-| | And   Setup scheduler policy for VPP on all DUTs
 | | Then  Find PDR using binary search and pps
 | | ...   | ${framesize} | ${binary_min} | ${binary_max} | 3-node-IPv4
 | | ...   | ${min_rate} | ${max_rate} | ${threshold}
diff --git a/tests/perf/10ge2p1x520-ethip4vxlan-l2bdbasemaclrn-eth-2vhost-1vm-ndrpdrdisc.robot b/tests/perf/10ge2p1x520-ethip4vxlan-l2bdbasemaclrn-eth-2vhost-1vm-ndrpdrdisc.robot
index 34f9a5f8ee..082c13559e 100644
--- a/tests/perf/10ge2p1x520-ethip4vxlan-l2bdbasemaclrn-eth-2vhost-1vm-ndrpdrdisc.robot
+++ b/tests/perf/10ge2p1x520-ethip4vxlan-l2bdbasemaclrn-eth-2vhost-1vm-ndrpdrdisc.robot
@@ -98,7 +98,6 @@
 | | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
 | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
-| | And Setup scheduler policy for VPP on all DUTs
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
 | | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
 | | ... | ${threshold}
@@ -132,7 +131,6 @@
 | | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
 | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
-| | And Setup scheduler policy for VPP on all DUTs
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
 | | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
 | | ... | ${threshold} | ${perf_pdr_loss_acceptance}
@@ -166,7 +164,6 @@
 | | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
 | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
-| | And Setup scheduler policy for VPP on all DUTs
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
 | | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
 | | ... | ${threshold}
@@ -199,7 +196,6 @@
 | | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
 | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
-| | And Setup scheduler policy for VPP on all DUTs
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
 | | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
 | | ... | ${threshold} | ${perf_pdr_loss_acceptance}
@@ -235,7 +231,6 @@
 | | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
 | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
-| | And Setup scheduler policy for VPP on all DUTs
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
 | | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
 | | ... | ${threshold}
@@ -270,7 +265,6 @@
 | | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
 | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
-| | And Setup scheduler policy for VPP on all DUTs
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
 | | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
 | | ... | ${threshold} | ${perf_pdr_loss_acceptance}
@@ -305,7 +299,6 @@
 | | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
 | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
-| | And Setup scheduler policy for VPP on all DUTs
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
 | | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
 | | ... | ${threshold}
@@ -339,7 +332,6 @@
 | | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
 | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
-| | And Setup scheduler policy for VPP on all DUTs
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
 | | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
 | | ... | ${threshold} | ${perf_pdr_loss_acceptance}
@@ -373,7 +365,6 @@
 | | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
 | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
-| | And Setup scheduler policy for VPP on all DUTs
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
 | | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
 | | ... | ${threshold}
@@ -406,7 +397,6 @@
 | | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
 | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
-| | And Setup scheduler policy for VPP on all DUTs
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
 | | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
 | | ... | ${threshold} | ${perf_pdr_loss_acceptance}
@@ -442,7 +432,6 @@
 | | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
 | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
-| | And Setup scheduler policy for VPP on all DUTs
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
 | | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
 | | ... | ${threshold}
@@ -477,7 +466,6 @@
 | | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
 | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
-| | And Setup scheduler policy for VPP on all DUTs
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
 | | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
 | | ... | ${threshold} | ${perf_pdr_loss_acceptance}
@@ -512,7 +500,6 @@
 | | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
 | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
-| | And Setup scheduler policy for VPP on all DUTs
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
 | | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
 | | ... | ${threshold}
@@ -546,7 +533,6 @@
 | | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
 | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
-| | And Setup scheduler policy for VPP on all DUTs
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
 | | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
 | | ... | ${threshold} | ${perf_pdr_loss_acceptance}
@@ -580,7 +566,6 @@
 | | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
 | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
-| | And Setup scheduler policy for VPP on all DUTs
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
 | | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
 | | ... | ${threshold}
@@ -613,7 +598,6 @@
 | | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
 | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
-| | And Setup scheduler policy for VPP on all DUTs
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
 | | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
 | | ... | ${threshold} | ${perf_pdr_loss_acceptance}
@@ -649,7 +633,6 @@
 | | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
 | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
-| | And Setup scheduler policy for VPP on all DUTs
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
 | | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
 | | ... | ${threshold}
@@ -684,7 +667,6 @@
 | | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
 | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
-| | And Setup scheduler policy for VPP on all DUTs
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
 | | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
 | | ... | ${threshold} | ${perf_pdr_loss_acceptance}
diff --git a/tests/perf/10ge2p1x710-eth-l2bdbasemaclrn-eth-2vhost-1vm-ndrpdrdisc.robot b/tests/perf/10ge2p1x710-eth-l2bdbasemaclrn-eth-2vhost-1vm-ndrpdrdisc.robot
index 27eec1bc7e..ed08710e25 100644
--- a/tests/perf/10ge2p1x710-eth-l2bdbasemaclrn-eth-2vhost-1vm-ndrpdrdisc.robot
+++ b/tests/perf/10ge2p1x710-eth-l2bdbasemaclrn-eth-2vhost-1vm-ndrpdrdisc.robot
@@ -93,7 +93,6 @@
 | | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
 | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
-| | And Setup scheduler policy for VPP on all DUTs
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
 | | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
 | | ... | ${threshold}
@@ -126,7 +125,6 @@
 | | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
 | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
-| | And Setup scheduler policy for VPP on all DUTs
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
 | | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
 | | ... | ${threshold} | ${perf_pdr_loss_acceptance}
@@ -160,7 +158,6 @@
 | | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
 | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
-| | And Setup scheduler policy for VPP on all DUTs
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
 | | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
 | | ... | ${threshold}
@@ -193,7 +190,6 @@
 | | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
 | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
-| | And Setup scheduler policy for VPP on all DUTs
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
 | | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
 | | ... | ${threshold} | ${perf_pdr_loss_acceptance}
@@ -228,7 +224,6 @@
 | | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
 | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
-| | And Setup scheduler policy for VPP on all DUTs
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
 | | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
 | | ... | ${threshold}
@@ -261,7 +256,6 @@
 | | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
 | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
-| | And Setup scheduler policy for VPP on all DUTs
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
 | | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
 | | ... | ${threshold} | ${perf_pdr_loss_acceptance}
@@ -295,7 +289,6 @@
 | | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
 | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
-| | And Setup scheduler policy for VPP on all DUTs
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
 | | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
 | | ... | ${threshold}
@@ -328,7 +321,6 @@
 | | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
 | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
-| | And Setup scheduler policy for VPP on all DUTs
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
 | | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
 | | ... | ${threshold} | ${perf_pdr_loss_acceptance}
@@ -362,7 +354,6 @@
 | | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
 | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
-| | And Setup scheduler policy for VPP on all DUTs
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
 | | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
 | | ... | ${threshold}
@@ -395,7 +386,6 @@
 | | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
 | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
-| | And Setup scheduler policy for VPP on all DUTs
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
 | | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
 | | ... | ${threshold} | ${perf_pdr_loss_acceptance}
@@ -430,7 +420,6 @@
 | | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
 | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
-| | And Setup scheduler policy for VPP on all DUTs
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
 | | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
 | | ... | ${threshold}
@@ -464,7 +453,6 @@
 | | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
 | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
-| | And Setup scheduler policy for VPP on all DUTs
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
 | | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
 | | ... | ${threshold} | ${perf_pdr_loss_acceptance}
@@ -498,7 +486,6 @@
 | | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
 | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
-| | And Setup scheduler policy for VPP on all DUTs
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
 | | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
 | | ... | ${threshold}
@@ -531,7 +518,6 @@
 | | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
 | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
-| | And Setup scheduler policy for VPP on all DUTs
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
 | | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
 | | ... | ${threshold} | ${perf_pdr_loss_acceptance}
@@ -565,7 +551,6 @@
 | | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
 | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
-| | And Setup scheduler policy for VPP on all DUTs
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
 | | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
 | | ... | ${threshold}
@@ -598,7 +583,6 @@
 | | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
 | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
-| | And Setup scheduler policy for VPP on all DUTs
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
 | | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
 | | ... | ${threshold} | ${perf_pdr_loss_acceptance}
@@ -633,7 +617,6 @@
 | | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
 | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
-| | And Setup scheduler policy for VPP on all DUTs
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
 | | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
 | | ... | ${threshold}
@@ -667,7 +650,6 @@
 | | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
 | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
-| | And Setup scheduler policy for VPP on all DUTs
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
 | | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
 | | ... | ${threshold} | ${perf_pdr_loss_acceptance}
diff --git a/tests/perf/40ge2p1xl710-eth-l2bdbasemaclrn-eth-2vhost-1vm-ndrpdrdisc.robot b/tests/perf/40ge2p1xl710-eth-l2bdbasemaclrn-eth-2vhost-1vm-ndrpdrdisc.robot
index 3fc4444cb5..10397c5fde 100644
--- a/tests/perf/40ge2p1xl710-eth-l2bdbasemaclrn-eth-2vhost-1vm-ndrpdrdisc.robot
+++ b/tests/perf/40ge2p1xl710-eth-l2bdbasemaclrn-eth-2vhost-1vm-ndrpdrdisc.robot
@@ -95,7 +95,6 @@
 | | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
 | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
-| | And Setup scheduler policy for VPP on all DUTs
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
 | | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
 | | ... | ${threshold}
@@ -128,7 +127,6 @@
 | | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
 | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
-| | And Setup scheduler policy for VPP on all DUTs
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
 | | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
 | | ... | ${threshold} | ${perf_pdr_loss_acceptance}
@@ -162,7 +160,6 @@
 | | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
 | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
-| | And Setup scheduler policy for VPP on all DUTs
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
 | | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
 | | ... | ${threshold}
@@ -195,7 +192,6 @@
 | | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
 | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
-| | And Setup scheduler policy for VPP on all DUTs
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
 | | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
 | | ... | ${threshold} | ${perf_pdr_loss_acceptance}
@@ -230,7 +226,6 @@
 | | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
 | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
-| | And Setup scheduler policy for VPP on all DUTs
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
 | | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
 | | ... | ${threshold}
@@ -263,7 +258,6 @@
 | | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
 | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
-| | And Setup scheduler policy for VPP on all DUTs
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
 | | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
 | | ... | ${threshold} | ${perf_pdr_loss_acceptance}
@@ -297,7 +291,6 @@
 | | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
 | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
-| | And Setup scheduler policy for VPP on all DUTs
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
 | | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
 | | ... | ${threshold}
@@ -330,7 +323,6 @@
 | | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
 | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
-| | And Setup scheduler policy for VPP on all DUTs
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
 | | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
 | | ... | ${threshold} | ${perf_pdr_loss_acceptance}
@@ -364,7 +356,6 @@
 | | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
 | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
-| | And Setup scheduler policy for VPP on all DUTs
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
 | | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
 | | ... | ${threshold}
@@ -397,7 +388,6 @@
 | | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
 | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
-| | And Setup scheduler policy for VPP on all DUTs
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
 | | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
 | | ... | ${threshold} | ${perf_pdr_loss_acceptance}
@@ -432,7 +422,6 @@
 | | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
 | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
-| | And Setup scheduler policy for VPP on all DUTs
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
 | | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
 | | ... | ${threshold}
@@ -466,7 +455,6 @@
 | | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
 | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
-| | And Setup scheduler policy for VPP on all DUTs
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
 | | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
 | | ... | ${threshold} | ${perf_pdr_loss_acceptance}
@@ -500,7 +488,6 @@
 | | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
 | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
-| | And Setup scheduler policy for VPP on all DUTs
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
 | | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
 | | ... | ${threshold}
@@ -533,7 +520,6 @@
 | | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
 | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
-| | And Setup scheduler policy for VPP on all DUTs
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
 | | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
 | | ... | ${threshold} | ${perf_pdr_loss_acceptance}
@@ -567,7 +553,6 @@
 | | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
 | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
-| | And Setup scheduler policy for VPP on all DUTs
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
 | | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
 | | ... | ${threshold}
@@ -600,7 +585,6 @@
 | | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
 | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
-| | And Setup scheduler policy for VPP on all DUTs
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
 | | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
 | | ... | ${threshold} | ${perf_pdr_loss_acceptance}
@@ -635,7 +619,6 @@
 | | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
 | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
-| | And Setup scheduler policy for VPP on all DUTs
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
 | | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
 | | ... | ${threshold}
@@ -669,7 +652,6 @@
 | | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
 | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
-| | And Setup scheduler policy for VPP on all DUTs
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
 | | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
 | | ... | ${threshold} | ${perf_pdr_loss_acceptance}
diff --git a/tests/perf/40ge2p1xl710-eth-l2bdbasemaclrn-eth-4vhost-2vm-ndrpdrdisc.robot b/tests/perf/40ge2p1xl710-eth-l2bdbasemaclrn-eth-4vhost-2vm-ndrpdrdisc.robot
index 4b7f5cd5c1..ce482c0917 100644
--- a/tests/perf/40ge2p1xl710-eth-l2bdbasemaclrn-eth-4vhost-2vm-ndrpdrdisc.robot
+++ b/tests/perf/40ge2p1xl710-eth-l2bdbasemaclrn-eth-4vhost-2vm-ndrpdrdisc.robot
@@ -90,7 +90,6 @@
 | | And   Apply startup configuration on all VPP DUTs
 | | When  L2 bridge domains with Vhost-User for '2' VMs initialized in a 3-node circular topology
 | | And   '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology
-| | And   Setup scheduler policy for VPP on all DUTs
 | | Then  Find NDR using binary search and pps
 | | ...   | ${framesize} | ${binary_min} | ${binary_max} | 3-node-bridge
 | | ...   | ${min_rate} | ${max_rate} | ${threshold}
@@ -119,7 +118,6 @@
 | | And   Apply startup configuration on all VPP DUTs
 | | When  L2 bridge domains with Vhost-User for '2' VMs initialized in a 3-node circular topology
 | | And   '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology
-| | And   Setup scheduler policy for VPP on all DUTs
 | | Then  Find PDR using binary search and pps
 | | ...   | ${framesize} | ${binary_min} | ${binary_max} | 3-node-bridge
 | | ...   | ${min_rate} | ${max_rate} | ${threshold}
@@ -149,7 +147,6 @@
 | | And   Apply startup configuration on all VPP DUTs
 | | When  L2 bridge domains with Vhost-User for '2' VMs initialized in a 3-node circular topology
 | | And   '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology
-| | And   Setup scheduler policy for VPP on all DUTs
 | | Then  Find NDR using binary search and pps
 | | ...   | ${framesize} | ${binary_min} | ${binary_max} | 3-node-bridge
 | | ...   | ${min_rate} | ${max_rate} | ${threshold}
@@ -178,7 +175,6 @@
 | | And   Apply startup configuration on all VPP DUTs
 | | When  L2 bridge domains with Vhost-User for '2' VMs initialized in a 3-node circular topology
 | | And   '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology
-| | And   Setup scheduler policy for VPP on all DUTs
 | | Then  Find PDR using binary search and pps
 | | ...   | ${framesize} | ${binary_min} | ${binary_max} | 3-node-bridge
 | | ...   | ${min_rate} | ${max_rate} | ${threshold}
@@ -209,7 +205,6 @@
 | | And   Apply startup configuration on all VPP DUTs
 | | When  L2 bridge domains with Vhost-User for '2' VMs initialized in a 3-node circular topology
 | | And   '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology
-| | And   Setup scheduler policy for VPP on all DUTs
 | | Then  Find NDR using binary search and pps
 | | ...   | ${framesize} | ${binary_min} | ${binary_max} | 3-node-bridge
 | | ...   | ${min_rate} | ${max_rate} | ${threshold}
@@ -239,7 +234,6 @@
 | | And   Apply startup configuration on all VPP DUTs
 | | When  L2 bridge domains with Vhost-User for '2' VMs initialized in a 3-node circular topology
 | | And   '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology
-| | And   Setup scheduler policy for VPP on all DUTs
 | | Then  Find PDR using binary search and pps
 | | ...   | ${framesize} | ${binary_min} | ${binary_max} | 3-node-bridge
 | | ...   | ${min_rate} | ${max_rate} | ${threshold}
@@ -269,7 +263,6 @@
 | | And   Apply startup configuration on all VPP DUTs
 | | When  L2 bridge domains with Vhost-User for '2' VMs initialized in a 3-node circular topology
 | | And   '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology
-| | And   Setup scheduler policy for VPP on all DUTs
 | | Then  Find NDR using binary search and pps
 | | ...   | ${framesize} | ${binary_min} | ${binary_max} | 3-node-bridge
 | | ...   | ${min_rate} | ${max_rate} | ${threshold}
@@ -298,7 +291,6 @@
 | | And   Apply startup configuration on all VPP DUTs
 | | When  L2 bridge domains with Vhost-User for '2' VMs initialized in a 3-node circular topology
 | | And   '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology
-| | And   Setup scheduler policy for VPP on all DUTs
 | | Then  Find PDR using binary search and pps
 | | ...   | ${framesize} | ${binary_min} | ${binary_max} | 3-node-bridge
 | | ...   | ${min_rate} | ${max_rate} | ${threshold}
@@ -328,7 +320,6 @@
 | | And   Apply startup configuration on all VPP DUTs
 | | When  L2 bridge domains with Vhost-User for '2' VMs initialized in a 3-node circular topology
 | | And   '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology
-| | And   Setup scheduler policy for VPP on all DUTs
 | | Then  Find NDR using binary search and pps
 | | ...   | ${framesize} | ${binary_min} | ${binary_max} | 3-node-bridge
 | | ...   | ${min_rate} | ${max_rate} | ${threshold}
@@ -357,7 +348,6 @@
 | | And   Apply startup configuration on all VPP DUTs
 | | When  L2 bridge domains with Vhost-User for '2' VMs initialized in a 3-node circular topology
 | | And   '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology
-| | And   Setup scheduler policy for VPP on all DUTs
 | | Then  Find PDR using binary search and pps
 | | ...   | ${framesize} | ${binary_min} | ${binary_max} | 3-node-bridge
 | | ...   | ${min_rate} | ${max_rate} | ${threshold}
@@ -388,7 +378,6 @@
 | | And   Apply startup configuration on all VPP DUTs
 | | When  L2 bridge domains with Vhost-User for '2' VMs initialized in a 3-node circular topology
 | | And   '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology
-| | And   Setup scheduler policy for VPP on all DUTs
 | | Then  Find NDR using binary search and pps
 | | ...   | ${framesize} | ${binary_min} | ${binary_max} | 3-node-bridge
 | | ...   | ${min_rate} | ${max_rate} | ${threshold}
@@ -418,7 +407,6 @@
 | | And   Apply startup configuration on all VPP DUTs
 | | When  L2 bridge domains with Vhost-User for '2' VMs initialized in a 3-node circular topology
 | | And   '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology
-| | And   Setup scheduler policy for VPP on all DUTs
 | | Then  Find PDR using binary search and pps
 | | ...   | ${framesize} | ${binary_min} | ${binary_max} | 3-node-bridge
 | | ...   | ${min_rate} | ${max_rate} | ${threshold}
@@ -448,7 +436,6 @@
 | | And   Apply startup configuration on all VPP DUTs
 | | When  L2 bridge domains with Vhost-User for '2' VMs initialized in a 3-node circular topology
 | | And   '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology
-| | And   Setup scheduler policy for VPP on all DUTs
 | | Then  Find NDR using binary search and pps
 | | ...   | ${framesize} | ${binary_min} | ${binary_max} | 3-node-bridge
 | | ...   | ${min_rate} | ${max_rate} | ${threshold}
@@ -477,7 +464,6 @@
 | | And   Apply startup configuration on all VPP DUTs
 | | When  L2 bridge domains with Vhost-User for '2' VMs initialized in a 3-node circular topology
 | | And   '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology
-| | And   Setup scheduler policy for VPP on all DUTs
 | | Then  Find PDR using binary search and pps
 | | ...   | ${framesize} | ${binary_min} | ${binary_max} | 3-node-bridge
 | | ...   | ${min_rate} | ${max_rate} | ${threshold}
@@ -507,7 +493,6 @@
 | | And   Apply startup configuration on all VPP DUTs
 | | When  L2 bridge domains with Vhost-User for '2' VMs initialized in a 3-node circular topology
 | | And   '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology
-| | And   Setup scheduler policy for VPP on all DUTs
 | | Then  Find NDR using binary search and pps
 | | ...   | ${framesize} | ${binary_min} | ${binary_max} | 3-node-bridge
 | | ...   | ${min_rate} | ${max_rate} | ${threshold}
@@ -536,7 +521,6 @@
 | | And   Apply startup configuration on all VPP DUTs
 | | When  L2 bridge domains with Vhost-User for '2' VMs initialized in a 3-node circular topology
 | | And   '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology
-| | And   Setup scheduler policy for VPP on all DUTs
 | | Then  Find PDR using binary search and pps
 | | ...   | ${framesize} | ${binary_min} | ${binary_max} | 3-node-bridge
 | | ...   | ${min_rate} | ${max_rate} | ${threshold}
@@ -567,7 +551,6 @@
 | | And   Apply startup configuration on all VPP DUTs
 | | When  L2 bridge domains with Vhost-User for '2' VMs initialized in a 3-node circular topology
 | | And   '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology
-| | And   Setup scheduler policy for VPP on all DUTs
 | | Then  Find NDR using binary search and pps
 | | ...   | ${framesize} | ${binary_min} | ${binary_max} | 3-node-bridge
 | | ...   | ${min_rate} | ${max_rate} | ${threshold}
@@ -597,7 +580,6 @@
 | | And   Apply startup configuration on all VPP DUTs
 | | When  L2 bridge domains with Vhost-User for '2' VMs initialized in a 3-node circular topology
 | | And   '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology
-| | And   Setup scheduler policy for VPP on all DUTs
 | | Then  Find PDR using binary search and pps
 | | ...   | ${framesize} | ${binary_min} | ${binary_max} | 3-node-bridge
 | | ...   | ${min_rate} | ${max_rate} | ${threshold}
diff --git a/tests/perf/40ge2p1xl710-eth-l2xcbase-eth-4vhost-2vm-ndrpdrdisc.robot b/tests/perf/40ge2p1xl710-eth-l2xcbase-eth-4vhost-2vm-ndrpdrdisc.robot
index 0d10af3a39..4bd687148a 100644
--- a/tests/perf/40ge2p1xl710-eth-l2xcbase-eth-4vhost-2vm-ndrpdrdisc.robot
+++ b/tests/perf/40ge2p1xl710-eth-l2xcbase-eth-4vhost-2vm-ndrpdrdisc.robot
@@ -90,7 +90,6 @@
 | | And   Apply startup configuration on all VPP DUTs
 | | When  L2 xconnect with Vhost-User for '2' initialized in a 3-node circular topology
 | | And   '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology
-| | And   Setup scheduler policy for VPP on all DUTs
 | | Then  Find NDR using binary search and pps
 | | ...   | ${framesize} | ${binary_min} | ${binary_max} | 3-node-xconnect
 | | ...   | ${min_rate} | ${max_rate} | ${threshold}
@@ -119,8 +118,6 @@
 | | And   Apply startup configuration on all VPP DUTs
 | | When  L2 xconnect with Vhost-User for '2' initialized in a 3-node circular topology
 | | And   '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology
-| | And   Setup scheduler policy for VPP on all DUTs
-| | Then  Find PDR using binary search and pps
 | | ...   | ${framesize} | ${binary_min} | ${binary_max} | 3-node-xconnect
 | | ...   | ${min_rate} | ${max_rate} | ${threshold}
 | | ...   | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
@@ -149,7 +146,6 @@
 | | And   Apply startup configuration on all VPP DUTs
 | | When  L2 xconnect with Vhost-User for '2' initialized in a 3-node circular topology
 | | And   '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology
-| | And   Setup scheduler policy for VPP on all DUTs
 | | Then  Find NDR using binary search and pps
 | | ...   | ${framesize} | ${binary_min} | ${binary_max} | 3-node-xconnect
 | | ...   | ${min_rate} | ${max_rate} | ${threshold}
@@ -178,7 +174,6 @@
 | | And   Apply startup configuration on all VPP DUTs
 | | When  L2 xconnect with Vhost-User for '2' initialized in a 3-node circular topology
 | | And   '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology
-| | And   Setup scheduler policy for VPP on all DUTs
 | | Then  Find PDR using binary search and pps
 | | ...   | ${framesize} | ${binary_min} | ${binary_max} | 3-node-xconnect
 | | ...   | ${min_rate} | ${max_rate} | ${threshold}
@@ -209,7 +204,6 @@
 | | And   Apply startup configuration on all VPP DUTs
 | | When  L2 xconnect with Vhost-User for '2' initialized in a 3-node circular topology
 | | And   '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology
-| | And   Setup scheduler policy for VPP on all DUTs
 | | Then  Find NDR using binary search and pps
 | | ...   | ${framesize} | ${binary_min} | ${binary_max} | 3-node-xconnect
 | | ...   | ${min_rate} | ${max_rate} | ${threshold}
@@ -239,7 +233,6 @@
 | | And   Apply startup configuration on all VPP DUTs
 | | When  L2 xconnect with Vhost-User for '2' initialized in a 3-node circular topology
 | | And   '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology
-| | And   Setup scheduler policy for VPP on all DUTs
 | | Then  Find PDR using binary search and pps
 | | ...   | ${framesize} | ${binary_min} | ${binary_max} | 3-node-xconnect
 | | ...   | ${min_rate} | ${max_rate} | ${threshold}
@@ -269,7 +262,6 @@
 | | And   Apply startup configuration on all VPP DUTs
 | | When  L2 xconnect with Vhost-User for '2' initialized in a 3-node circular topology
 | | And   '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology
-| | And   Setup scheduler policy for VPP on all DUTs
 | | Then  Find NDR using binary search and pps
 | | ...   | ${framesize} | ${binary_min} | ${binary_max} | 3-node-xconnect
 | | ...   | ${min_rate} | ${max_rate} | ${threshold}
@@ -298,7 +290,6 @@
 | | And   Apply startup configuration on all VPP DUTs
 | | When  L2 xconnect with Vhost-User for '2' initialized in a 3-node circular topology
 | | And   '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology
-| | And   Setup scheduler policy for VPP on all DUTs
 | | Then  Find PDR using binary search and pps
 | | ...   | ${framesize} | ${binary_min} | ${binary_max} | 3-node-xconnect
 | | ...   | ${min_rate} | ${max_rate} | ${threshold}
@@ -328,7 +319,6 @@
 | | And   Apply startup configuration on all VPP DUTs
 | | When  L2 xconnect with Vhost-User for '2' initialized in a 3-node circular topology
 | | And   '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology
-| | And   Setup scheduler policy for VPP on all DUTs
 | | Then  Find NDR using binary search and pps
 | | ...   | ${framesize} | ${binary_min} | ${binary_max} | 3-node-xconnect
 | | ...   | ${min_rate} | ${max_rate} | ${threshold}
@@ -357,7 +347,6 @@
 | | And   Apply startup configuration on all VPP DUTs
 | | When  L2 xconnect with Vhost-User for '2' initialized in a 3-node circular topology
 | | And   '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology
-| | And   Setup scheduler policy for VPP on all DUTs
 | | Then  Find PDR using binary search and pps
 | | ...   | ${framesize} | ${binary_min} | ${binary_max} | 3-node-xconnect
 | | ...   | ${min_rate} | ${max_rate} | ${threshold}
@@ -388,7 +377,6 @@
 | | And   Apply startup configuration on all VPP DUTs
 | | When  L2 xconnect with Vhost-User for '2' initialized in a 3-node circular topology
 | | And   '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology
-| | And   Setup scheduler policy for VPP on all DUTs
 | | Then  Find NDR using binary search and pps
 | | ...   | ${framesize} | ${binary_min} | ${binary_max} | 3-node-xconnect
 | | ...   | ${min_rate} | ${max_rate} | ${threshold}
@@ -418,7 +406,6 @@
 | | And   Apply startup configuration on all VPP DUTs
 | | When  L2 xconnect with Vhost-User for '2' initialized in a 3-node circular topology
 | | And   '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology
-| | And   Setup scheduler policy for VPP on all DUTs
 | | Then  Find PDR using binary search and pps
 | | ...   | ${framesize} | ${binary_min} | ${binary_max} | 3-node-xconnect
 | | ...   | ${min_rate} | ${max_rate} | ${threshold}
@@ -448,7 +435,6 @@
 | | And   Apply startup configuration on all VPP DUTs
 | | When  L2 xconnect with Vhost-User for '2' initialized in a 3-node circular topology
 | | And   '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology
-| | And   Setup scheduler policy for VPP on all DUTs
 | | Then  Find NDR using binary search and pps
 | | ...   | ${framesize} | ${binary_min} | ${binary_max} | 3-node-xconnect
 | | ...   | ${min_rate} | ${max_rate} | ${threshold}
@@ -477,7 +463,6 @@
 | | And   Apply startup configuration on all VPP DUTs
 | | When  L2 xconnect with Vhost-User for '2' initialized in a 3-node circular topology
 | | And   '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology
-| | And   Setup scheduler policy for VPP on all DUTs
 | | Then  Find PDR using binary search and pps
 | | ...   | ${framesize} | ${binary_min} | ${binary_max} | 3-node-xconnect
 | | ...   | ${min_rate} | ${max_rate} | ${threshold}
@@ -507,7 +492,6 @@
 | | And   Apply startup configuration on all VPP DUTs
 | | When  L2 xconnect with Vhost-User for '2' initialized in a 3-node circular topology
 | | And   '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology
-| | And   Setup scheduler policy for VPP on all DUTs
 | | Then  Find NDR using binary search and pps
 | | ...   | ${framesize} | ${binary_min} | ${binary_max} | 3-node-xconnect
 | | ...   | ${min_rate} | ${max_rate} | ${threshold}
@@ -536,7 +520,6 @@
 | | And   Apply startup configuration on all VPP DUTs
 | | When  L2 xconnect with Vhost-User for '2' initialized in a 3-node circular topology
 | | And   '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology
-| | And   Setup scheduler policy for VPP on all DUTs
 | | Then  Find PDR using binary search and pps
 | | ...   | ${framesize} | ${binary_min} | ${binary_max} | 3-node-xconnect
 | | ...   | ${min_rate} | ${max_rate} | ${threshold}
@@ -567,7 +550,6 @@
 | | And   Apply startup configuration on all VPP DUTs
 | | When  L2 xconnect with Vhost-User for '2' initialized in a 3-node circular topology
 | | And   '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology
-| | And   Setup scheduler policy for VPP on all DUTs
 | | Then  Find NDR using binary search and pps
 | | ...   | ${framesize} | ${binary_min} | ${binary_max} | 3-node-xconnect
 | | ...   | ${min_rate} | ${max_rate} | ${threshold}
@@ -597,7 +579,6 @@
 | | And   Apply startup configuration on all VPP DUTs
 | | When  L2 xconnect with Vhost-User for '2' initialized in a 3-node circular topology
 | | And   '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology
-| | And   Setup scheduler policy for VPP on all DUTs
 | | Then  Find PDR using binary search and pps
 | | ...   | ${framesize} | ${binary_min} | ${binary_max} | 3-node-xconnect
 | | ...   | ${min_rate} | ${max_rate} | ${threshold}
diff --git a/tests/perf/40ge2p1xl710-ethip4-ip4base-eth-4vhost-2vm-ndrpdrdisc.robot b/tests/perf/40ge2p1xl710-ethip4-ip4base-eth-4vhost-2vm-ndrpdrdisc.robot
index 89a8535356..9f071fca93 100644
--- a/tests/perf/40ge2p1xl710-ethip4-ip4base-eth-4vhost-2vm-ndrpdrdisc.robot
+++ b/tests/perf/40ge2p1xl710-ethip4-ip4base-eth-4vhost-2vm-ndrpdrdisc.robot
@@ -90,7 +90,6 @@
 | | And   Apply startup configuration on all VPP DUTs
 | | When  IPv4 forwarding with Vhost-User for '2' VMs initialized in a 3-node circular topology
 | | And   '2' Guest VMs with dpdk-testpmd-mac connected via vhost-user is setup in a 3-node circular topology
-| | And   Setup scheduler policy for VPP on all DUTs
 | | Then  Find NDR using binary search and pps
 | | ...   | ${framesize} | ${binary_min} | ${binary_max} | 3-node-IPv4
 | | ...   | ${min_rate} | ${max_rate} | ${threshold}
@@ -119,7 +118,6 @@
 | | And   Apply startup configuration on all VPP DUTs
 | | When  IPv4 forwarding with Vhost-User for '2' VMs initialized in a 3-node circular topology
 | | And   '2' Guest VMs with dpdk-testpmd-mac connected via vhost-user is setup in a 3-node circular topology
-| | And   Setup scheduler policy for VPP on all DUTs
 | | Then  Find PDR using binary search and pps
 | | ...   | ${framesize} | ${binary_min} | ${binary_max} | 3-node-IPv4
 | | ...   | ${min_rate} | ${max_rate} | ${threshold}
@@ -149,7 +147,6 @@
 | | And   Apply startup configuration on all VPP DUTs
 | | When  IPv4 forwarding with Vhost-User for '2' VMs initialized in a 3-node circular topology
 | | And   '2' Guest VMs with dpdk-testpmd-mac connected via vhost-user is setup in a 3-node circular topology
-| | And   Setup scheduler policy for VPP on all DUTs
 | | Then  Find NDR using binary search and pps
 | | ...   | ${framesize} | ${binary_min} | ${binary_max} | 3-node-IPv4
 | | ...   | ${min_rate} | ${max_rate} | ${threshold}
@@ -178,7 +175,6 @@
 | | And   Apply startup configuration on all VPP DUTs
 | | When  IPv4 forwarding with Vhost-User for '2' VMs initialized in a 3-node circular topology
 | | And   '2' Guest VMs with dpdk-testpmd-mac connected via vhost-user is setup in a 3-node circular topology
-| | And   Setup scheduler policy for VPP on all DUTs
 | | Then  Find PDR using binary search and pps
 | | ...   | ${framesize} | ${binary_min} | ${binary_max} | 3-node-IPv4
 | | ...   | ${min_rate} | ${max_rate} | ${threshold}
@@ -209,7 +205,6 @@
 | | And   Apply startup configuration on all VPP DUTs
 | | When  IPv4 forwarding with Vhost-User for '2' VMs initialized in a 3-node circular topology
 | | And   '2' Guest VMs with dpdk-testpmd-mac connected via vhost-user is setup in a 3-node circular topology
-| | And   Setup scheduler policy for VPP on all DUTs
 | | Then  Find NDR using binary search and pps
 | | ...   | ${framesize} | ${binary_min} | ${binary_max} | 3-node-IPv4
 | | ...   | ${min_rate} | ${max_rate} | ${threshold}
@@ -239,7 +234,6 @@
 | | And   Apply startup configuration on all VPP DUTs
 | | When  IPv4 forwarding with Vhost-User for '2' VMs initialized in a 3-node circular topology
 | | And   '2' Guest VMs with dpdk-testpmd-mac connected via vhost-user is setup in a 3-node circular topology
-| | And   Setup scheduler policy for VPP on all DUTs
 | | Then  Find PDR using binary search and pps
 | | ...   | ${framesize} | ${binary_min} | ${binary_max} | 3-node-IPv4
 | | ...   | ${min_rate} | ${max_rate} | ${threshold}
@@ -269,7 +263,6 @@
 | | And   Apply startup configuration on all VPP DUTs
 | | When  IPv4 forwarding with Vhost-User for '2' VMs initialized in a 3-node circular topology
 | | And   '2' Guest VMs with dpdk-testpmd-mac connected via vhost-user is setup in a 3-node circular topology
-| | And   Setup scheduler policy for VPP on all DUTs
 | | Then  Find NDR using binary search and pps
 | | ...   | ${framesize} | ${binary_min} | ${binary_max} | 3-node-IPv4
 | | ...   | ${min_rate} | ${max_rate} | ${threshold}
@@ -298,7 +291,6 @@
 | | And   Apply startup configuration on all VPP DUTs
 | | When  IPv4 forwarding with Vhost-User for '2' VMs initialized in a 3-node circular topology
 | | And   '2' Guest VMs with dpdk-testpmd-mac connected via vhost-user is setup in a 3-node circular topology
-| | And   Setup scheduler policy for VPP on all DUTs
 | | Then  Find PDR using binary search and pps
 | | ...   | ${framesize} | ${binary_min} | ${binary_max} | 3-node-IPv4
 | | ...   | ${min_rate} | ${max_rate} | ${threshold}
@@ -328,7 +320,6 @@
 | | And   Apply startup configuration on all VPP DUTs
 | | When  IPv4 forwarding with Vhost-User for '2' VMs initialized in a 3-node circular topology
 | | And   '2' Guest VMs with dpdk-testpmd-mac connected via vhost-user is setup in a 3-node circular topology
-| | And   Setup scheduler policy for VPP on all DUTs
 | | Then  Find NDR using binary search and pps
 | | ...   | ${framesize} | ${binary_min} | ${binary_max} | 3-node-IPv4
 | | ...   | ${min_rate} | ${max_rate} | ${threshold}
@@ -357,7 +348,6 @@
 | | And   Apply startup configuration on all VPP DUTs
 | | When  IPv4 forwarding with Vhost-User for '2' VMs initialized in a 3-node circular topology
 | | And   '2' Guest VMs with dpdk-testpmd-mac connected via vhost-user is setup in a 3-node circular topology
-| | And   Setup scheduler policy for VPP on all DUTs
 | | Then  Find PDR using binary search and pps
 | | ...   | ${framesize} | ${binary_min} | ${binary_max} | 3-node-IPv4
 | | ...   | ${min_rate} | ${max_rate} | ${threshold}
@@ -388,7 +378,6 @@
 | | And   Apply startup configuration on all VPP DUTs
 | | When  IPv4 forwarding with Vhost-User for '2' VMs initialized in a 3-node circular topology
 | | And   '2' Guest VMs with dpdk-testpmd-mac connected via vhost-user is setup in a 3-node circular topology
-| | And   Setup scheduler policy for VPP on all DUTs
 | | Then  Find NDR using binary search and pps
 | | ...   | ${framesize} | ${binary_min} | ${binary_max} | 3-node-IPv4
 | | ...   | ${min_rate} | ${max_rate} | ${threshold}
@@ -418,7 +407,6 @@
 | | And   Apply startup configuration on all VPP DUTs
 | | When  IPv4 forwarding with Vhost-User for '2' VMs initialized in a 3-node circular topology
 | | And   '2' Guest VMs with dpdk-testpmd-mac connected via vhost-user is setup in a 3-node circular topology
-| | And   Setup scheduler policy for VPP on all DUTs
 | | Then  Find PDR using binary search and pps
 | | ...   | ${framesize} | ${binary_min} | ${binary_max} | 3-node-IPv4
 | | ...   | ${min_rate} | ${max_rate} | ${threshold}
@@ -448,7 +436,6 @@
 | | And   Apply startup configuration on all VPP DUTs
 | | When  IPv4 forwarding with Vhost-User for '2' VMs initialized in a 3-node circular topology
 | | And   '2' Guest VMs with dpdk-testpmd-mac connected via vhost-user is setup in a 3-node circular topology
-| | And   Setup scheduler policy for VPP on all DUTs
 | | Then  Find NDR using binary search and pps
 | | ...   | ${framesize} | ${binary_min} | ${binary_max} | 3-node-IPv4
 | | ...   | ${min_rate} | ${max_rate} | ${threshold}
@@ -477,7 +464,6 @@
 | | And   Apply startup configuration on all VPP DUTs
 | | When  IPv4 forwarding with Vhost-User for '2' VMs initialized in a 3-node circular topology
 | | And   '2' Guest VMs with dpdk-testpmd-mac connected via vhost-user is setup in a 3-node circular topology
-| | And   Setup scheduler policy for VPP on all DUTs
 | | Then  Find PDR using binary search and pps
 | | ...   | ${framesize} | ${binary_min} | ${binary_max} | 3-node-IPv4
 | | ...   | ${min_rate} | ${max_rate} | ${threshold}
@@ -507,7 +493,6 @@
 | | And   Apply startup configuration on all VPP DUTs
 | | When  IPv4 forwarding with Vhost-User for '2' VMs initialized in a 3-node circular topology
 | | And   '2' Guest VMs with dpdk-testpmd-mac connected via vhost-user is setup in a 3-node circular topology
-| | And   Setup scheduler policy for VPP on all DUTs
 | | Then  Find NDR using binary search and pps
 | | ...   | ${framesize} | ${binary_min} | ${binary_max} | 3-node-IPv4
 | | ...   | ${min_rate} | ${max_rate} | ${threshold}
@@ -536,7 +521,6 @@
 | | And   Apply startup configuration on all VPP DUTs
 | | When  IPv4 forwarding with Vhost-User for '2' VMs initialized in a 3-node circular topology
 | | And   '2' Guest VMs with dpdk-testpmd-mac connected via vhost-user is setup in a 3-node circular topology
-| | And   Setup scheduler policy for VPP on all DUTs
 | | Then  Find PDR using binary search and pps
 | | ...   | ${framesize} | ${binary_min} | ${binary_max} | 3-node-IPv4
 | | ...   | ${min_rate} | ${max_rate} | ${threshold}
@@ -567,7 +551,6 @@
 | | And   Apply startup configuration on all VPP DUTs
 | | When  IPv4 forwarding with Vhost-User for '2' VMs initialized in a 3-node circular topology
 | | And   '2' Guest VMs with dpdk-testpmd-mac connected via vhost-user is setup in a 3-node circular topology
-| | And   Setup scheduler policy for VPP on all DUTs
 | | Then  Find NDR using binary search and pps
 | | ...   | ${framesize} | ${binary_min} | ${binary_max} | 3-node-IPv4
 | | ...   | ${min_rate} | ${max_rate} | ${threshold}
@@ -597,7 +580,6 @@
 | | And   Apply startup configuration on all VPP DUTs
 | | When  IPv4 forwarding with Vhost-User for '2' VMs initialized in a 3-node circular topology
 | | And   '2' Guest VMs with dpdk-testpmd-mac connected via vhost-user is setup in a 3-node circular topology
-| | And   Setup scheduler policy for VPP on all DUTs
 | | Then  Find PDR using binary search and pps
 | | ...   | ${framesize} | ${binary_min} | ${binary_max} | 3-node-IPv4
 | | ...   | ${min_rate} | ${max_rate} | ${threshold}
diff --git a/tests/perf/__init__.robot b/tests/perf/__init__.robot
index 107892685c..922ad29a33 100644
--- a/tests/perf/__init__.robot
+++ b/tests/perf/__init__.robot
@@ -40,5 +40,6 @@
 | | Set Global Variable | ${perf_pdr_loss_acceptance} | 0.5
 | | Set Global Variable | ${perf_pdr_loss_acceptance_type} | percentage
 | | Set Global Variable | ${perf_vm_image} | /var/lib/vm/csit-nested-1.6.img
-| | Set Global Variable | ${perf_qemu_bin} | /usr/bin/qemu-system-x86_64
-| | Set Global Variable | ${perf_qemu_qsz} | 256
+| | Set Global Variable | ${perf_qemu_bin}
+| | ...                 | /opt/qemu-2.5.0/bin/qemu-system-x86_64
+| | Set Global Variable | ${perf_qemu_qsz} | 1024
author	Jan Gelety <jgelety@cisco.com>	2017-04-13 17:01:13 +0200
committer	Peter Mikus <pmikus@cisco.com>	2017-04-19 11:22:36 +0000
commit	1cb9b4af51c289045a729cc9cbfc5f34aa54e948 (patch)
tree	6b8fe6044ed82436babbfc14f38fb02148c95a4b /tests
parent	25b577d61445aa0607725a0172b72b5c01582b73 (diff)