Add test cases with "dpdk no-multi-seg" in vpp startup config

- JIRA: CSIT-73
- Add ability to configure no-multi-seg parameter in VPP startup
  configuration
- Add keywords to selectively configure parameters in startup
  configuration
- Modify testcases

Change-Id: I3c5c0a1cc2b1156d5a87ff36628b50793dd9ac5f
Signed-off-by: Peter Mikus <pmikus@cisco.com>

10 files changed, 636 insertions, 371 deletions

diff --git a/tests/suites/performance/Long_Bridge_Domain_Intel-X520-DA2.robot b/tests/suites/performance/Long_Bridge_Domain_Intel-X520-DA2.robot
index e772a85d64..ce65b8116c 100644
--- a/tests/suites/performance/Long_Bridge_Domain_Intel-X520-DA2.robot
+++ b/tests/suites/performance/Long_Bridge_Domain_Intel-X520-DA2.robot
@@ -19,7 +19,8 @@
 | ... | L2 | Intel-X520-DA2
 | Suite Teardown | 3-node Performance Suite Teardown
 | Test Setup | Setup all DUTs before test
-| Test Teardown | Run Keyword | Show statistics on all DUTs
+| Test Teardown | Run Keywords | Show statistics on all DUTs
+| ...                          | Remove startup configuration of VPP from all DUTs
 | Documentation | *Throughput search suite (based on RFC2544).*
 | ...
 | ... | Test suite uses 3-node topology TG - DUT1 - DUT2 - TG, with one link
@@ -32,18 +33,21 @@
 | Find NDR by using RFC2544 linear search and 64B frames through bridge domain in 3-node topology
 | | [Documentation]
 | | ... | Find throughput with non drop rate for 64B frames by using
-| | ... | linear search starting at 4.1Mpps, stepping down with step of 0.1Mpps
+| | ... | linear search starting at 5.0Mpps, stepping down with step of 0.1Mpps
 | | [Tags] | 1_THREAD_NOHTT_RSS_1 | SINGLE_THREAD
 | | ${framesize}= | Set Variable | 64
-| | ${start_rate}= | Set Variable | 4100000
+| | ${start_rate}= | Set Variable | 5000000
 | | ${step_rate}= | Set Variable | 100000
 | | ${min_rate}= | Set Variable | 100000
 | | ${max_rate}= | Set Variable | 14880952
-| | Given Setup '1' worker threads and rss '1' without HTT on all DUTs
-| | AND   L2 bridge domain initialized in a 3-node circular topology
-| | Then Find NDR using linear search and pps | ${framesize} | ${start_rate}
-| | ...                                       | ${step_rate} | 3-node-bridge
-| | ...                                       | ${min_rate} | ${max_rate}
+| | Given Add '1' worker threads and rss '1' without HTT to all DUTs
+| | And   Add all PCI devices to all DUTs
+| | And   Add No Multi Seg to all DUTs
+| | And   Apply startup configuration on all VPP DUTs
+| | And   L2 bridge domain initialized in a 3-node circular topology
+| | Then  Find NDR using linear search and pps | ${framesize} | ${start_rate}
+| | ...                                        | ${step_rate} | 3-node-bridge
+| | ...                                        | ${min_rate} | ${max_rate}
 
 | Find NDR by using RFC2544 linear search and 1518B frames through bridge domain in 3-node topology
 | | [Documentation]
@@ -56,11 +60,14 @@
 | | ${step_rate}= | Set Variable | 10000
 | | ${min_rate}= | Set Variable | 10000
 | | ${max_rate}= | Set Variable | 812743
-| | Given Setup '1' worker threads and rss '1' without HTT on all DUTs
-| | AND   L2 bridge domain initialized in a 3-node circular topology
-| | Then Find NDR using linear search and pps | ${framesize} | ${start_rate}
-| | ...                                       | ${step_rate} | 3-node-bridge
-| | ...                                       | ${min_rate} | ${max_rate}
+| | Given Add '1' worker threads and rss '1' without HTT to all DUTs
+| | And   Add all PCI devices to all DUTs
+| | And   Add No Multi Seg to all DUTs
+| | And   Apply startup configuration on all VPP DUTs
+| | And   L2 bridge domain initialized in a 3-node circular topology
+| | Then  Find NDR using linear search and pps | ${framesize} | ${start_rate}
+| | ...                                        | ${step_rate} | 3-node-bridge
+| | ...                                        | ${min_rate} | ${max_rate}
 
 | Find NDR by using RFC2544 linear search and 9000B frames through bridge domain in 3-node topology
 | | [Documentation]
@@ -73,27 +80,32 @@
 | | ${step_rate}= | Set Variable | 5000
 | | ${min_rate}= | Set Variable | 5000
 | | ${max_rate}= | Set Variable | 138580
-| | Given Setup '1' worker threads and rss '1' without HTT on all DUTs
-| | AND   L2 bridge domain initialized in a 3-node circular topology
-| | Then Find NDR using linear search and pps | ${framesize} | ${start_rate}
+| | Given Add '1' worker threads and rss '1' without HTT to all DUTs
+| | And   Add all PCI devices to all DUTs
+| | And   Apply startup configuration on all VPP DUTs
+| | And   L2 bridge domain initialized in a 3-node circular topology
+| | Then  Find NDR using linear search and pps | ${framesize} | ${start_rate}
 | | ...                                       | ${step_rate} | 3-node-bridge
 | | ...                                       | ${min_rate} | ${max_rate}
 
 | Find NDR with 2 cores and rss 1 by using RFC2544 linear search and 64B frames through bridge domain in 3-node topology
 | | [Documentation]
 | | ... | Find throughput on 2 cores with non drop rate for 64B frames by using
-| | ... | linear search starting at 8.2Mpps, stepping down with step of 0.1Mpps
+| | ... | linear search starting at 9.0Mpps, stepping down with step of 0.1Mpps
 | | [Tags] | 2_THREAD_NOHTT_RSS_1 | MULTI_THREAD
 | | ${framesize}= | Set Variable | 64
-| | ${start_rate}= | Set Variable | 8200000
+| | ${start_rate}= | Set Variable | 9000000
 | | ${step_rate}= | Set Variable | 100000
 | | ${min_rate}= | Set Variable | 100000
 | | ${max_rate}= | Set Variable | 14880952
-| | Given Setup '2' worker threads and rss '1' without HTT on all DUTs
-| | AND   L2 bridge domain initialized in a 3-node circular topology
-| | Then Find NDR using linear search and pps | ${framesize} | ${start_rate}
-| | ...                                       | ${step_rate} | 3-node-bridge
-| | ...                                       | ${min_rate} | ${max_rate}
+| | Given Add '2' worker threads and rss '1' without HTT to all DUTs
+| | And   Add all PCI devices to all DUTs
+| | And   Add No Multi Seg to all DUTs
+| | And   Apply startup configuration on all VPP DUTs
+| | And   L2 bridge domain initialized in a 3-node circular topology
+| | Then  Find NDR using linear search and pps | ${framesize} | ${start_rate}
+| | ...                                        | ${step_rate} | 3-node-bridge
+| | ...                                        | ${min_rate} | ${max_rate}
 
 | Find NDR with 2 cores and rss 1 by using RFC2544 linear search and 1518B frames through bridge domain in 3-node topology
 | | [Documentation]
@@ -106,11 +118,14 @@
 | | ${step_rate}= | Set Variable | 10000
 | | ${min_rate}= | Set Variable | 10000
 | | ${max_rate}= | Set Variable | 812743
-| | Given Setup '2' worker threads and rss '1' without HTT on all DUTs
-| | AND   L2 bridge domain initialized in a 3-node circular topology
-| | Then Find NDR using linear search and pps | ${framesize} | ${start_rate}
-| | ...                                       | ${step_rate} | 3-node-bridge
-| | ...                                       | ${min_rate} | ${max_rate}
+| | Given Add '2' worker threads and rss '1' without HTT to all DUTs
+| | And   Add all PCI devices to all DUTs
+| | And   Add No Multi Seg to all DUTs
+| | And   Apply startup configuration on all VPP DUTs
+| | And   L2 bridge domain initialized in a 3-node circular topology
+| | Then  Find NDR using linear search and pps | ${framesize} | ${start_rate}
+| | ...                                        | ${step_rate} | 3-node-bridge
+| | ...                                        | ${min_rate} | ${max_rate}
 
 | Find NDR with 2 cores and rss 1 by using RFC2544 linear search and 9000B frames through bridge domain in 3-node topology
 | | [Documentation]
@@ -123,28 +138,33 @@
 | | ${step_rate}= | Set Variable | 5000
 | | ${min_rate}= | Set Variable | 5000
 | | ${max_rate}= | Set Variable | 138580
-| | Given Setup '2' worker threads and rss '1' without HTT on all DUTs
-| | AND   L2 bridge domain initialized in a 3-node circular topology
-| | Then Find NDR using linear search and pps | ${framesize} | ${start_rate}
-| | ...                                       | ${step_rate} | 3-node-bridge
-| | ...                                       | ${min_rate} | ${max_rate}
+| | Given Add '2' worker threads and rss '1' without HTT to all DUTs
+| | And   Add all PCI devices to all DUTs
+| | And   Apply startup configuration on all VPP DUTs
+| | And   L2 bridge domain initialized in a 3-node circular topology
+| | Then  Find NDR using linear search and pps | ${framesize} | ${start_rate}
+| | ...                                        | ${step_rate} | 3-node-bridge
+| | ...                                        | ${min_rate} | ${max_rate}
 
 | Find NDR with 4 cores and rss 2 by using RFC2544 linear search and 64B frames through bridge domain in 3-node topology
 | | [Documentation]
 | | ... | Find throughput on 4 cores and rss 2 with non drop rate for 64B
-| | ... | frames by using linear search starting at 9.8Mpps, stepping down
+| | ... | frames by using linear search starting at 13.2Mpps, stepping down
 | | ... | with step of 0.1Mpps
 | | [Tags] | 4_THREAD_NOHTT_RSS_2 | MULTI_THREAD
 | | ${framesize}= | Set Variable | 64
-| | ${start_rate}= | Set Variable | 9800000
+| | ${start_rate}= | Set Variable | 13200000
 | | ${step_rate}= | Set Variable | 100000
 | | ${min_rate}= | Set Variable | 100000
 | | ${max_rate}= | Set Variable | 14880952
-| | Given Setup '4' worker threads and rss '2' without HTT on all DUTs
-| | AND   L2 bridge domain initialized in a 3-node circular topology
-| | Then Find NDR using linear search and pps | ${framesize} | ${start_rate}
-| | ...                                       | ${step_rate} | 3-node-bridge
-| | ...                                       | ${min_rate} | ${max_rate}
+| | Given Add '4' worker threads and rss '2' without HTT to all DUTs
+| | And   Add all PCI devices to all DUTs
+| | And   Add No Multi Seg to all DUTs
+| | And   Apply startup configuration on all VPP DUTs
+| | And   L2 bridge domain initialized in a 3-node circular topology
+| | Then  Find NDR using linear search and pps | ${framesize} | ${start_rate}
+| | ...                                        | ${step_rate} | 3-node-bridge
+| | ...                                        | ${min_rate} | ${max_rate}
 
 | Find NDR with 4 cores and rss 2 by using RFC2544 linear search and 1518B frames through bridge domain in 3-node topology
 | | [Documentation]
@@ -157,11 +177,14 @@
 | | ${step_rate}= | Set Variable | 10000
 | | ${min_rate}= | Set Variable | 10000
 | | ${max_rate}= | Set Variable | 812743
-| | Given Setup '4' worker threads and rss '2' without HTT on all DUTs
-| | AND   L2 bridge domain initialized in a 3-node circular topology
-| | Then Find NDR using linear search and pps | ${framesize} | ${start_rate}
-| | ...                                       | ${step_rate} | 3-node-bridge
-| | ...                                       | ${min_rate} | ${max_rate}
+| | Given Add '4' worker threads and rss '2' without HTT to all DUTs
+| | And   Add all PCI devices to all DUTs
+| | And   Add No Multi Seg to all DUTs
+| | And   Apply startup configuration on all VPP DUTs
+| | And   L2 bridge domain initialized in a 3-node circular topology
+| | Then  Find NDR using linear search and pps | ${framesize} | ${start_rate}
+| | ...                                        | ${step_rate} | 3-node-bridge
+| | ...                                        | ${min_rate} | ${max_rate}
 
 | Find NDR with 4 cores and rss 2 by using RFC2544 linear search and 9000B frames through bridge domain in 3-node topology
 | | [Documentation]
@@ -174,8 +197,10 @@
 | | ${step_rate}= | Set Variable | 5000
 | | ${min_rate}= | Set Variable | 5000
 | | ${max_rate}= | Set Variable | 138580
-| | Given Setup '4' worker threads and rss '2' without HTT on all DUTs
-| | AND   L2 bridge domain initialized in a 3-node circular topology
-| | Then Find NDR using linear search and pps | ${framesize} | ${start_rate}
-| | ...                                       | ${step_rate} | 3-node-bridge
-| | ...                                       | ${min_rate} | ${max_rate}
+| | Given Add '4' worker threads and rss '2' without HTT to all DUTs
+| | And   Add all PCI devices to all DUTs
+| | And   Apply startup configuration on all VPP DUTs
+| | And   L2 bridge domain initialized in a 3-node circular topology
+| | Then  Find NDR using linear search and pps | ${framesize} | ${start_rate}
+| | ...                                        | ${step_rate} | 3-node-bridge
+| | ...                                        | ${min_rate} | ${max_rate}
diff --git a/tests/suites/performance/Long_IPv4_Intel-X520-DA2.robot b/tests/suites/performance/Long_IPv4_Intel-X520-DA2.robot
index 7353340f41..f94abca58a 100644
--- a/tests/suites/performance/Long_IPv4_Intel-X520-DA2.robot
+++ b/tests/suites/performance/Long_IPv4_Intel-X520-DA2.robot
@@ -10,6 +10,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+
 *** Settings ***
 | Resource | resources/libraries/robot/performance.robot
 | Library | resources.libraries.python.topology.Topology
@@ -23,7 +24,8 @@
 | ... | L3 | Intel-X520-DA2
 | Suite Teardown | 3-node Performance Suite Teardown
 | Test Setup | Setup all DUTs before test
-| Test Teardown | Run Keyword | Show statistics on all DUTs
+| Test Teardown | Run Keywords | Show statistics on all DUTs
+| ...                          | Remove startup configuration of VPP from all DUTs
 | Documentation | *Throughput search suite (based on RFC2544).*
 | ...
 | ... | Test suite uses 3-node topology TG - DUT1 - DUT2 - TG, with one link
@@ -36,18 +38,21 @@
 | Find NDR by using RFC2544 linear search and 64B frames through IPv4 forwarding in 3-node topology
 | | [Documentation]
 | | ... | Find throughput with non drop rate for 64B frames by using
-| | ... | linear search starting at 4.1Mpps, stepping down with step of 0.1Mpps
+| | ... | linear search starting at 5.0Mpps, stepping down with step of 0.1Mpps
 | | [Tags] | 1_THREAD_NOHTT_RSS_1 | SINGLE_THREAD
 | | ${framesize}= | Set Variable | 64
-| | ${start_rate}= | Set Variable | 4400000
+| | ${start_rate}= | Set Variable | 5000000
 | | ${step_rate}= | Set Variable | 100000
 | | ${min_rate}= | Set Variable | 100000
 | | ${max_rate}= | Set Variable | 14880952
-| | Given Setup '1' worker threads and rss '1' without HTT on all DUTs
-| | AND   IPv4 forwarding initialized in a 3-node circular topology
-| | Then Find NDR using linear search and pps | ${framesize} | ${start_rate}
-| | ...                                       | ${step_rate} | 3-node-IPv4
-| | ...                                       | ${min_rate} | ${max_rate}
+| | Given Add '1' worker threads and rss '1' without HTT to all DUTs
+| | And   Add all PCI devices to all DUTs
+| | And   Add No Multi Seg to all DUTs
+| | And   Apply startup configuration on all VPP DUTs
+| | And   IPv4 forwarding initialized in a 3-node circular topology
+| | Then  Find NDR using linear search and pps | ${framesize} | ${start_rate}
+| | ...                                        | ${step_rate} | 3-node-IPv4
+| | ...                                        | ${min_rate} | ${max_rate}
 
 | Find NDR by using RFC2544 linear search and 1518B frames through IPv4 forwarding in 3-node topology
 | | [Documentation]
@@ -60,11 +65,14 @@
 | | ${step_rate}= | Set Variable | 10000
 | | ${min_rate}= | Set Variable | 10000
 | | ${max_rate}= | Set Variable | 812743
-| | Given Setup '1' worker threads and rss '1' without HTT on all DUTs
-| | AND   IPv4 forwarding initialized in a 3-node circular topology
-| | Then Find NDR using linear search and pps | ${framesize} | ${start_rate}
-| | ...                                       | ${step_rate} | 3-node-IPv4
-| | ...                                       | ${min_rate} | ${max_rate}
+| | Given Add '1' worker threads and rss '1' without HTT to all DUTs
+| | And   Add all PCI devices to all DUTs
+| | And   Add No Multi Seg to all DUTs
+| | And   Apply startup configuration on all VPP DUTs
+| | And   IPv4 forwarding initialized in a 3-node circular topology
+| | Then  Find NDR using linear search and pps | ${framesize} | ${start_rate}
+| | ...                                        | ${step_rate} | 3-node-IPv4
+| | ...                                        | ${min_rate} | ${max_rate}
 
 | Find NDR by using RFC2544 linear search and 9000B frames through IPv4 forwarding in 3-node topology
 | | [Documentation]
@@ -77,27 +85,32 @@
 | | ${step_rate}= | Set Variable | 5000
 | | ${min_rate}= | Set Variable | 5000
 | | ${max_rate}= | Set Variable | 138580
-| | Given Setup '1' worker threads and rss '1' without HTT on all DUTs
-| | AND   IPv4 forwarding initialized in a 3-node circular topology
-| | Then Find NDR using linear search and pps | ${framesize} | ${start_rate}
-| | ...                                       | ${step_rate} | 3-node-IPv4
-| | ...                                       | ${min_rate} | ${max_rate}
+| | Given Add '1' worker threads and rss '1' without HTT to all DUTs
+| | And   Add all PCI devices to all DUTs
+| | And   Apply startup configuration on all VPP DUTs
+| | And   IPv4 forwarding initialized in a 3-node circular topology
+| | Then  Find NDR using linear search and pps | ${framesize} | ${start_rate}
+| | ...                                        | ${step_rate} | 3-node-IPv4
+| | ...                                        | ${min_rate} | ${max_rate}
 
 | Find NDR with 2 cores and rss 1 by using RFC2544 linear search and 64B frames through IPv4 forwarding in 3-node topology
 | | [Documentation]
 | | ... | Find throughput on 2 cores with non drop rate for 64B frames by using
-| | ... | linear search starting at 8.8Mpps, stepping down with step of 0.1Mpps
+| | ... | linear search starting at 10Mpps, stepping down with step of 0.1Mpps
 | | [Tags] | 2_THREAD_NOHTT_RSS_1 | MULTI_THREAD
 | | ${framesize}= | Set Variable | 64
-| | ${start_rate}= | Set Variable | 8800000
+| | ${start_rate}= | Set Variable | 10000000
 | | ${step_rate}= | Set Variable | 100000
 | | ${min_rate}= | Set Variable | 100000
 | | ${max_rate}= | Set Variable | 14880952
-| | Given Setup '2' worker threads and rss '1' without HTT on all DUTs
-| | AND   IPv4 forwarding initialized in a 3-node circular topology
-| | Then Find NDR using linear search and pps | ${framesize} | ${start_rate}
-| | ...                                       | ${step_rate} | 3-node-IPv4
-| | ...                                       | ${min_rate} | ${max_rate}
+| | Given Add '2' worker threads and rss '1' without HTT to all DUTs
+| | And   Add all PCI devices to all DUTs
+| | And   Add No Multi Seg to all DUTs
+| | And   Apply startup configuration on all VPP DUTs
+| | And   IPv4 forwarding initialized in a 3-node circular topology
+| | Then  Find NDR using linear search and pps | ${framesize} | ${start_rate}
+| | ...                                        | ${step_rate} | 3-node-IPv4
+| | ...                                        | ${min_rate} | ${max_rate}
 
 | Find NDR with 2 cores and rss 1 by using RFC2544 linear search and 1518B frames through IPv4 forwarding in 3-node topology
 | | [Documentation]
@@ -110,11 +123,14 @@
 | | ${step_rate}= | Set Variable | 10000
 | | ${min_rate}= | Set Variable | 10000
 | | ${max_rate}= | Set Variable | 812743
-| | Given Setup '2' worker threads and rss '1' without HTT on all DUTs
-| | AND   IPv4 forwarding initialized in a 3-node circular topology
-| | Then Find NDR using linear search and pps | ${framesize} | ${start_rate}
-| | ...                                       | ${step_rate} | 3-node-IPv4
-| | ...                                       | ${min_rate} | ${max_rate}
+| | Given Add '2' worker threads and rss '1' without HTT to all DUTs
+| | And   Add all PCI devices to all DUTs
+| | And   Add No Multi Seg to all DUTs
+| | And   Apply startup configuration on all VPP DUTs
+| | And   IPv4 forwarding initialized in a 3-node circular topology
+| | Then  Find NDR using linear search and pps | ${framesize} | ${start_rate}
+| | ...                                        | ${step_rate} | 3-node-IPv4
+| | ...                                        | ${min_rate} | ${max_rate}
 
 | Find NDR with 2 cores and rss 1 by using RFC2544 linear search and 9000B frames through IPv4 forwarding in 3-node topology
 | | [Documentation]
@@ -127,28 +143,33 @@
 | | ${step_rate}= | Set Variable | 5000
 | | ${min_rate}= | Set Variable | 5000
 | | ${max_rate}= | Set Variable | 138580
-| | Given Setup '2' worker threads and rss '1' without HTT on all DUTs
-| | AND   IPv4 forwarding initialized in a 3-node circular topology
-| | Then Find NDR using linear search and pps | ${framesize} | ${start_rate}
-| | ...                                       | ${step_rate} | 3-node-IPv4
-| | ...                                       | ${min_rate} | ${max_rate}
+| | Given Add '2' worker threads and rss '1' without HTT to all DUTs
+| | And   Add all PCI devices to all DUTs
+| | And   Apply startup configuration on all VPP DUTs
+| | And   IPv4 forwarding initialized in a 3-node circular topology
+| | Then  Find NDR using linear search and pps | ${framesize} | ${start_rate}
+| | ...                                        | ${step_rate} | 3-node-IPv4
+| | ...                                        | ${min_rate} | ${max_rate}
 
 | Find NDR with 4 cores and rss 2 by using RFC2544 linear search and 64B frames through IPv4 forwarding in 3-node topology
 | | [Documentation]
 | | ... | Find throughput on 4 cores and rss 2 with non drop rate for 64B
-| | ... | frames by using linear search starting at 9.8Mpps, stepping down with
+| | ... | frames by using linear search starting at 13Mpps, stepping down with
 | | ... | step of 0.1Mpps
 | | [Tags] | 4_THREAD_NOHTT_RSS_2 | MULTI_THREAD
 | | ${framesize}= | Set Variable | 64
-| | ${start_rate}= | Set Variable | 9800000
+| | ${start_rate}= | Set Variable | 13000000
 | | ${step_rate}= | Set Variable | 100000
 | | ${min_rate}= | Set Variable | 100000
 | | ${max_rate}= | Set Variable | 14880952
-| | Given Setup '4' worker threads and rss '2' without HTT on all DUTs
-| | AND   IPv4 forwarding initialized in a 3-node circular topology
-| | Then Find NDR using linear search and pps | ${framesize} | ${start_rate}
-| | ...                                       | ${step_rate} | 3-node-IPv4
-| | ...                                       | ${min_rate} | ${max_rate}
+| | Given Add '4' worker threads and rss '2' without HTT to all DUTs
+| | And   Add all PCI devices to all DUTs
+| | And   Add No Multi Seg to all DUTs
+| | And   Apply startup configuration on all VPP DUTs
+| | And   IPv4 forwarding initialized in a 3-node circular topology
+| | Then  Find NDR using linear search and pps | ${framesize} | ${start_rate}
+| | ...                                        | ${step_rate} | 3-node-IPv4
+| | ...                                        | ${min_rate} | ${max_rate}
 
 | Find NDR with 4 cores and rss 2 by using RFC2544 linear search and 1518B frames through IPv4 forwarding in 3-node topology
 | | [Documentation]
@@ -161,11 +182,14 @@
 | | ${step_rate}= | Set Variable | 10000
 | | ${min_rate}= | Set Variable | 10000
 | | ${max_rate}= | Set Variable | 812743
-| | Given Setup '4' worker threads and rss '2' without HTT on all DUTs
-| | AND   IPv4 forwarding initialized in a 3-node circular topology
-| | Then Find NDR using linear search and pps | ${framesize} | ${start_rate}
-| | ...                                       | ${step_rate} | 3-node-IPv4
-| | ...                                       | ${min_rate} | ${max_rate}
+| | Given Add '4' worker threads and rss '2' without HTT to all DUTs
+| | And   Add all PCI devices to all DUTs
+| | And   Add No Multi Seg to all DUTs
+| | And   Apply startup configuration on all VPP DUTs
+| | And   IPv4 forwarding initialized in a 3-node circular topology
+| | Then  Find NDR using linear search and pps | ${framesize} | ${start_rate}
+| | ...                                        | ${step_rate} | 3-node-IPv4
+| | ...                                        | ${min_rate} | ${max_rate}
 
 | Find NDR with 4 cores and rss 2 by using RFC2544 linear search and 9000B frames through IPv4 forwarding in 3-node topology
 | | [Documentation]
@@ -178,11 +202,13 @@
 | | ${step_rate}= | Set Variable | 5000
 | | ${min_rate}= | Set Variable | 5000
 | | ${max_rate}= | Set Variable | 138580
-| | Given Setup '4' worker threads and rss '2' without HTT on all DUTs
-| | AND   IPv4 forwarding initialized in a 3-node circular topology
-| | Then Find NDR using linear search and pps | ${framesize} | ${start_rate}
-| | ...                                       | ${step_rate} | 3-node-IPv4
-| | ...                                       | ${min_rate} | ${max_rate}
+| | Given Add '4' worker threads and rss '2' without HTT to all DUTs
+| | And   Add all PCI devices to all DUTs
+| | And   Apply startup configuration on all VPP DUTs
+| | And   IPv4 forwarding initialized in a 3-node circular topology
+| | Then  Find NDR using linear search and pps | ${framesize} | ${start_rate}
+| | ...                                        | ${step_rate} | 3-node-IPv4
+| | ...                                        | ${min_rate} | ${max_rate}
 
 | Find NDR with 2 cores by using RFC2544 binary search and 64B frames through IPv4 forwarding in 3-node topology
 | | [Documentation]
@@ -191,16 +217,19 @@
 | | [Tags] | 2_THREAD_NOHTT_RSS_1 | MULTI_THREAD
 | | ${framesize}= | Set Variable | 64
 | | ${binary_min}= | Set Variable | 6000000
-| | ${binary_max}= | Set Variable | 12000000
+| | ${binary_max}= | Set Variable | 14000000
 | | ${min_rate}= | Set Variable | 100000
 | | ${max_rate}= | Set Variable | 14880952
 | | ${threshold}= | Set Variable | 5000
-| | Given Setup '2' worker threads and rss '1' without HTT on all DUTs
-| | AND   IPv4 forwarding initialized in a 3-node circular topology
-| | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-IPv4
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
+| | Given Add '2' worker threads and rss '1' without HTT to all DUTs
+| | And   Add all PCI devices to all DUTs
+| | And   Add No Multi Seg to all DUTs
+| | And   Apply startup configuration on all VPP DUTs
+| | And   IPv4 forwarding initialized in a 3-node circular topology
+| | Then  Find NDR using binary search and pps | ${framesize} | ${binary_min}
+| | ...                                        | ${binary_max} | 3-node-IPv4
+| | ...                                        | ${min_rate} | ${max_rate}
+| | ...                                        | ${threshold}
 
 | Find NDR with 4 cores and rss 2 by using RFC2544 binary search and 64B frames through IPv4 forwarding in 3-node topology
 | | [Documentation]
@@ -209,12 +238,15 @@
 | | [Tags] | 4_THREAD_NOHTT_RSS_2 | MULTI_THREAD
 | | ${framesize}= | Set Variable | 64
 | | ${binary_min}= | Set Variable | 6000000
-| | ${binary_max}= | Set Variable | 12000000
+| | ${binary_max}= | Set Variable | 14000000
 | | ${min_rate}= | Set Variable | 100000
 | | ${max_rate}= | Set Variable | 14880952
 | | ${threshold}= | Set Variable | 5000
-| | Given Setup '4' worker threads and rss '2' without HTT on all DUTs
-| | AND   IPv4 forwarding initialized in a 3-node circular topology
+| | Given Add '4' worker threads and rss '2' without HTT to all DUTs
+| | And   Add all PCI devices to all DUTs
+| | And   Add No Multi Seg to all DUTs
+| | And   Apply startup configuration on all VPP DUTs
+| | And   IPv4 forwarding initialized in a 3-node circular topology
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
 | | ...                                       | ${binary_max} | 3-node-IPv4
 | | ...                                       | ${min_rate} | ${max_rate}
diff --git a/tests/suites/performance/Long_IPv6_Intel-X520-DA2.robot b/tests/suites/performance/Long_IPv6_Intel-X520-DA2.robot
index 3be3cfb17e..61fc777f9a 100644
--- a/tests/suites/performance/Long_IPv6_Intel-X520-DA2.robot
+++ b/tests/suites/performance/Long_IPv6_Intel-X520-DA2.robot
@@ -10,6 +10,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+
 *** Settings ***
 | Resource | resources/libraries/robot/performance.robot
 | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | PERFTEST_LONG
@@ -18,7 +19,8 @@
 | ... | L3 | Intel-X520-DA2
 | Suite Teardown | 3-node Performance Suite Teardown
 | Test Setup | Setup all DUTs before test
-| Test Teardown | Run Keyword | Show statistics on all DUTs
+| Test Teardown | Run Keywords | Show statistics on all DUTs
+| ...                          | Remove startup configuration of VPP from all DUTs
 | Documentation | *Throughput search suite (based on RFC2544).*
 | ...
 | ... | Test suite uses 3-node topology TG - DUT1 - DUT2 - TG, with one link
@@ -31,18 +33,21 @@
 | Find NDR by using RFC2544 linear search and 78B frames through IPv6 forwarding in 3-node topology
 | | [Documentation]
 | | ... | Find throughput with non drop rate for 78B frames by using
-| | ... | linear search starting at 4.0Mpps, stepping down with step of 0.1Mpps
+| | ... | linear search starting at 5.0Mpps, stepping down with step of 0.1Mpps
 | | [Tags] | 1_THREAD_NOHTT_RSS_1 | SINGLE_THREAD
 | | ${framesize}= | Set Variable | 78
-| | ${start_rate}= | Set Variable | 4000000
+| | ${start_rate}= | Set Variable | 5000000
 | | ${step_rate}= | Set Variable | 100000
 | | ${min_rate}= | Set Variable | 100000
-| | ${max_rate}= | Set Variable | 14880952
-| | Given Setup '1' worker threads and rss '1' without HTT on all DUTs
+| | ${max_rate}= | Set Variable | 12755102
+| | Given Add '1' worker threads and rss '1' without HTT to all DUTs
+| | And   Add all PCI devices to all DUTs
+| | And   Add No Multi Seg to all DUTs
+| | And   Apply startup configuration on all VPP DUTs
 | | And   IPv6 forwarding initialized in a 3-node circular topology
-| | Then Find NDR using linear search and pps | ${framesize} | ${start_rate}
-| | ...                                       | ${step_rate} | 3-node-IPv6
-| | ...                                       | ${min_rate} | ${max_rate}
+| | Then  Find NDR using linear search and pps | ${framesize} | ${start_rate}
+| | ...                                        | ${step_rate} | 3-node-IPv6
+| | ...                                        | ${min_rate} | ${max_rate}
 
 | Find NDR by using RFC2544 linear search and 1518B frames through IPv6 forwarding in 3-node topology
 | | [Documentation]
@@ -55,11 +60,14 @@
 | | ${step_rate}= | Set Variable | 10000
 | | ${min_rate}= | Set Variable | 10000
 | | ${max_rate}= | Set Variable | 812743
-| | Given Setup '1' worker threads and rss '1' without HTT on all DUTs
+| | Given Add '1' worker threads and rss '1' without HTT to all DUTs
+| | And   Add all PCI devices to all DUTs
+| | And   Add No Multi Seg to all DUTs
+| | And   Apply startup configuration on all VPP DUTs
 | | And   IPv6 forwarding initialized in a 3-node circular topology
-| | Then Find NDR using linear search and pps | ${framesize} | ${start_rate}
-| | ...                                       | ${step_rate} | 3-node-IPv6
-| | ...                                       | ${min_rate} | ${max_rate}
+| | Then  Find NDR using linear search and pps | ${framesize} | ${start_rate}
+| | ...                                        | ${step_rate} | 3-node-IPv6
+| | ...                                        | ${min_rate} | ${max_rate}
 
 | Find NDR by using RFC2544 linear search and 9000B frames through IPv6 forwarding in 3-node topology
 | | [Documentation]
@@ -72,27 +80,32 @@
 | | ${step_rate}= | Set Variable | 5000
 | | ${min_rate}= | Set Variable | 5000
 | | ${max_rate}= | Set Variable | 138580
-| | Given Setup '1' worker threads and rss '1' without HTT on all DUTs
+| | Given Add '1' worker threads and rss '1' without HTT to all DUTs
+| | And   Add all PCI devices to all DUTs
+| | And   Apply startup configuration on all VPP DUTs
 | | And   IPv6 forwarding initialized in a 3-node circular topology
-| | Then Find NDR using linear search and pps | ${framesize} | ${start_rate}
-| | ...                                       | ${step_rate} | 3-node-IPv6
-| | ...                                       | ${min_rate} | ${max_rate}
+| | Then  Find NDR using linear search and pps | ${framesize} | ${start_rate}
+| | ...                                        | ${step_rate} | 3-node-IPv6
+| | ...                                        | ${min_rate} | ${max_rate}
 
 | Find NDR with 2 cores and rss 1 by using RFC2544 linear search and 78B frames through IPv6 forwarding in 3-node topology
 | | [Documentation]
 | | ... | Find throughput on 2 cores with non drop rate for 78B frames by using
-| | ... | linear search starting at 7.8Mpps, stepping down with step of 0.1Mpps
+| | ... | linear search starting at 9Mpps, stepping down with step of 0.1Mpps
 | | [Tags] | 2_THREAD_NOHTT_RSS_1 | MULTI_THREAD
 | | ${framesize}= | Set Variable | 78
-| | ${start_rate}= | Set Variable | 7800000
+| | ${start_rate}= | Set Variable | 9000000
 | | ${step_rate}= | Set Variable | 100000
 | | ${min_rate}= | Set Variable | 100000
-| | ${max_rate}= | Set Variable | 14880952
-| | Given Setup '2' worker threads and rss '1' without HTT on all DUTs
+| | ${max_rate}= | Set Variable | 12755102
+| | Given Add '2' worker threads and rss '1' without HTT to all DUTs
+| | And   Add all PCI devices to all DUTs
+| | And   Add No Multi Seg to all DUTs
+| | And   Apply startup configuration on all VPP DUTs
 | | And   IPv6 forwarding initialized in a 3-node circular topology
-| | Then Find NDR using linear search and pps | ${framesize} | ${start_rate}
-| | ...                                       | ${step_rate} | 3-node-IPv6
-| | ...                                       | ${min_rate} | ${max_rate}
+| | Then  Find NDR using linear search and pps | ${framesize} | ${start_rate}
+| | ...                                        | ${step_rate} | 3-node-IPv6
+| | ...                                        | ${min_rate} | ${max_rate}
 
 | Find NDR with 2 cores and rss 1 by using RFC2544 linear search and 1518B frames through IPv6 forwarding in 3-node topology
 | | [Documentation]
@@ -105,11 +118,14 @@
 | | ${step_rate}= | Set Variable | 10000
 | | ${min_rate}= | Set Variable | 10000
 | | ${max_rate}= | Set Variable | 812743
-| | Given Setup '2' worker threads and rss '1' without HTT on all DUTs
+| | Given Add '2' worker threads and rss '1' without HTT to all DUTs
+| | And   Add all PCI devices to all DUTs
+| | And   Add No Multi Seg to all DUTs
+| | And   Apply startup configuration on all VPP DUTs
 | | And   IPv6 forwarding initialized in a 3-node circular topology
-| | Then Find NDR using linear search and pps | ${framesize} | ${start_rate}
-| | ...                                       | ${step_rate} | 3-node-IPv6
-| | ...                                       | ${min_rate} | ${max_rate}
+| | Then  Find NDR using linear search and pps | ${framesize} | ${start_rate}
+| | ...                                        | ${step_rate} | 3-node-IPv6
+| | ...                                        | ${min_rate} | ${max_rate}
 
 | Find NDR with 2 cores and rss 1 by using RFC2544 linear search and 9000B frames through IPv6 forwarding in 3-node topology
 | | [Documentation]
@@ -122,28 +138,33 @@
 | | ${step_rate}= | Set Variable | 5000
 | | ${min_rate}= | Set Variable | 5000
 | | ${max_rate}= | Set Variable | 138580
-| | Given Setup '2' worker threads and rss '1' without HTT on all DUTs
+| | Given Add '2' worker threads and rss '1' without HTT to all DUTs
+| | And   Add all PCI devices to all DUTs
+| | And   Apply startup configuration on all VPP DUTs
 | | And   IPv6 forwarding initialized in a 3-node circular topology
-| | Then Find NDR using linear search and pps | ${framesize} | ${start_rate}
-| | ...                                       | ${step_rate} | 3-node-IPv6
-| | ...                                       | ${min_rate} | ${max_rate}
+| | Then  Find NDR using linear search and pps | ${framesize} | ${start_rate}
+| | ...                                        | ${step_rate} | 3-node-IPv6
+| | ...                                        | ${min_rate} | ${max_rate}
 
 | Find NDR with 4 cores and rss 2 by using RFC2544 linear search and 78B frames through IPv6 forwarding in 3-node topology
 | | [Documentation]
 | | ... | Find throughput on 4 cores and rss 2 with non drop rate for 78B
-| | ... | frames by using linear search starting at 9.8Mpps, stepping down with
+| | ... | frames by using linear search starting at 12.2Mpps, stepping down with
 | | ... | step of 0.1Mpps
 | | [Tags] | 4_THREAD_NOHTT_RSS_2 | MULTI_THREAD
 | | ${framesize}= | Set Variable | 78
-| | ${start_rate}= | Set Variable | 9800000
+| | ${start_rate}= | Set Variable | 12200000
 | | ${step_rate}= | Set Variable | 100000
 | | ${min_rate}= | Set Variable | 100000
-| | ${max_rate}= | Set Variable | 14880952
-| | Given Setup '4' worker threads and rss '2' without HTT on all DUTs
+| | ${max_rate}= | Set Variable | 12755102
+| | Given Add '4' worker threads and rss '2' without HTT to all DUTs
+| | And   Add all PCI devices to all DUTs
+| | And   Add No Multi Seg to all DUTs
+| | And   Apply startup configuration on all VPP DUTs
 | | And   IPv6 forwarding initialized in a 3-node circular topology
-| | Then Find NDR using linear search and pps | ${framesize} | ${start_rate}
-| | ...                                       | ${step_rate} | 3-node-IPv6
-| | ...                                       | ${min_rate} | ${max_rate}
+| | Then  Find NDR using linear search and pps | ${framesize} | ${start_rate}
+| | ...                                        | ${step_rate} | 3-node-IPv6
+| | ...                                        | ${min_rate} | ${max_rate}
 
 | Find NDR with 4 cores and rss 2 by using RFC2544 linear search and 1518B frames through IPv6 forwarding in 3-node topology
 | | [Documentation]
@@ -156,11 +177,14 @@
 | | ${step_rate}= | Set Variable | 10000
 | | ${min_rate}= | Set Variable | 10000
 | | ${max_rate}= | Set Variable | 812743
-| | Given Setup '4' worker threads and rss '2' without HTT on all DUTs
+| | Given Add '4' worker threads and rss '2' without HTT to all DUTs
+| | And   Add all PCI devices to all DUTs
+| | And   Add No Multi Seg to all DUTs
+| | And   Apply startup configuration on all VPP DUTs
 | | And   IPv6 forwarding initialized in a 3-node circular topology
-| | Then Find NDR using linear search and pps | ${framesize} | ${start_rate}
-| | ...                                       | ${step_rate} | 3-node-IPv6
-| | ...                                       | ${min_rate} | ${max_rate}
+| | Then  Find NDR using linear search and pps | ${framesize} | ${start_rate}
+| | ...                                        | ${step_rate} | 3-node-IPv6
+| | ...                                        | ${min_rate} | ${max_rate}
 
 | Find NDR with 4 cores and rss 2 by using RFC2544 linear search and 9000B frames through IPv6 forwarding in 3-node topology
 | | [Documentation]
@@ -173,11 +197,13 @@
 | | ${step_rate}= | Set Variable | 5000
 | | ${min_rate}= | Set Variable | 5000
 | | ${max_rate}= | Set Variable | 138580
-| | Given Setup '4' worker threads and rss '2' without HTT on all DUTs
+| | Given Add '4' worker threads and rss '2' without HTT to all DUTs
+| | And   Add all PCI devices to all DUTs
+| | And   Apply startup configuration on all VPP DUTs
 | | And   IPv6 forwarding initialized in a 3-node circular topology
-| | Then Find NDR using linear search and pps | ${framesize} | ${start_rate}
-| | ...                                       | ${step_rate} | 3-node-IPv6
-| | ...                                       | ${min_rate} | ${max_rate}
+| | Then  Find NDR using linear search and pps | ${framesize} | ${start_rate}
+| | ...                                        | ${step_rate} | 3-node-IPv6
+| | ...                                        | ${min_rate} | ${max_rate}
 
 | Find NDR with 2 cores by using RFC2544 binary search and 78B frames through IPv6 forwarding in 3-node topology
 | | [Documentation]
@@ -186,16 +212,19 @@
 | | [Tags] | 2_THREAD_NOHTT_RSS_1 | MULTI_THREAD
 | | ${framesize}= | Set Variable | 78
 | | ${binary_min}= | Set Variable | 5000000
-| | ${binary_max}= | Set Variable | 9000000
+| | ${binary_max}= | Set Variable | 12000000
 | | ${min_rate}= | Set Variable | 100000
-| | ${max_rate}= | Set Variable | 14880952
+| | ${max_rate}= | Set Variable | 12755102
 | | ${threshold}= | Set Variable | 5000
-| | Given Setup '2' worker threads and rss '1' without HTT on all DUTs
+| | Given Add '2' worker threads and rss '1' without HTT to all DUTs
+| | And   Add all PCI devices to all DUTs
+| | And   Add No Multi Seg to all DUTs
+| | And   Apply startup configuration on all VPP DUTs
 | | And   IPv6 forwarding initialized in a 3-node circular topology
-| | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-IPv6
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
+| | Then  Find NDR using binary search and pps | ${framesize} | ${binary_min}
+| | ...                                        | ${binary_max} | 3-node-IPv6
+| | ...                                        | ${min_rate} | ${max_rate}
+| | ...                                        | ${threshold}
 
 | Find NDR with 4 cores and rss 2 by using RFC2544 binary search and 78B frames through IPv6 forwarding in 3-node topology
 | | [Documentation]
@@ -204,13 +233,16 @@
 | | [Tags] | 4_THREAD_NOHTT_RSS_2 | MULTI_THREAD
 | | ${framesize}= | Set Variable | 78
 | | ${binary_min}= | Set Variable | 6000000
-| | ${binary_max}= | Set Variable | 11000000
+| | ${binary_max}= | Set Variable | 12000000
 | | ${min_rate}= | Set Variable | 100000
-| | ${max_rate}= | Set Variable | 14880952
+| | ${max_rate}= | Set Variable | 12755102
 | | ${threshold}= | Set Variable | 5000
-| | Given Setup '4' worker threads and rss '2' without HTT on all DUTs
+| | Given Add '4' worker threads and rss '2' without HTT to all DUTs
+| | And   Add all PCI devices to all DUTs
+| | And   Add No Multi Seg to all DUTs
+| | And   Apply startup configuration on all VPP DUTs
 | | And   IPv6 forwarding initialized in a 3-node circular topology
-| | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-IPv6
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
+| | Then  Find NDR using binary search and pps | ${framesize} | ${binary_min}
+| | ...                                        | ${binary_max} | 3-node-IPv6
+| | ...                                        | ${min_rate} | ${max_rate}
+| | ...                                        | ${threshold}
diff --git a/tests/suites/performance/Long_Xconnect_Dot1q_Intel-X520-DA2.robot b/tests/suites/performance/Long_Xconnect_Dot1q_Intel-X520-DA2.robot
index 8eef6c8c56..dc0d3a7dad 100644
--- a/tests/suites/performance/Long_Xconnect_Dot1q_Intel-X520-DA2.robot
+++ b/tests/suites/performance/Long_Xconnect_Dot1q_Intel-X520-DA2.robot
@@ -20,7 +20,8 @@
 | ... | L2 | Intel-X520-DA2
 | Suite Teardown | 3-node Performance Suite Teardown
 | Test Setup | Setup all DUTs before test
-| Test Teardown | Run Keyword | Show statistics on all DUTs
+| Test Teardown | Run Keywords | Show statistics on all DUTs
+| ...                          | Remove startup configuration of VPP from all DUTs
 | Documentation | *Throughput search suite (based on RFC2544).*
 | ...
 | ... | Test suite uses 3-node topology TG - DUT1 - DUT2 - TG, with one link
@@ -47,8 +48,11 @@
 | | ${step_rate}= | Set Variable | 100000
 | | ${min_rate}= | Set Variable | 100000
 | | ${max_rate}= | Set Variable | 14880952
-| | Given Setup '1' worker threads and rss '1' without HTT on all DUTs
-| | And VPP interfaces in path are up
+| | Given Add '1' worker threads and rss '1' without HTT to all DUTs
+| | And   Add all PCI devices to all DUTs
+| | And   Add No Multi Seg to all DUTs
+| | And   Apply startup configuration on all VPP DUTs
+| | And   VPP interfaces in path are up
 | | When VLAN dot1q subinterfaces initialized on 3-node topology
 | | ... | ${dut1} | ${dut1_if2} | ${dut2} | ${dut2_if1} | ${subid}
 | | And L2 tag rewrite method setup on interfaces
@@ -73,8 +77,11 @@
 | | ${step_rate}= | Set Variable | 10000
 | | ${min_rate}= | Set Variable | 10000
 | | ${max_rate}= | Set Variable | 812743
-| | Given Setup '1' worker threads and rss '1' without HTT on all DUTs
-| | And VPP interfaces in path are up
+| | Given Add '1' worker threads and rss '1' without HTT to all DUTs
+| | And   Add all PCI devices to all DUTs
+| | And   Add No Multi Seg to all DUTs
+| | And   Apply startup configuration on all VPP DUTs
+| | And   VPP interfaces in path are up
 | | When VLAN dot1q subinterfaces initialized on 3-node topology
 | | ... | ${dut1} | ${dut1_if2} | ${dut2} | ${dut2_if1} | ${subid}
 | | And L2 tag rewrite method setup on interfaces
@@ -99,8 +106,10 @@
 | | ${step_rate}= | Set Variable | 5000
 | | ${min_rate}= | Set Variable | 5000
 | | ${max_rate}= | Set Variable | 138580
-| | Given Setup '1' worker threads and rss '1' without HTT on all DUTs
-| | And VPP interfaces in path are up
+| | Given Add '1' worker threads and rss '1' without HTT to all DUTs
+| | And   Add all PCI devices to all DUTs
+| | And   Apply startup configuration on all VPP DUTs
+| | And   VPP interfaces in path are up
 | | When VLAN dot1q subinterfaces initialized on 3-node topology
 | | ... | ${dut1} | ${dut1_if2} | ${dut2} | ${dut2_if1} | ${subid}
 | | And L2 tag rewrite method setup on interfaces
@@ -125,8 +134,11 @@
 | | ${step_rate}= | Set Variable | 100000
 | | ${min_rate}= | Set Variable | 100000
 | | ${max_rate}= | Set Variable | 14880952
-| | Given Setup '2' worker threads and rss '1' without HTT on all DUTs
-| | And VPP interfaces in path are up
+| | Given Add '2' worker threads and rss '1' without HTT to all DUTs
+| | And   Add all PCI devices to all DUTs
+| | And   Add No Multi Seg to all DUTs
+| | And   Apply startup configuration on all VPP DUTs
+| | And   VPP interfaces in path are up
 | | When VLAN dot1q subinterfaces initialized on 3-node topology
 | | ... | ${dut1} | ${dut1_if2} | ${dut2} | ${dut2_if1} | ${subid}
 | | And L2 tag rewrite method setup on interfaces
@@ -151,8 +163,11 @@
 | | ${step_rate}= | Set Variable | 10000
 | | ${min_rate}= | Set Variable | 10000
 | | ${max_rate}= | Set Variable | 812743
-| | Given Setup '2' worker threads and rss '1' without HTT on all DUTs
-| | And VPP interfaces in path are up
+| | Given Add '2' worker threads and rss '1' without HTT to all DUTs
+| | And   Add all PCI devices to all DUTs
+| | And   Add No Multi Seg to all DUTs
+| | And   Apply startup configuration on all VPP DUTs
+| | And   VPP interfaces in path are up
 | | When VLAN dot1q subinterfaces initialized on 3-node topology
 | | ... | ${dut1} | ${dut1_if2} | ${dut2} | ${dut2_if1} | ${subid}
 | | And L2 tag rewrite method setup on interfaces
@@ -177,8 +192,10 @@
 | | ${step_rate}= | Set Variable | 5000
 | | ${min_rate}= | Set Variable | 5000
 | | ${max_rate}= | Set Variable | 138580
-| | Given Setup '2' worker threads and rss '1' without HTT on all DUTs
-| | And VPP interfaces in path are up
+| | Given Add '2' worker threads and rss '1' without HTT to all DUTs
+| | And   Add all PCI devices to all DUTs
+| | And   Apply startup configuration on all VPP DUTs
+| | And   VPP interfaces in path are up
 | | When VLAN dot1q subinterfaces initialized on 3-node topology
 | | ... | ${dut1} | ${dut1_if2} | ${dut2} | ${dut2_if1} | ${subid}
 | | And L2 tag rewrite method setup on interfaces
@@ -203,8 +220,11 @@
 | | ${step_rate}= | Set Variable | 100000
 | | ${min_rate}= | Set Variable | 100000
 | | ${max_rate}= | Set Variable | 14880952
-| | Given Setup '4' worker threads and rss '2' without HTT on all DUTs
-| | And VPP interfaces in path are up
+| | Given Add '4' worker threads and rss '2' without HTT to all DUTs
+| | And   Add all PCI devices to all DUTs
+| | And   Add No Multi Seg to all DUTs
+| | And   Apply startup configuration on all VPP DUTs
+| | And   VPP interfaces in path are up
 | | When VLAN dot1q subinterfaces initialized on 3-node topology
 | | ... | ${dut1} | ${dut1_if2} | ${dut2} | ${dut2_if1} | ${subid}
 | | And L2 tag rewrite method setup on interfaces
@@ -229,8 +249,11 @@
 | | ${step_rate}= | Set Variable | 10000
 | | ${min_rate}= | Set Variable | 10000
 | | ${max_rate}= | Set Variable | 812743
-| | Given Setup '4' worker threads and rss '2' without HTT on all DUTs
-| | And VPP interfaces in path are up
+| | Given Add '4' worker threads and rss '2' without HTT to all DUTs
+| | And   Add all PCI devices to all DUTs
+| | And   Add No Multi Seg to all DUTs
+| | And   Apply startup configuration on all VPP DUTs
+| | And   VPP interfaces in path are up
 | | When VLAN dot1q subinterfaces initialized on 3-node topology
 | | ... | ${dut1} | ${dut1_if2} | ${dut2} | ${dut2_if1} | ${subid}
 | | And L2 tag rewrite method setup on interfaces
@@ -255,8 +278,10 @@
 | | ${step_rate}= | Set Variable | 5000
 | | ${min_rate}= | Set Variable | 5000
 | | ${max_rate}= | Set Variable | 138580
-| | Given Setup '4' worker threads and rss '2' without HTT on all DUTs
-| | And VPP interfaces in path are up
+| | Given Add '4' worker threads and rss '2' without HTT to all DUTs
+| | And   Add all PCI devices to all DUTs
+| | And   Apply startup configuration on all VPP DUTs
+| | And   VPP interfaces in path are up
 | | When VLAN dot1q subinterfaces initialized on 3-node topology
 | | ... | ${dut1} | ${dut1_if2} | ${dut2} | ${dut2_if1} | ${subid}
 | | And L2 tag rewrite method setup on interfaces
diff --git a/tests/suites/performance/Long_Xconnect_Intel-X520-DA2.robot b/tests/suites/performance/Long_Xconnect_Intel-X520-DA2.robot
index d88591f4d1..6a53b4b77c 100644
--- a/tests/suites/performance/Long_Xconnect_Intel-X520-DA2.robot
+++ b/tests/suites/performance/Long_Xconnect_Intel-X520-DA2.robot
@@ -10,6 +10,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+
 *** Settings ***
 | Resource | resources/libraries/robot/performance.robot
 | Library | resources.libraries.python.InterfaceUtil
@@ -20,7 +21,8 @@
 | ... | L2 | Intel-X520-DA2
 | Suite Teardown | 3-node Performance Suite Teardown
 | Test Setup | Setup all DUTs before test
-| Test Teardown | Run Keyword | Show statistics on all DUTs
+| Test Teardown | Run Keywords | Show statistics on all DUTs
+| ...                          | Remove startup configuration of VPP from all DUTs
 | Documentation | *Throughput search suite (based on RFC2544).*
 | ...
 | ... | Test suite uses 3-node topology TG - DUT1 - DUT2 - TG, with one link
@@ -33,18 +35,21 @@
 | Find NDR by using RFC2544 linear search and 64B frames through L2 cross connect in 3-node topology
 | | [Documentation]
 | | ... | Find throughput with non drop rate for 64B frames by using
-| | ... | linear search starting at 5Mpps, stepping down with step of 0.1Mpps
+| | ... | linear search starting at 6.0Mpps, stepping down with step of 0.1Mpps
 | | [Tags] | 1_THREAD_NOHTT_RSS_1 | SINGLE_THREAD
 | | ${framesize}= | Set Variable | 64
-| | ${start_rate}= | Set Variable | 4800000
+| | ${start_rate}= | Set Variable | 6000000
 | | ${step_rate}= | Set Variable | 100000
 | | ${min_rate}= | Set Variable | 100000
 | | ${max_rate}= | Set Variable | 14880952
-| | Given Setup '1' worker threads and rss '1' without HTT on all DUTs
-| | AND   L2 xconnect initialized in a 3-node circular topology
-| | Then Find NDR using linear search and pps | ${framesize} | ${start_rate}
-| | ...                                       | ${step_rate} | 3-node-xconnect
-| | ...                                       | ${min_rate} | ${max_rate}
+| | Given Add '1' worker threads and rss '1' without HTT to all DUTs
+| | And   Add all PCI devices to all DUTs
+| | And   Add No Multi Seg to all DUTs
+| | And   Apply startup configuration on all VPP DUTs
+| | And   L2 xconnect initialized in a 3-node circular topology
+| | Then  Find NDR using linear search and pps | ${framesize} | ${start_rate}
+| | ...                                        | ${step_rate} | 3-node-xconnect
+| | ...                                        | ${min_rate} | ${max_rate}
 
 | Find NDR by using RFC2544 linear search and 1518B frames through L2 cross connect in 3-node topology
 | | [Documentation]
@@ -56,11 +61,14 @@
 | | ${step_rate}= | Set Variable | 10000
 | | ${min_rate}= | Set Variable | 10000
 | | ${max_rate}= | Set Variable | 812743
-| | Given Setup '1' worker threads and rss '1' without HTT on all DUTs
-| | AND   L2 xconnect initialized in a 3-node circular topology
-| | Then Find NDR using linear search and pps | ${framesize} | ${start_rate}
-| | ...                                       | ${step_rate} | 3-node-xconnect
-| | ...                                       | ${min_rate} | ${max_rate}
+| | Given Add '1' worker threads and rss '1' without HTT to all DUTs
+| | And   Add all PCI devices to all DUTs
+| | And   Add No Multi Seg to all DUTs
+| | And   Apply startup configuration on all VPP DUTs
+| | And   L2 xconnect initialized in a 3-node circular topology
+| | Then  Find NDR using linear search and pps | ${framesize} | ${start_rate}
+| | ...                                        | ${step_rate} | 3-node-xconnect
+| | ...                                        | ${min_rate} | ${max_rate}
 
 | Find NDR by using RFC2544 linear search and 9000B frames through L2 cross connect in 3-node topology
 | | [Documentation]
@@ -72,27 +80,32 @@
 | | ${step_rate}= | Set Variable | 5000
 | | ${min_rate}= | Set Variable | 5000
 | | ${max_rate}= | Set Variable | 138580
-| | Given Setup '1' worker threads and rss '1' without HTT on all DUTs
-| | AND   L2 xconnect initialized in a 3-node circular topology
-| | Then Find NDR using linear search and pps | ${framesize} | ${start_rate}
-| | ...                                       | ${step_rate} | 3-node-xconnect
-| | ...                                       | ${min_rate} | ${max_rate}
+| | Given Add '1' worker threads and rss '1' without HTT to all DUTs
+| | And   Add all PCI devices to all DUTs
+| | And   Apply startup configuration on all VPP DUTs
+| | And   L2 xconnect initialized in a 3-node circular topology
+| | Then  Find NDR using linear search and pps | ${framesize} | ${start_rate}
+| | ...                                        | ${step_rate} | 3-node-xconnect
+| | ...                                        | ${min_rate} | ${max_rate}
 
 | Find NDR with 2 cores and rss 1 by using RFC2544 linear search and 64B frames through L2 cross connect in 3-node topology
 | | [Documentation]
 | | ... | Find throughput on 2 cores with non drop rate for 64B frames by using
-| | ... | linear search starting at 8.2Mpps, stepping down with step of 0.1Mpps
+| | ... | linear search starting at 11Mpps, stepping down with step of 0.1Mpps
 | | [Tags] | 2_THREAD_NOHTT_RSS_1 | MULTI_THREAD
 | | ${framesize}= | Set Variable | 64
-| | ${start_rate}= | Set Variable | 12000000
+| | ${start_rate}= | Set Variable | 11000000
 | | ${step_rate}= | Set Variable | 100000
 | | ${min_rate}= | Set Variable | 100000
 | | ${max_rate}= | Set Variable | 14880952
-| | Given Setup '2' worker threads and rss '1' without HTT on all DUTs
-| | AND   L2 xconnect initialized in a 3-node circular topology
-| | Then Find NDR using linear search and pps | ${framesize} | ${start_rate}
-| | ...                                       | ${step_rate} | 3-node-xconnect
-| | ...                                       | ${min_rate} | ${max_rate}
+| | Given Add '2' worker threads and rss '1' without HTT to all DUTs
+| | And   Add all PCI devices to all DUTs
+| | And   Add No Multi Seg to all DUTs
+| | And   Apply startup configuration on all VPP DUTs
+| | And   L2 xconnect initialized in a 3-node circular topology
+| | Then  Find NDR using linear search and pps | ${framesize} | ${start_rate}
+| | ...                                        | ${step_rate} | 3-node-xconnect
+| | ...                                        | ${min_rate} | ${max_rate}
 
 | Find NDR with 2 cores and rss 1 by using RFC2544 linear search and 1518B frames through L2 cross connect in 3-node topology
 | | [Documentation]
@@ -105,11 +118,14 @@
 | | ${step_rate}= | Set Variable | 10000
 | | ${min_rate}= | Set Variable | 10000
 | | ${max_rate}= | Set Variable | 812743
-| | Given Setup '2' worker threads and rss '1' without HTT on all DUTs
-| | AND   L2 xconnect initialized in a 3-node circular topology
-| | Then Find NDR using linear search and pps | ${framesize} | ${start_rate}
-| | ...                                       | ${step_rate} | 3-node-xconnect
-| | ...                                       | ${min_rate} | ${max_rate}
+| | Given Add '2' worker threads and rss '1' without HTT to all DUTs
+| | And   Add all PCI devices to all DUTs
+| | And   Add No Multi Seg to all DUTs
+| | And   Apply startup configuration on all VPP DUTs
+| | And   L2 xconnect initialized in a 3-node circular topology
+| | Then  Find NDR using linear search and pps | ${framesize} | ${start_rate}
+| | ...                                        | ${step_rate} | 3-node-xconnect
+| | ...                                        | ${min_rate} | ${max_rate}
 
 | Find NDR with 2 cores and rss 1 by using RFC2544 linear search and 9000B frames through L2 cross connect in 3-node topology
 | | [Documentation]
@@ -122,28 +138,33 @@
 | | ${step_rate}= | Set Variable | 5000
 | | ${min_rate}= | Set Variable | 5000
 | | ${max_rate}= | Set Variable | 138580
-| | Given Setup '2' worker threads and rss '1' without HTT on all DUTs
-| | AND   L2 xconnect initialized in a 3-node circular topology
-| | Then Find NDR using linear search and pps | ${framesize} | ${start_rate}
-| | ...                                       | ${step_rate} | 3-node-xconnect
-| | ...                                       | ${min_rate} | ${max_rate}
+| | Given Add '2' worker threads and rss '1' without HTT to all DUTs
+| | And   Add all PCI devices to all DUTs
+| | And   Apply startup configuration on all VPP DUTs
+| | And   L2 xconnect initialized in a 3-node circular topology
+| | Then  Find NDR using linear search and pps | ${framesize} | ${start_rate}
+| | ...                                        | ${step_rate} | 3-node-xconnect
+| | ...                                        | ${min_rate} | ${max_rate}
 
 | Find NDR with 4 cores and rss 2 by using RFC2544 linear search and 64B frames through L2 cross connect in 3-node topology
 | | [Documentation]
 | | ... | Find throughput on 4 cores and rss 2 with non drop rate for 64B
-| | ... | frames by using linear search starting at 12.2Mpps, stepping down
+| | ... | frames by using linear search starting at 13.5Mpps, stepping down
 | | ... | with step of 0.1Mpps
 | | [Tags] | 4_THREAD_NOHTT_RSS_2 | MULTI_THREAD
 | | ${framesize}= | Set Variable | 64
-| | ${start_rate}= | Set Variable | 12200000
+| | ${start_rate}= | Set Variable | 13500000
 | | ${step_rate}= | Set Variable | 100000
 | | ${min_rate}= | Set Variable | 100000
 | | ${max_rate}= | Set Variable | 14880952
-| | Given Setup '4' worker threads and rss '2' without HTT on all DUTs
-| | AND   L2 xconnect initialized in a 3-node circular topology
-| | Then Find NDR using linear search and pps | ${framesize} | ${start_rate}
-| | ...                                       | ${step_rate} | 3-node-xconnect
-| | ...                                       | ${min_rate} | ${max_rate}
+| | Given Add '4' worker threads and rss '2' without HTT to all DUTs
+| | And   Add all PCI devices to all DUTs
+| | And   Add No Multi Seg to all DUTs
+| | And   Apply startup configuration on all VPP DUTs
+| | And   L2 xconnect initialized in a 3-node circular topology
+| | Then  Find NDR using linear search and pps | ${framesize} | ${start_rate}
+| | ...                                        | ${step_rate} | 3-node-xconnect
+| | ...                                        | ${min_rate} | ${max_rate}
 
 | Find NDR with 4 cores and rss 2 by using RFC2544 linear search and 1518B frames through L2 cross connect in 3-node topology
 | | [Documentation]
@@ -156,11 +177,14 @@
 | | ${step_rate}= | Set Variable | 10000
 | | ${min_rate}= | Set Variable | 10000
 | | ${max_rate}= | Set Variable | 812743
-| | Given Setup '4' worker threads and rss '2' without HTT on all DUTs
-| | AND   L2 xconnect initialized in a 3-node circular topology
-| | Then Find NDR using linear search and pps | ${framesize} | ${start_rate}
-| | ...                                       | ${step_rate} | 3-node-xconnect
-| | ...                                       | ${min_rate} | ${max_rate}
+| | Given Add '4' worker threads and rss '2' without HTT to all DUTs
+| | And   Add all PCI devices to all DUTs
+| | And   Add No Multi Seg to all DUTs
+| | And   Apply startup configuration on all VPP DUTs
+| | And   L2 xconnect initialized in a 3-node circular topology
+| | Then  Find NDR using linear search and pps | ${framesize} | ${start_rate}
+| | ...                                        | ${step_rate} | 3-node-xconnect
+| | ...                                        | ${min_rate} | ${max_rate}
 
 | Find NDR with 4 cores and rss 2 by using RFC2544 linear search and 9000B frames through L2 cross connect in 3-node topology
 | | [Documentation]
@@ -173,8 +197,10 @@
 | | ${step_rate}= | Set Variable | 5000
 | | ${min_rate}= | Set Variable | 5000
 | | ${max_rate}= | Set Variable | 138580
-| | Given Setup '4' worker threads and rss '2' without HTT on all DUTs
-| | AND   L2 xconnect initialized in a 3-node circular topology
-| | Then Find NDR using linear search and pps | ${framesize} | ${start_rate}
-| | ...                                       | ${step_rate} | 3-node-xconnect
-| | ...                                       | ${min_rate} | ${max_rate}
+| | Given Add '4' worker threads and rss '2' without HTT to all DUTs
+| | And   Add all PCI devices to all DUTs
+| | And   Apply startup configuration on all VPP DUTs
+| | And   L2 xconnect initialized in a 3-node circular topology
+| | Then  Find NDR using linear search and pps | ${framesize} | ${start_rate}
+| | ...                                        | ${step_rate} | 3-node-xconnect
+| | ...                                        | ${min_rate} | ${max_rate}
diff --git a/tests/suites/performance/Short_Bridge_Domain_Intel-X520-DA2.robot b/tests/suites/performance/Short_Bridge_Domain_Intel-X520-DA2.robot
index 8dd7a7d4c8..5972ab2c96 100644
--- a/tests/suites/performance/Short_Bridge_Domain_Intel-X520-DA2.robot
+++ b/tests/suites/performance/Short_Bridge_Domain_Intel-X520-DA2.robot
@@ -19,7 +19,8 @@
 | ... | L2 | Intel-X520-DA2
 | Suite Teardown | 3-node Performance Suite Teardown
 | Test Setup | Setup all DUTs before test
-| Test Teardown | Run Keyword | Show statistics on all DUTs
+| Test Teardown | Run Keywords | Show statistics on all DUTs
+| ...                          | Remove startup configuration of VPP from all DUTs
 | Documentation | Minimal throughput acceptance test cases
 
 *** Test Cases ***
@@ -31,10 +32,13 @@
 | | ${framesize}= | Set Variable | 64
 | | ${duration}= | Set Variable | 10
 | | ${rate}= | Set Variable | 3.2mpps
-| | Given Setup '1' worker threads and rss '1' without HTT on all DUTs
-| | AND   L2 bridge domain initialized in a 3-node circular topology
-| | Then Traffic should pass with no loss | ${duration} | ${rate}
-| | ...                                   | ${framesize} | 3-node-bridge
+| | Given Add '1' worker threads and rss '1' without HTT to all DUTs
+| | And   Add all PCI devices to all DUTs
+| | And   Add No Multi Seg to all DUTs
+| | And   Apply startup configuration on all VPP DUTs
+| | And   L2 bridge domain initialized in a 3-node circular topology
+| | Then  Traffic should pass with no loss | ${duration} | ${rate}
+| | ...                                    | ${framesize} | 3-node-bridge
 
 | 1core VPP passes 1518B frames through bridge domain at 2x 812,743pps in 3-node topology
 | | [Documentation]
@@ -44,8 +48,11 @@
 | | ${framesize}= | Set Variable | 1518
 | | ${duration}= | Set Variable | 10
 | | ${rate}= | Set Variable | 812743pps
-| | Given Setup '1' worker threads and rss '1' without HTT on all DUTs
-| | AND   L2 bridge domain initialized in a 3-node circular topology
+| | Given Add '1' worker threads and rss '1' without HTT to all DUTs
+| | And   Add all PCI devices to all DUTs
+| | And   Add No Multi Seg to all DUTs
+| | And   Apply startup configuration on all VPP DUTs
+| | And   L2 bridge domain initialized in a 3-node circular topology
 | | Then Traffic should pass with no loss | ${duration} | ${rate}
 | | ...                                   | ${framesize} | 3-node-bridge
 
@@ -57,8 +64,10 @@
 | | ${framesize}= | Set Variable | 9000
 | | ${duration}= | Set Variable | 10
 | | ${rate}= | Set Variable | 138580pps
-| | Given Setup '1' worker threads and rss '1' without HTT on all DUTs
-| | AND   L2 bridge domain initialized in a 3-node circular topology
+| | Given Add '1' worker threads and rss '1' without HTT to all DUTs
+| | And   Add all PCI devices to all DUTs
+| | And   Apply startup configuration on all VPP DUTs
+| | And   L2 bridge domain initialized in a 3-node circular topology
 | | Then Traffic should pass with no loss | ${duration} | ${rate}
 | | ...                                   | ${framesize} | 3-node-bridge
 
@@ -70,8 +79,11 @@
 | | ${framesize}= | Set Variable | 64
 | | ${duration}= | Set Variable | 10
 | | ${rate}= | Set Variable | 6.9mpps
-| | Given Setup '2' worker threads and rss '1' without HTT on all DUTs
-| | AND   L2 bridge domain initialized in a 3-node circular topology
+| | Given Add '2' worker threads and rss '1' without HTT to all DUTs
+| | And   Add all PCI devices to all DUTs
+| | And   Add No Multi Seg to all DUTs
+| | And   Apply startup configuration on all VPP DUTs
+| | And   L2 bridge domain initialized in a 3-node circular topology
 | | Then Traffic should pass with no loss | ${duration} | ${rate}
 | | ...                                   | ${framesize} | 3-node-bridge
 
@@ -83,8 +95,11 @@
 | | ${framesize}= | Set Variable | 1518
 | | ${duration}= | Set Variable | 10
 | | ${rate}= | Set Variable | 812743pps
-| | Given Setup '2' worker threads and rss '1' without HTT on all DUTs
-| | AND   L2 bridge domain initialized in a 3-node circular topology
+| | Given Add '2' worker threads and rss '1' without HTT to all DUTs
+| | And   Add all PCI devices to all DUTs
+| | And   Add No Multi Seg to all DUTs
+| | And   Apply startup configuration on all VPP DUTs
+| | And   L2 bridge domain initialized in a 3-node circular topology
 | | Then Traffic should pass with no loss | ${duration} | ${rate}
 | | ...                                   | ${framesize} | 3-node-bridge
 
@@ -96,8 +111,10 @@
 | | ${framesize}= | Set Variable | 9000
 | | ${duration}= | Set Variable | 10
 | | ${rate}= | Set Variable | 138580pps
-| | Given Setup '2' worker threads and rss '1' without HTT on all DUTs
-| | AND   L2 bridge domain initialized in a 3-node circular topology
+| | Given Add '2' worker threads and rss '1' without HTT to all DUTs
+| | And   Add all PCI devices to all DUTs
+| | And   Apply startup configuration on all VPP DUTs
+| | And   L2 bridge domain initialized in a 3-node circular topology
 | | Then Traffic should pass with no loss | ${duration} | ${rate}
 | | ...                                   | ${framesize} | 3-node-bridge
 
@@ -109,8 +126,11 @@
 | | ${framesize}= | Set Variable | 64
 | | ${duration}= | Set Variable | 10
 | | ${rate}= | Set Variable | 7.4mpps
-| | Given Setup '4' worker threads and rss '2' without HTT on all DUTs
-| | AND   L2 bridge domain initialized in a 3-node circular topology
+| | Given Add '4' worker threads and rss '2' without HTT to all DUTs
+| | And   Add all PCI devices to all DUTs
+| | And   Add No Multi Seg to all DUTs
+| | And   Apply startup configuration on all VPP DUTs
+| | And   L2 bridge domain initialized in a 3-node circular topology
 | | Then Traffic should pass with no loss | ${duration} | ${rate}
 | | ...                                   | ${framesize} | 3-node-bridge
 
@@ -122,8 +142,11 @@
 | | ${framesize}= | Set Variable | 1518
 | | ${duration}= | Set Variable | 10
 | | ${rate}= | Set Variable | 812743pps
-| | Given Setup '4' worker threads and rss '2' without HTT on all DUTs
-| | AND   L2 bridge domain initialized in a 3-node circular topology
+| | Given Add '4' worker threads and rss '2' without HTT to all DUTs
+| | And   Add all PCI devices to all DUTs
+| | And   Add No Multi Seg to all DUTs
+| | And   Apply startup configuration on all VPP DUTs
+| | And   L2 bridge domain initialized in a 3-node circular topology
 | | Then Traffic should pass with no loss | ${duration} | ${rate}
 | | ...                                   | ${framesize} | 3-node-bridge
 
@@ -135,7 +158,9 @@
 | | ${framesize}= | Set Variable | 9000
 | | ${duration}= | Set Variable | 10
 | | ${rate}= | Set Variable | 138580pps
-| | Given Setup '4' worker threads and rss '2' without HTT on all DUTs
-| | AND   L2 bridge domain initialized in a 3-node circular topology
+| | Given Add '4' worker threads and rss '2' without HTT to all DUTs
+| | And   Add all PCI devices to all DUTs
+| | And   Apply startup configuration on all VPP DUTs
+| | And   L2 bridge domain initialized in a 3-node circular topology
 | | Then Traffic should pass with no loss | ${duration} | ${rate}
 | | ...                                   | ${framesize} | 3-node-bridge
diff --git a/tests/suites/performance/Short_IPv4_Intel-X520-DA2.robot b/tests/suites/performance/Short_IPv4_Intel-X520-DA2.robot
index 2cbd2e5b08..ec17c9cf91 100644
--- a/tests/suites/performance/Short_IPv4_Intel-X520-DA2.robot
+++ b/tests/suites/performance/Short_IPv4_Intel-X520-DA2.robot
@@ -23,7 +23,8 @@
 | ... | L3 | Intel-X520-DA2
 | Suite Teardown | 3-node Performance Suite Teardown
 | Test Setup | Setup all DUTs before test
-| Test Teardown | Run Keyword | Show statistics on all DUTs
+| Test Teardown | Run Keywords | Show statistics on all DUTs
+| ...                          | Remove startup configuration of VPP from all DUTs
 | Documentation | Minimal throughput acceptance test cases
 
 *** Test Cases ***
@@ -35,10 +36,13 @@
 | | ${framesize}= | Set Variable | 64
 | | ${duration}= | Set Variable | 10
 | | ${rate}= | Set Variable | 3.5mpps
-| | Given Setup '1' worker threads and rss '1' without HTT on all DUTs
-| | AND   IPv4 forwarding initialized in a 3-node circular topology
-| | Then Traffic should pass with no loss | ${duration} | ${rate}
-| | ...                                   | ${framesize} | 3-node-IPv4
+| | Given Add '1' worker threads and rss '1' without HTT to all DUTs
+| | And   Add all PCI devices to all DUTs
+| | And   Add No Multi Seg to all DUTs
+| | And   Apply startup configuration on all VPP DUTs
+| | And   IPv4 forwarding initialized in a 3-node circular topology
+| | Then  Traffic should pass with no loss | ${duration} | ${rate}
+| | ...                                    | ${framesize} | 3-node-IPv4
 
 | 1core VPP passes 1518B frames through IPv4 forwarding at 2x 812,743pps in 3-node topology
 | | [Documentation]
@@ -48,10 +52,13 @@
 | | ${framesize}= | Set Variable | 1518
 | | ${duration}= | Set Variable | 10
 | | ${rate}= | Set Variable | 812743pps
-| | Given Setup '1' worker threads and rss '1' without HTT on all DUTs
-| | AND   IPv4 forwarding initialized in a 3-node circular topology
-| | Then Traffic should pass with no loss | ${duration} | ${rate}
-| | ...                                   | ${framesize} | 3-node-IPv4
+| | Given Add '1' worker threads and rss '1' without HTT to all DUTs
+| | And   Add all PCI devices to all DUTs
+| | And   Add No Multi Seg to all DUTs
+| | And   Apply startup configuration on all VPP DUTs
+| | And   IPv4 forwarding initialized in a 3-node circular topology
+| | Then  Traffic should pass with no loss | ${duration} | ${rate}
+| | ...                                    | ${framesize} | 3-node-IPv4
 
 | 1core VPP passes 9000B frames through IPv4 forwarding at 2x 138,580pps in 3-node topology
 | | [Documentation]
@@ -61,8 +68,10 @@
 | | ${framesize}= | Set Variable | 9000
 | | ${duration}= | Set Variable | 10
 | | ${rate}= | Set Variable | 138580pps
-| | Given Setup '1' worker threads and rss '1' without HTT on all DUTs
-| | AND   IPv4 forwarding initialized in a 3-node circular topology
+| | Given Add '1' worker threads and rss '1' without HTT to all DUTs
+| | And   Add all PCI devices to all DUTs
+| | And   Apply startup configuration on all VPP DUTs
+| | And   IPv4 forwarding initialized in a 3-node circular topology
 | | Then Traffic should pass with no loss | ${duration} | ${rate}
 | | ...                                   | ${framesize} | 3-node-IPv4
 
@@ -74,8 +83,11 @@
 | | ${framesize}= | Set Variable | 64
 | | ${duration}= | Set Variable | 10
 | | ${rate}= | Set Variable | 7.5mpps
-| | Given Setup '2' worker threads and rss '1' without HTT on all DUTs
-| | AND   IPv4 forwarding initialized in a 3-node circular topology
+| | Given Add '2' worker threads and rss '1' without HTT to all DUTs
+| | And   Add all PCI devices to all DUTs
+| | And   Add No Multi Seg to all DUTs
+| | And   Apply startup configuration on all VPP DUTs
+| | And   IPv4 forwarding initialized in a 3-node circular topology
 | | Then Traffic should pass with no loss | ${duration} | ${rate}
 | | ...                                   | ${framesize} | 3-node-IPv4
 
@@ -87,8 +99,11 @@
 | | ${framesize}= | Set Variable | 1518
 | | ${duration}= | Set Variable | 10
 | | ${rate}= | Set Variable | 812743pps
-| | Given Setup '2' worker threads and rss '1' without HTT on all DUTs
-| | AND   IPv4 forwarding initialized in a 3-node circular topology
+| | Given Add '2' worker threads and rss '1' without HTT to all DUTs
+| | And   Add all PCI devices to all DUTs
+| | And   Add No Multi Seg to all DUTs
+| | And   Apply startup configuration on all VPP DUTs
+| | And   IPv4 forwarding initialized in a 3-node circular topology
 | | Then Traffic should pass with no loss | ${duration} | ${rate}
 | | ...                                   | ${framesize} | 3-node-IPv4
 
@@ -100,8 +115,10 @@
 | | ${framesize}= | Set Variable | 9000
 | | ${duration}= | Set Variable | 10
 | | ${rate}= | Set Variable | 138580pps
-| | Given Setup '2' worker threads and rss '1' without HTT on all DUTs
-| | AND   IPv4 forwarding initialized in a 3-node circular topology
+| | Given Add '2' worker threads and rss '1' without HTT to all DUTs
+| | And   Add all PCI devices to all DUTs
+| | And   Apply startup configuration on all VPP DUTs
+| | And   IPv4 forwarding initialized in a 3-node circular topology
 | | Then Traffic should pass with no loss | ${duration} | ${rate}
 | | ...                                   | ${framesize} | 3-node-IPv4
 
@@ -113,8 +130,11 @@
 | | ${framesize}= | Set Variable | 64
 | | ${duration}= | Set Variable | 10
 | | ${rate}= | Set Variable | 7.8mpps
-| | Given Setup '4' worker threads and rss '2' without HTT on all DUTs
-| | AND   IPv4 forwarding initialized in a 3-node circular topology
+| | Given Add '4' worker threads and rss '2' without HTT to all DUTs
+| | And   Add all PCI devices to all DUTs
+| | And   Add No Multi Seg to all DUTs
+| | And   Apply startup configuration on all VPP DUTs
+| | And   IPv4 forwarding initialized in a 3-node circular topology
 | | Then Traffic should pass with no loss | ${duration} | ${rate}
 | | ...                                   | ${framesize} | 3-node-IPv4
 
@@ -126,8 +146,11 @@
 | | ${framesize}= | Set Variable | 1518
 | | ${duration}= | Set Variable | 10
 | | ${rate}= | Set Variable | 812743pps
-| | Given Setup '4' worker threads and rss '2' without HTT on all DUTs
-| | AND   IPv4 forwarding initialized in a 3-node circular topology
+| | Given Add '4' worker threads and rss '2' without HTT to all DUTs
+| | And   Add all PCI devices to all DUTs
+| | And   Add No Multi Seg to all DUTs
+| | And   Apply startup configuration on all VPP DUTs
+| | And   IPv4 forwarding initialized in a 3-node circular topology
 | | Then Traffic should pass with no loss | ${duration} | ${rate}
 | | ...                                   | ${framesize} | 3-node-IPv4
 
@@ -139,7 +162,9 @@
 | | ${framesize}= | Set Variable | 9000
 | | ${duration}= | Set Variable | 10
 | | ${rate}= | Set Variable | 138580pps
-| | Given Setup '4' worker threads and rss '2' without HTT on all DUTs
-| | AND   IPv4 forwarding initialized in a 3-node circular topology
+| | Given Add '4' worker threads and rss '2' without HTT to all DUTs
+| | And   Add all PCI devices to all DUTs
+| | And   Apply startup configuration on all VPP DUTs
+| | And   IPv4 forwarding initialized in a 3-node circular topology
 | | Then Traffic should pass with no loss | ${duration} | ${rate}
 | | ...                                   | ${framesize} | 3-node-IPv4
diff --git a/tests/suites/performance/Short_IPv6_Intel-X520-DA2.robot b/tests/suites/performance/Short_IPv6_Intel-X520-DA2.robot
index 83412eb187..50690c572a 100644
--- a/tests/suites/performance/Short_IPv6_Intel-X520-DA2.robot
+++ b/tests/suites/performance/Short_IPv6_Intel-X520-DA2.robot
@@ -19,7 +19,8 @@
 
 | Suite Teardown | 3-node Performance Suite Teardown
 | Test Setup | Setup all DUTs before test
-| Test Teardown | Run Keyword | Show statistics on all DUTs
+| Test Teardown | Run Keywords | Show statistics on all DUTs
+| ...                          | Remove startup configuration of VPP from all DUTs
 | Documentation | Minimal throughput acceptance test cases
 
 *** Test Cases ***
@@ -31,10 +32,13 @@
 | | ${framesize}= | Set Variable | 78
 | | ${duration}= | Set Variable | 10
 | | ${rate}= | Set Variable | 2.9mpps
-| | Given Setup '1' worker threads and rss '1' without HTT on all DUTs
+| | Given Add '1' worker threads and rss '1' without HTT to all DUTs
+| | And   Add all PCI devices to all DUTs
+| | And   Add No Multi Seg to all DUTs
+| | And   Apply startup configuration on all VPP DUTs
 | | And   IPv6 forwarding initialized in a 3-node circular topology
-| | Then Traffic should pass with no loss | ${duration} | ${rate}
-| | ...                                   | ${framesize} | 3-node-IPv6
+| | Then  Traffic should pass with no loss | ${duration} | ${rate}
+| | ...                                    | ${framesize} | 3-node-IPv6
 
 | 1core VPP passes 1518B frames through IPv6 forwarding at 2x 812,743pps in 3-node topology
 | | [Documentation]
@@ -44,10 +48,13 @@
 | | ${framesize}= | Set Variable | 1518
 | | ${duration}= | Set Variable | 10
 | | ${rate}= | Set Variable | 812743pps
-| | Given Setup '1' worker threads and rss '1' without HTT on all DUTs
+| | Given Add '1' worker threads and rss '1' without HTT to all DUTs
+| | And   Add all PCI devices to all DUTs
+| | And   Add No Multi Seg to all DUTs
+| | And   Apply startup configuration on all VPP DUTs
 | | And   IPv6 forwarding initialized in a 3-node circular topology
-| | Then Traffic should pass with no loss | ${duration} | ${rate}
-| | ...                                   | ${framesize} | 3-node-IPv6
+| | Then  Traffic should pass with no loss | ${duration} | ${rate}
+| | ...                                    | ${framesize} | 3-node-IPv6
 
 | 1core VPP passes 9000B frames through IPv6 forwarding at 2x 138,580pps in 3-node topology
 | | [Documentation]
@@ -57,10 +64,12 @@
 | | ${framesize}= | Set Variable | 9000
 | | ${duration}= | Set Variable | 10
 | | ${rate}= | Set Variable | 138580pps
-| | Given Setup '1' worker threads and rss '1' without HTT on all DUTs
+| | Given Add '1' worker threads and rss '1' without HTT to all DUTs
+| | And   Add all PCI devices to all DUTs
+| | And   Apply startup configuration on all VPP DUTs
 | | And   IPv6 forwarding initialized in a 3-node circular topology
-| | Then Traffic should pass with no loss | ${duration} | ${rate}
-| | ...                                   | ${framesize} | 3-node-IPv6
+| | Then  Traffic should pass with no loss | ${duration} | ${rate}
+| | ...                                    | ${framesize} | 3-node-IPv6
 
 | 2core VPP with rss 1 passes 78B frames through IPv6 forwarding at 2x 5.9Mpps in 3-node topology
 | | [Documentation]
@@ -70,10 +79,13 @@
 | | ${framesize}= | Set Variable | 78
 | | ${duration}= | Set Variable | 10
 | | ${rate}= | Set Variable | 5.9mpps
-| | Given Setup '2' worker threads and rss '1' without HTT on all DUTs
+| | Given Add '2' worker threads and rss '1' without HTT to all DUTs
+| | And   Add all PCI devices to all DUTs
+| | And   Add No Multi Seg to all DUTs
+| | And   Apply startup configuration on all VPP DUTs
 | | And   IPv6 forwarding initialized in a 3-node circular topology
-| | Then Traffic should pass with no loss | ${duration} | ${rate}
-| | ...                                   | ${framesize} | 3-node-IPv6
+| | Then  Traffic should pass with no loss | ${duration} | ${rate}
+| | ...                                    | ${framesize} | 3-node-IPv6
 
 | 2core VPP with rss 1 passes 1518B frames through IPv6 forwarding at 2x 812,743pps in 3-node topology
 | | [Documentation]
@@ -83,10 +95,13 @@
 | | ${framesize}= | Set Variable | 1518
 | | ${duration}= | Set Variable | 10
 | | ${rate}= | Set Variable | 812743pps
-| | Given Setup '2' worker threads and rss '1' without HTT on all DUTs
+| | Given Add '2' worker threads and rss '1' without HTT to all DUTs
+| | And   Add all PCI devices to all DUTs
+| | And   Add No Multi Seg to all DUTs
+| | And   Apply startup configuration on all VPP DUTs
 | | And   IPv6 forwarding initialized in a 3-node circular topology
-| | Then Traffic should pass with no loss | ${duration} | ${rate}
-| | ...                                   | ${framesize} | 3-node-IPv6
+| | Then  Traffic should pass with no loss | ${duration} | ${rate}
+| | ...                                    | ${framesize} | 3-node-IPv6
 
 | 2core VPP with rss 1 passes 9000B frames through IPv6 forwarding at 2x 138,580pps in 3-node topology
 | | [Documentation]
@@ -96,10 +111,12 @@
 | | ${framesize}= | Set Variable | 9000
 | | ${duration}= | Set Variable | 10
 | | ${rate}= | Set Variable | 138580pps
-| | Given Setup '2' worker threads and rss '1' without HTT on all DUTs
+| | Given Add '2' worker threads and rss '1' without HTT to all DUTs
+| | And   Add all PCI devices to all DUTs
+| | And   Apply startup configuration on all VPP DUTs
 | | And   IPv6 forwarding initialized in a 3-node circular topology
-| | Then Traffic should pass with no loss | ${duration} | ${rate}
-| | ...                                   | ${framesize} | 3-node-IPv6
+| | Then  Traffic should pass with no loss | ${duration} | ${rate}
+| | ...                                    | ${framesize} | 3-node-IPv6
 
 | 4core VPP with rss 2 passes 78B frames through IPv6 forwarding at 2x 7.3Mpps in 3-node topology
 | | [Documentation]
@@ -109,10 +126,13 @@
 | | ${framesize}= | Set Variable | 78
 | | ${duration}= | Set Variable | 10
 | | ${rate}= | Set Variable | 7.3mpps
-| | Given Setup '4' worker threads and rss '2' without HTT on all DUTs
+| | Given Add '4' worker threads and rss '2' without HTT to all DUTs
+| | And   Add all PCI devices to all DUTs
+| | And   Add No Multi Seg to all DUTs
+| | And   Apply startup configuration on all VPP DUTs
 | | And   IPv6 forwarding initialized in a 3-node circular topology
-| | Then Traffic should pass with no loss | ${duration} | ${rate}
-| | ...                                   | ${framesize} | 3-node-IPv6
+| | Then  Traffic should pass with no loss | ${duration} | ${rate}
+| | ...                                    | ${framesize} | 3-node-IPv6
 
 | 4core VPP with rss 2 passes 1518B frames through IPv6 forwarding at 2x 812,743pps in 3-node topology
 | | [Documentation]
@@ -122,10 +142,13 @@
 | | ${framesize}= | Set Variable | 1518
 | | ${duration}= | Set Variable | 10
 | | ${rate}= | Set Variable | 812743pps
-| | Given Setup '4' worker threads and rss '2' without HTT on all DUTs
+| | Given Add '4' worker threads and rss '2' without HTT to all DUTs
+| | And   Add all PCI devices to all DUTs
+| | And   Add No Multi Seg to all DUTs
+| | And   Apply startup configuration on all VPP DUTs
 | | And   IPv6 forwarding initialized in a 3-node circular topology
-| | Then Traffic should pass with no loss | ${duration} | ${rate}
-| | ...                                   | ${framesize} | 3-node-IPv6
+| | Then  Traffic should pass with no loss | ${duration} | ${rate}
+| | ...                                    | ${framesize} | 3-node-IPv6
 
 | 4core VPP with rss 2 passes 9000B frames through IPv6 forwarding at 2x 138,580pps in 3-node topology
 | | [Documentation]
@@ -135,7 +158,9 @@
 | | ${framesize}= | Set Variable | 9000
 | | ${duration}= | Set Variable | 10
 | | ${rate}= | Set Variable | 138580pps
-| | Given Setup '4' worker threads and rss '2' without HTT on all DUTs
+| | Given Add '4' worker threads and rss '2' without HTT to all DUTs
+| | And   Add all PCI devices to all DUTs
+| | And   Apply startup configuration on all VPP DUTs
 | | And   IPv6 forwarding initialized in a 3-node circular topology
-| | Then Traffic should pass with no loss | ${duration} | ${rate}
-| | ...                                   | ${framesize} | 3-node-IPv6
+| | Then  Traffic should pass with no loss | ${duration} | ${rate}
+| | ...                                    | ${framesize} | 3-node-IPv6
diff --git a/tests/suites/performance/Short_Xconnect_Dot1q_Intel-X520-DA2.robot b/tests/suites/performance/Short_Xconnect_Dot1q_Intel-X520-DA2.robot
index d0ede20e93..fb314a3ced 100644
--- a/tests/suites/performance/Short_Xconnect_Dot1q_Intel-X520-DA2.robot
+++ b/tests/suites/performance/Short_Xconnect_Dot1q_Intel-X520-DA2.robot
@@ -20,7 +20,8 @@
 | ... | L2 | Intel-X520-DA2
 | Suite Teardown | 3-node Performance Suite Teardown
 | Test Setup | Setup all DUTs before test
-| Test Teardown | Run Keyword | Show statistics on all DUTs
+| Test Teardown | Run Keywords | Show statistics on all DUTs
+| ...                          | Remove startup configuration of VPP from all DUTs
 | Documentation | Minimal throughput acceptance test cases
 
 *** Variables ***
@@ -38,8 +39,11 @@
 | | ${framesize}= | Set Variable | 64
 | | ${duration}= | Set Variable | 10
 | | ${rate}= | Set Variable | 2.9mpps
-| | Given Setup '1' worker threads and rss '1' without HTT on all DUTs
-| | And VPP interfaces in path are up
+| | Given Add '1' worker threads and rss '1' without HTT to all DUTs
+| | And   Add all PCI devices to all DUTs
+| | And   Add No Multi Seg to all DUTs
+| | And   Apply startup configuration on all VPP DUTs
+| | And   VPP interfaces in path are up
 | | When VLAN dot1q subinterfaces initialized on 3-node topology
 | | ... | ${dut1} | ${dut1_if2} | ${dut2} | ${dut2_if1} | ${subid}
 | | And L2 tag rewrite method setup on interfaces
@@ -61,8 +65,11 @@
 | | ${framesize}= | Set Variable | 1518
 | | ${duration}= | Set Variable | 10
 | | ${rate}= | Set Variable | 720000pps
-| | Given Setup '1' worker threads and rss '1' without HTT on all DUTs
-| | And VPP interfaces in path are up
+| | Given Add '1' worker threads and rss '1' without HTT to all DUTs
+| | And   Add all PCI devices to all DUTs
+| | And   Add No Multi Seg to all DUTs
+| | And   Apply startup configuration on all VPP DUTs
+| | And   VPP interfaces in path are up
 | | When VLAN dot1q subinterfaces initialized on 3-node topology
 | | ... | ${dut1} | ${dut1_if2} | ${dut2} | ${dut2_if1} | ${subid}
 | | And L2 tag rewrite method setup on interfaces
@@ -84,8 +91,10 @@
 | | ${framesize}= | Set Variable | 9000
 | | ${duration}= | Set Variable | 10
 | | ${rate}= | Set Variable | 120000pps
-| | Given Setup '1' worker threads and rss '1' without HTT on all DUTs
-| | And VPP interfaces in path are up
+| | Given Add '1' worker threads and rss '1' without HTT to all DUTs
+| | And   Add all PCI devices to all DUTs
+| | And   Apply startup configuration on all VPP DUTs
+| | And   VPP interfaces in path are up
 | | When VLAN dot1q subinterfaces initialized on 3-node topology
 | | ... | ${dut1} | ${dut1_if2} | ${dut2} | ${dut2_if1} | ${subid}
 | | And L2 tag rewrite method setup on interfaces
@@ -107,8 +116,11 @@
 | | ${framesize}= | Set Variable | 64
 | | ${duration}= | Set Variable | 10
 | | ${rate}= | Set Variable | 5.8mpps
-| | Given Setup '2' worker threads and rss '1' without HTT on all DUTs
-| | And VPP interfaces in path are up
+| | Given Add '2' worker threads and rss '1' without HTT to all DUTs
+| | And   Add all PCI devices to all DUTs
+| | And   Add No Multi Seg to all DUTs
+| | And   Apply startup configuration on all VPP DUTs
+| | And   VPP interfaces in path are up
 | | When VLAN dot1q subinterfaces initialized on 3-node topology
 | | ... | ${dut1} | ${dut1_if2} | ${dut2} | ${dut2_if1} | ${subid}
 | | And L2 tag rewrite method setup on interfaces
@@ -130,8 +142,11 @@
 | | ${framesize}= | Set Variable | 1518
 | | ${duration}= | Set Variable | 10
 | | ${rate}= | Set Variable | 720000pps
-| | Given Setup '2' worker threads and rss '1' without HTT on all DUTs
-| | And VPP interfaces in path are up
+| | Given Add '2' worker threads and rss '1' without HTT to all DUTs
+| | And   Add all PCI devices to all DUTs
+| | And   Add No Multi Seg to all DUTs
+| | And   Apply startup configuration on all VPP DUTs
+| | And   VPP interfaces in path are up
 | | When VLAN dot1q subinterfaces initialized on 3-node topology
 | | ... | ${dut1} | ${dut1_if2} | ${dut2} | ${dut2_if1} | ${subid}
 | | And L2 tag rewrite method setup on interfaces
@@ -153,8 +168,10 @@
 | | ${framesize}= | Set Variable | 9000
 | | ${duration}= | Set Variable | 10
 | | ${rate}= | Set Variable | 120000pps
-| | Given Setup '2' worker threads and rss '1' without HTT on all DUTs
-| | And VPP interfaces in path are up
+| | Given Add '2' worker threads and rss '1' without HTT to all DUTs
+| | And   Add all PCI devices to all DUTs
+| | And   Apply startup configuration on all VPP DUTs
+| | And   VPP interfaces in path are up
 | | When VLAN dot1q subinterfaces initialized on 3-node topology
 | | ... | ${dut1} | ${dut1_if2} | ${dut2} | ${dut2_if1} | ${subid}
 | | And L2 tag rewrite method setup on interfaces
@@ -176,8 +193,11 @@
 | | ${framesize}= | Set Variable | 64
 | | ${duration}= | Set Variable | 10
 | | ${rate}= | Set Variable | 9.0mpps
-| | Given Setup '4' worker threads and rss '2' without HTT on all DUTs
-| | And VPP interfaces in path are up
+| | Given Add '4' worker threads and rss '2' without HTT to all DUTs
+| | And   Add all PCI devices to all DUTs
+| | And   Add No Multi Seg to all DUTs
+| | And   Apply startup configuration on all VPP DUTs
+| | And   VPP interfaces in path are up
 | | When VLAN dot1q subinterfaces initialized on 3-node topology
 | | ... | ${dut1} | ${dut1_if2} | ${dut2} | ${dut2_if1} | ${subid}
 | | And L2 tag rewrite method setup on interfaces
@@ -199,8 +219,11 @@
 | | ${framesize}= | Set Variable | 1518
 | | ${duration}= | Set Variable | 10
 | | ${rate}= | Set Variable | 720000pps
-| | Given Setup '4' worker threads and rss '2' without HTT on all DUTs
-| | And VPP interfaces in path are up
+| | Given Add '4' worker threads and rss '2' without HTT to all DUTs
+| | And   Add all PCI devices to all DUTs
+| | And   Add No Multi Seg to all DUTs
+| | And   Apply startup configuration on all VPP DUTs
+| | And   VPP interfaces in path are up
 | | When VLAN dot1q subinterfaces initialized on 3-node topology
 | | ... | ${dut1} | ${dut1_if2} | ${dut2} | ${dut2_if1} | ${subid}
 | | And L2 tag rewrite method setup on interfaces
@@ -222,8 +245,10 @@
 | | ${framesize}= | Set Variable | 9000
 | | ${duration}= | Set Variable | 10
 | | ${rate}= | Set Variable | 120000pps
-| | Given Setup '4' worker threads and rss '2' without HTT on all DUTs
-| | And VPP interfaces in path are up
+| | Given Add '4' worker threads and rss '2' without HTT to all DUTs
+| | And   Add all PCI devices to all DUTs
+| | And   Apply startup configuration on all VPP DUTs
+| | And   VPP interfaces in path are up
 | | When VLAN dot1q subinterfaces initialized on 3-node topology
 | | ... | ${dut1} | ${dut1_if2} | ${dut2} | ${dut2_if1} | ${subid}
 | | And L2 tag rewrite method setup on interfaces
diff --git a/tests/suites/performance/Short_Xconnect_Intel-X520-DA2.robot b/tests/suites/performance/Short_Xconnect_Intel-X520-DA2.robot
index 11ac9eddc8..c6cc2eede4 100644
--- a/tests/suites/performance/Short_Xconnect_Intel-X520-DA2.robot
+++ b/tests/suites/performance/Short_Xconnect_Intel-X520-DA2.robot
@@ -20,7 +20,8 @@
 | ... | L2 | Intel-X520-DA2
 | Suite Teardown | 3-node Performance Suite Teardown
 | Test Setup | Setup all DUTs before test
-| Test Teardown | Run Keyword | Show statistics on all DUTs
+| Test Teardown | Run Keywords | Show statistics on all DUTs
+| ...                          | Remove startup configuration of VPP from all DUTs
 | Documentation | Minimal throughput acceptance test cases
 
 *** Test Cases ***
@@ -32,10 +33,13 @@
 | | ${framesize}= | Set Variable | 64
 | | ${duration}= | Set Variable | 10
 | | ${rate}= | Set Variable | 3.6mpps
-| | Given Setup '1' worker threads and rss '1' without HTT on all DUTs
-| | AND   L2 xconnect initialized in a 3-node circular topology
-| | Then Traffic should pass with no loss | ${duration} | ${rate}
-| | ...                                   | ${framesize} | 3-node-xconnect
+| | Given Add '1' worker threads and rss '1' without HTT to all DUTs
+| | And   Add all PCI devices to all DUTs
+| | And   Add No Multi Seg to all DUTs
+| | And   Apply startup configuration on all VPP DUTs
+| | And   L2 xconnect initialized in a 3-node circular topology
+| | Then  Traffic should pass with no loss | ${duration} | ${rate}
+| | ...                                    | ${framesize} | 3-node-xconnect
 
 | 1core VPP passes 1518B frames through L2 cross connect at 2x 812,743pps in 3-node topology
 | | [Documentation]
@@ -45,10 +49,13 @@
 | | ${framesize}= | Set Variable | 1518
 | | ${duration}= | Set Variable | 10
 | | ${rate}= | Set Variable | 812743pps
-| | Given Setup '1' worker threads and rss '1' without HTT on all DUTs
-| | AND   L2 xconnect initialized in a 3-node circular topology
-| | Then Traffic should pass with no loss | ${duration} | ${rate}
-| | ...                                   | ${framesize} | 3-node-xconnect
+| | Given Add '1' worker threads and rss '1' without HTT to all DUTs
+| | And   Add all PCI devices to all DUTs
+| | And   Add No Multi Seg to all DUTs
+| | And   Apply startup configuration on all VPP DUTs
+| | And   L2 xconnect initialized in a 3-node circular topology
+| | Then  Traffic should pass with no loss | ${duration} | ${rate}
+| | ...                                    | ${framesize} | 3-node-xconnect
 
 | 1core VPP passes 9000B frames through L2 cross connect at 2x 138,580pps in 3-node topology
 | | [Documentation]
@@ -58,10 +65,12 @@
 | | ${framesize}= | Set Variable | 9000
 | | ${duration}= | Set Variable | 10
 | | ${rate}= | Set Variable | 138580pps
-| | Given Setup '1' worker threads and rss '1' without HTT on all DUTs
-| | AND   L2 xconnect initialized in a 3-node circular topology
-| | Then Traffic should pass with no loss | ${duration} | ${rate}
-| | ...                                   | ${framesize} | 3-node-xconnect
+| | Given Add '1' worker threads and rss '1' without HTT to all DUTs
+| | And   Add all PCI devices to all DUTs
+| | And   Apply startup configuration on all VPP DUTs
+| | And   L2 xconnect initialized in a 3-node circular topology
+| | Then  Traffic should pass with no loss | ${duration} | ${rate}
+| | ...                                    | ${framesize} | 3-node-xconnect
 
 | 2core VPP with rss 1 passes 64B frames through L2 cross connect at 2x 8.3Mpps in 3-node topology
 | | [Documentation]
@@ -71,10 +80,13 @@
 | | ${framesize}= | Set Variable | 64
 | | ${duration}= | Set Variable | 10
 | | ${rate}= | Set Variable | 8.3mpps
-| | Given Setup '2' worker threads and rss '1' without HTT on all DUTs
-| | AND   L2 xconnect initialized in a 3-node circular topology
-| | Then Traffic should pass with no loss | ${duration} | ${rate}
-| | ...                                   | ${framesize} | 3-node-xconnect
+| | Given Add '2' worker threads and rss '1' without HTT to all DUTs
+| | And   Add all PCI devices to all DUTs
+| | And   Add No Multi Seg to all DUTs
+| | And   Apply startup configuration on all VPP DUTs
+| | And   L2 xconnect initialized in a 3-node circular topology
+| | Then  Traffic should pass with no loss | ${duration} | ${rate}
+| | ...                                    | ${framesize} | 3-node-xconnect
 
 | 2core VPP with rss 1 passes 1518B frames through L2 cross connect at 2x 812,743pps in 3-node topology
 | | [Documentation]
@@ -84,10 +96,13 @@
 | | ${framesize}= | Set Variable | 1518
 | | ${duration}= | Set Variable | 10
 | | ${rate}= | Set Variable | 812743pps
-| | Given Setup '2' worker threads and rss '1' without HTT on all DUTs
-| | AND   L2 xconnect initialized in a 3-node circular topology
-| | Then Traffic should pass with no loss | ${duration} | ${rate}
-| | ...                                   | ${framesize} | 3-node-xconnect
+| | Given Add '2' worker threads and rss '1' without HTT to all DUTs
+| | And   Add all PCI devices to all DUTs
+| | And   Add No Multi Seg to all DUTs
+| | And   Apply startup configuration on all VPP DUTs
+| | And   L2 xconnect initialized in a 3-node circular topology
+| | Then  Traffic should pass with no loss | ${duration} | ${rate}
+| | ...                                    | ${framesize} | 3-node-xconnect
 
 | 2core VPP with rss 1 passes 9000B frames through L2 cross connect at 2x 138,580pps in 3-node topology
 | | [Documentation]
@@ -97,10 +112,12 @@
 | | ${framesize}= | Set Variable | 9000
 | | ${duration}= | Set Variable | 10
 | | ${rate}= | Set Variable | 138580pps
-| | Given Setup '2' worker threads and rss '1' without HTT on all DUTs
-| | AND   L2 xconnect initialized in a 3-node circular topology
-| | Then Traffic should pass with no loss | ${duration} | ${rate}
-| | ...                                   | ${framesize} | 3-node-xconnect
+| | Given Add '2' worker threads and rss '1' without HTT to all DUTs
+| | And   Add all PCI devices to all DUTs
+| | And   Apply startup configuration on all VPP DUTs
+| | And   L2 xconnect initialized in a 3-node circular topology
+| | Then  Traffic should pass with no loss | ${duration} | ${rate}
+| | ...                                    | ${framesize} | 3-node-xconnect
 
 | 4core VPP with rss 2 passes 64B frames through L2 cross connect at 2x 9.3Mpps in 3-node topology
 | | [Documentation]
@@ -110,10 +127,13 @@
 | | ${framesize}= | Set Variable | 64
 | | ${duration}= | Set Variable | 10
 | | ${rate}= | Set Variable | 9.3mpps
-| | Given Setup '4' worker threads and rss '2' without HTT on all DUTs
-| | AND   L2 xconnect initialized in a 3-node circular topology
-| | Then Traffic should pass with no loss | ${duration} | ${rate}
-| | ...                                   | ${framesize} | 3-node-xconnect
+| | Given Add '4' worker threads and rss '2' without HTT to all DUTs
+| | And   Add all PCI devices to all DUTs
+| | And   Add No Multi Seg to all DUTs
+| | And   Apply startup configuration on all VPP DUTs
+| | And   L2 xconnect initialized in a 3-node circular topology
+| | Then  Traffic should pass with no loss | ${duration} | ${rate}
+| | ...                                    | ${framesize} | 3-node-xconnect
 
 | 4core VPP with rss 2 passes 1518B frames through L2 cross connect at 2x 812,743pps in 3-node topology
 | | [Documentation]
@@ -123,10 +143,13 @@
 | | ${framesize}= | Set Variable | 1518
 | | ${duration}= | Set Variable | 10
 | | ${rate}= | Set Variable | 812743pps
-| | Given Setup '4' worker threads and rss '2' without HTT on all DUTs
-| | AND   L2 xconnect initialized in a 3-node circular topology
-| | Then Traffic should pass with no loss | ${duration} | ${rate}
-| | ...                                   | ${framesize} | 3-node-xconnect
+| | Given Add '4' worker threads and rss '2' without HTT to all DUTs
+| | And   Add all PCI devices to all DUTs
+| | And   Add No Multi Seg to all DUTs
+| | And   Apply startup configuration on all VPP DUTs
+| | And   L2 xconnect initialized in a 3-node circular topology
+| | Then  Traffic should pass with no loss | ${duration} | ${rate}
+| | ...                                    | ${framesize} | 3-node-xconnect
 
 | 4core VPP with rss 2 passes 9000B frames through L2 cross connect at 2x 138,580pps in 3-node topology
 | | [Documentation]
@@ -136,7 +159,9 @@
 | | ${framesize}= | Set Variable | 9000
 | | ${duration}= | Set Variable | 10
 | | ${rate}= | Set Variable | 138580pps
-| | Given Setup '4' worker threads and rss '2' without HTT on all DUTs
-| | AND   L2 xconnect initialized in a 3-node circular topology
-| | Then Traffic should pass with no loss | ${duration} | ${rate}
-| | ...                                   | ${framesize} | 3-node-xconnect
+| | Given Add '4' worker threads and rss '2' without HTT to all DUTs
+| | And   Add all PCI devices to all DUTs
+| | And   Apply startup configuration on all VPP DUTs
+| | And   L2 xconnect initialized in a 3-node circular topology
+| | Then  Traffic should pass with no loss | ${duration} | ${rate}
+| | ...                                    | ${framesize} | 3-node-xconnect