CSIT-1142 2-node topology - keywords DPDK

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

8 files changed, 122 insertions, 122 deletions

diff --git a/tests/dpdk/perf/10ge2p1x520-eth-l2xcbase-testpmd-mrr.robot b/tests/dpdk/perf/10ge2p1x520-eth-l2xcbase-testpmd-mrr.robot
index 7f942d1494..67c271b021 100644
--- a/tests/dpdk/perf/10ge2p1x520-eth-l2xcbase-testpmd-mrr.robot
+++ b/tests/dpdk/perf/10ge2p1x520-eth-l2xcbase-testpmd-mrr.robot
@@ -51,8 +51,8 @@
 *** Keywords ***
 | Check RR for eth-l2xcbase-testpmd
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with ${wt} thread(s), ${wt}\
-| | ... | phy core(s), ${rxq} receive queue(s) per NIC port.
+| | ... | [Cfg] DUT runs L2 frame forwarding config with ${wt} phy core(s),\
+| | ... | ${rxq} receive queue(s) per NIC port.
 | | ... | [Ver] Measure MaxReceivedRate for ${framesize} frames using single\
 | | ... | trial throughput test.
 | | ...
@@ -65,7 +65,7 @@
 | | ${jumbo_frames}= | Set Variable If
 | | ... | ${get_framesize} < ${1522} | no | yes
 | | ...
-| | Given Start L2FWD '${wt}' worker threads and '${rxq}' rxqueues with jumbo frames '${jumbo_frames}'
+| | Given Start L2FWD on all DUTs | ${wt} | ${rxq} | ${jumbo_frames}
 | | Then Traffic should pass with maximum rate | ${perf_trial_duration}
 | | ... | ${max_rate}pps | ${framesize} | ${traffic_profile}
 
@@ -121,7 +121,7 @@
 
 | tc05-64B-2t2c-eth-l2xcbase-testpmd-mrr
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with 2 threads,\
+| | ... | [Cfg] DUT runs L2 frame forwarding config with \
 | | ... | 2 phy cores, 1 receive queue per NIC port.
 | | ... | [Ver] Measure MaxReceivedRate for 64B frames using single\
 | | ... | trial throughput test.
@@ -133,7 +133,7 @@
 
 | tc06-1518B-2t2c-eth-l2xcbase-testpmd-mrr
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with 2 threads,\
+| | ... | [Cfg] DUT runs L2 frame forwarding config with \
 | | ... | 2 phy cores, 1 receive queue per NIC port.
 | | ... | [Ver] Measure MaxReceivedRate for 1518B frames using single\
 | | ... | trial throughput test.
@@ -145,7 +145,7 @@
 
 | tc07-9000B-2t2c-eth-l2xcbase-testpmd-mrr
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with 2 threads,\
+| | ... | [Cfg] DUT runs L2 frame forwarding config with \
 | | ... | 2 phy cores, 1 receive queue per NIC port.
 | | ... | [Ver] Measure MaxReceivedRate for 9000B frames using single\
 | | ... | trial throughput test.
@@ -157,7 +157,7 @@
 
 | tc08-IMIX-2t2c-eth-l2xcbase-testpmd-mrr
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with 2 threads,\
+| | ... | [Cfg] DUT runs L2 frame forwarding config with \
 | | ... | 2 phy cores, 1 receive queue per NIC port.
 | | ... | [Ver] Measure MaxReceivedRate for IMIX_v4_1 frames using single\
 | | ... | trial throughput test.
@@ -170,7 +170,7 @@
 
 | tc09-64B-4t4c-eth-l2xcbase-testpmd-mrr
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with 4 threads,\
+| | ... | [Cfg] DUT runs L2 frame forwarding config with \
 | | ... | 4 phy cores, 2 receive queue per NIC port.
 | | ... | [Ver] Measure MaxReceivedRate for 64B frames using single\
 | | ... | trial throughput test.
@@ -182,7 +182,7 @@
 
 | tc10-1518B-4t4c-eth-l2xcbase-testpmd-mrr
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with 4 threads,\
+| | ... | [Cfg] DUT runs L2 frame forwarding config with \
 | | ... | 4 phy cores, 2 receive queue per NIC port.
 | | ... | [Ver] Measure MaxReceivedRate for 1518B frames using single\
 | | ... | trial throughput test.
@@ -194,7 +194,7 @@
 
 | tc11-9000B-4t4c-eth-l2xcbase-testpmd-mrr
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with 4 threads,\
+| | ... | [Cfg] DUT runs L2 frame forwarding config with \
 | | ... | 4 phy cores, 2 receive queue per NIC port.
 | | ... | [Ver] Measure MaxReceivedRate for 9000B frames using single\
 | | ... | trial throughput test.
@@ -206,7 +206,7 @@
 
 | tc12-IMIX-4t4c-eth-l2xcbase-testpmd-mrr
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with 4 threads,\
+| | ... | [Cfg] DUT runs L2 frame forwarding config with \
 | | ... | 4 phy cores, 2 receive queue per NIC port.
 | | ... | [Ver] Measure MaxReceivedRate for IMIX_v4_1 frames using single\
 | | ... | trial throughput test.
diff --git a/tests/dpdk/perf/10ge2p1x520-eth-l2xcbase-testpmd-ndrpdrdisc.robot b/tests/dpdk/perf/10ge2p1x520-eth-l2xcbase-testpmd-ndrpdrdisc.robot
index 3194976684..82365737c7 100644
--- a/tests/dpdk/perf/10ge2p1x520-eth-l2xcbase-testpmd-ndrpdrdisc.robot
+++ b/tests/dpdk/perf/10ge2p1x520-eth-l2xcbase-testpmd-ndrpdrdisc.robot
@@ -1,4 +1,4 @@
-# Copyright (c) 2017 Cisco and/or its affiliates.
+# Copyright (c) 2018 Cisco and/or its affiliates.
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at:
@@ -66,7 +66,7 @@
 | | ${binary_min}= | Set Variable | ${min_rate}
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
-| | Given Start L2FWD '1' worker threads and '1' rxqueues with jumbo frames 'no'
+| | Given Start L2FWD on all DUTs | 1 | 1 | no
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
 | | ... | ${binary_max} | ${traffic_profile}
 | | ... | ${min_rate} | ${max_rate} | ${threshold}
@@ -85,7 +85,7 @@
 | | ${binary_min}= | Set Variable | ${min_rate}
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
-| | Given Start L2FWD '1' worker threads and '1' rxqueues with jumbo frames 'no'
+| | Given Start L2FWD on all DUTs | 1 | 1 | no
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
 | | ... | ${binary_max} | ${traffic_profile}
 | | ... | ${min_rate} | ${max_rate} | ${threshold} | ${perf_pdr_loss_acceptance}
@@ -105,7 +105,7 @@
 | | ${binary_min}= | Set Variable | ${min_rate}
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
-| | Given Start L2FWD '1' worker threads and '1' rxqueues with jumbo frames 'no'
+| | Given Start L2FWD on all DUTs | 1 | 1 | no
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
 | | ... | ${binary_max} | ${traffic_profile}
 | | ... | ${min_rate} | ${max_rate} | ${threshold}
@@ -124,7 +124,7 @@
 | | ${binary_min}= | Set Variable | ${min_rate}
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
-| | Given Start L2FWD '1' worker threads and '1' rxqueues with jumbo frames 'no'
+| | Given Start L2FWD on all DUTs | 1 | 1 | no
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
 | | ... | ${binary_max} | ${traffic_profile}
 | | ... | ${min_rate} | ${max_rate} | ${threshold} | ${perf_pdr_loss_acceptance}
@@ -144,7 +144,7 @@
 | | ${binary_min}= | Set Variable | ${min_rate}
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
-| | Given Start L2FWD '1' worker threads and '1' rxqueues with jumbo frames 'yes'
+| | Given Start L2FWD on all DUTs | 1 | 1 | yes
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
 | | ... | ${binary_max} | ${traffic_profile}
 | | ... | ${min_rate} | ${max_rate} | ${threshold}
@@ -163,7 +163,7 @@
 | | ${binary_min}= | Set Variable | ${min_rate}
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
-| | Given Start L2FWD '1' worker threads and '1' rxqueues with jumbo frames 'yes'
+| | Given Start L2FWD on all DUTs | 1 | 1 | yes
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
 | | ... | ${binary_max} | ${traffic_profile}
 | | ... | ${min_rate} | ${max_rate} | ${threshold} | ${perf_pdr_loss_acceptance}
@@ -183,7 +183,7 @@
 | | ${binary_min}= | Set Variable | ${min_rate}
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
-| | Given Start L2FWD '2' worker threads and '1' rxqueues with jumbo frames 'no'
+| | Given Start L2FWD on all DUTs | 2 | 1 | no
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
 | | ... | ${binary_max} | ${traffic_profile}
 | | ... | ${min_rate} | ${max_rate} | ${threshold}
@@ -203,7 +203,7 @@
 | | ${binary_min}= | Set Variable | ${min_rate}
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
-| | Given Start L2FWD '2' worker threads and '1' rxqueues with jumbo frames 'no'
+| | Given Start L2FWD on all DUTs | 2 | 1 | no
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
 | | ... | ${binary_max} | ${traffic_profile}
 | | ... | ${min_rate} | ${max_rate} | ${threshold} | ${perf_pdr_loss_acceptance}
@@ -223,7 +223,7 @@
 | | ${binary_min}= | Set Variable | ${min_rate}
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
-| | Given Start L2FWD '2' worker threads and '1' rxqueues with jumbo frames 'no'
+| | Given Start L2FWD on all DUTs | 2 | 1 | no
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
 | | ... | ${binary_max} | ${traffic_profile}
 | | ... | ${min_rate} | ${max_rate} | ${threshold}
@@ -243,7 +243,7 @@
 | | ${binary_min}= | Set Variable | ${min_rate}
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
-| | Given Start L2FWD '2' worker threads and '1' rxqueues with jumbo frames 'no'
+| | Given Start L2FWD on all DUTs | 2 | 1 | no
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
 | | ... | ${binary_max} | ${traffic_profile}
 | | ... | ${min_rate} | ${max_rate} | ${threshold} | ${perf_pdr_loss_acceptance}
@@ -263,7 +263,7 @@
 | | ${binary_min}= | Set Variable | ${min_rate}
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
-| | Given Start L2FWD '2' worker threads and '1' rxqueues with jumbo frames 'yes'
+| | Given Start L2FWD on all DUTs | 2 | 1 | yes
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
 | | ... | ${binary_max} | ${traffic_profile}
 | | ... | ${min_rate} | ${max_rate} | ${threshold}
@@ -283,7 +283,7 @@
 | | ${binary_min}= | Set Variable | ${min_rate}
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
-| | Given Start L2FWD '2' worker threads and '1' rxqueues with jumbo frames 'yes'
+| | Given Start L2FWD on all DUTs | 2 | 1 | yes
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
 | | ... | ${binary_max} | ${traffic_profile}
 | | ... | ${min_rate} | ${max_rate} | ${threshold} | ${perf_pdr_loss_acceptance}
@@ -303,7 +303,7 @@
 | | ${binary_min}= | Set Variable | ${min_rate}
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
-| | Given Start L2FWD '4' worker threads and '2' rxqueues with jumbo frames 'no'
+| | Given Start L2FWD on all DUTs | 4 | 2 | no
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
 | | ... | ${binary_max} | ${traffic_profile}
 | | ... | ${min_rate} | ${max_rate} | ${threshold}
@@ -323,7 +323,7 @@
 | | ${binary_min}= | Set Variable | ${min_rate}
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
-| | Given Start L2FWD '4' worker threads and '2' rxqueues with jumbo frames 'no'
+| | Given Start L2FWD on all DUTs | 4 | 2 | no
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
 | | ... | ${binary_max} | ${traffic_profile}
 | | ... | ${min_rate} | ${max_rate} | ${threshold} | ${perf_pdr_loss_acceptance}
@@ -343,7 +343,7 @@
 | | ${binary_min}= | Set Variable | ${min_rate}
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
-| | Given Start L2FWD '4' worker threads and '2' rxqueues with jumbo frames 'no'
+| | Given Start L2FWD on all DUTs | 4 | 2 | no
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
 | | ... | ${binary_max} | ${traffic_profile}
 | | ... | ${min_rate} | ${max_rate} | ${threshold}
@@ -363,7 +363,7 @@
 | | ${binary_min}= | Set Variable | ${min_rate}
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
-| | Given Start L2FWD '4' worker threads and '2' rxqueues with jumbo frames 'no'
+| | Given Start L2FWD on all DUTs | 4 | 2 | no
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
 | | ... | ${binary_max} | ${traffic_profile}
 | | ... | ${min_rate} | ${max_rate} | ${threshold} | ${perf_pdr_loss_acceptance}
@@ -383,7 +383,7 @@
 | | ${binary_min}= | Set Variable | ${min_rate}
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
-| | Given Start L2FWD '4' worker threads and '2' rxqueues with jumbo frames 'yes'
+| | Given Start L2FWD on all DUTs | 4 | 2 | yes
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
 | | ... | ${binary_max} | ${traffic_profile}
 | | ... | ${min_rate} | ${max_rate} | ${threshold}
@@ -403,7 +403,7 @@
 | | ${binary_min}= | Set Variable | ${min_rate}
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
-| | Given Start L2FWD '4' worker threads and '2' rxqueues with jumbo frames 'yes'
+| | Given Start L2FWD on all DUTs | 4 | 2 | yes
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
 | | ... | ${binary_max} | ${traffic_profile}
 | | ... | ${min_rate} | ${max_rate} | ${threshold} | ${perf_pdr_loss_acceptance}
diff --git a/tests/dpdk/perf/10ge2p1x520-ethip4-ip4base-l3fwd-mrr.robot b/tests/dpdk/perf/10ge2p1x520-ethip4-ip4base-l3fwd-mrr.robot
index 5cf6a4412a..c9555473bb 100644
--- a/tests/dpdk/perf/10ge2p1x520-ethip4-ip4base-l3fwd-mrr.robot
+++ b/tests/dpdk/perf/10ge2p1x520-ethip4-ip4base-l3fwd-mrr.robot
@@ -50,8 +50,8 @@
 *** Keywords ***
 | Check RR for ethip4-ip4base-l3fwd
 | | [Documentation]
-| | ... | [Cfg] DUT runs L3 IPv4 routing config with ${wt} thread(s), ${wt}\
-| | ... | phy core(s), ${rxq} receive queue(s) per NIC port.
+| | ... | [Cfg] DUT runs L3 IPv4 routing config with ${wt} phy core(s),\
+| | ... | ${rxq} receive queue(s) per NIC port.
 | | ... | [Ver] Measure MaxReceivedRate for ${framesize} frames using single\
 | | ... | trial throughput test.
 | | ...
@@ -64,7 +64,7 @@
 | | ${jumbo_frames}= | Set Variable If
 | | ... | ${get_framesize} < ${1522} | no | yes
 | | ...
-| | Given Start L3FWD '${wt}' worker threads and '${rxq}' rxqueues with jumbo frames '${jumbo_frames}'
+| | Given Start L3FWD on all DUTs | ${wt} | ${rxq} | ${jumbo_frames}
 | | Then Traffic should pass with maximum rate | ${perf_trial_duration}
 | | ... | ${max_rate}pps | ${framesize} | ${traffic_profile}
 
@@ -120,7 +120,7 @@
 
 | tc05-64B-2t2c-ethip4-ip4base-l3fwd-mrr
 | | [Documentation]
-| | ... | [Cfg] DUT runs L3 IPv4 routing config with 2 threads,\
+| | ... | [Cfg] DUT runs L3 IPv4 routing config with \
 | | ... | 2 phy cores, 1 receive queue per NIC port.
 | | ... | [Ver] Measure MaxReceivedRate for 64B frames using single\
 | | ... | trial throughput test.
@@ -132,7 +132,7 @@
 
 | tc06-1518B-2t2c-ethip4-ip4base-l3fwd-mrr
 | | [Documentation]
-| | ... | [Cfg] DUT runs L3 IPv4 routing config with 2 threads,\
+| | ... | [Cfg] DUT runs L3 IPv4 routing config with \
 | | ... | 2 phy cores, 1 receive queue per NIC port.
 | | ... | [Ver] Measure MaxReceivedRate for 1518B frames using single\
 | | ... | trial throughput test.
@@ -144,7 +144,7 @@
 
 | tc07-9000B-2t2c-ethip4-ip4base-l3fwd-mrr
 | | [Documentation]
-| | ... | [Cfg] DUT runs L3 IPv4 routing config with 2 threads,\
+| | ... | [Cfg] DUT runs L3 IPv4 routing config with \
 | | ... | 2 phy cores, 1 receive queue per NIC port.
 | | ... | [Ver] Measure MaxReceivedRate for 9000B frames using single\
 | | ... | trial throughput test.
@@ -156,7 +156,7 @@
 
 | tc08-IMIX-2t2c-ethip4-ip4base-l3fwd-mrr
 | | [Documentation]
-| | ... | [Cfg] DUT runs L3 IPv4 routing config with 2 threads,\
+| | ... | [Cfg] DUT runs L3 IPv4 routing config with \
 | | ... | 2 phy cores, 1 receive queue per NIC port.
 | | ... | [Ver] Measure MaxReceivedRate for IMIX_v4_1 frames using single\
 | | ... | trial throughput test.
@@ -169,7 +169,7 @@
 
 | tc09-64B-4t4c-ethip4-ip4base-l3fwd-mrr
 | | [Documentation]
-| | ... | [Cfg] DUT runs L3 IPv4 routing config with 4 threads,\
+| | ... | [Cfg] DUT runs L3 IPv4 routing config with \
 | | ... | 4 phy cores, 2 receive queue per NIC port.
 | | ... | [Ver] Measure MaxReceivedRate for 64B frames using single\
 | | ... | trial throughput test.
@@ -181,7 +181,7 @@
 
 | tc10-1518B-4t4c-ethip4-ip4base-l3fwd-mrr
 | | [Documentation]
-| | ... | [Cfg] DUT runs L3 IPv4 routing config with 4 threads,\
+| | ... | [Cfg] DUT runs L3 IPv4 routing config with \
 | | ... | 4 phy cores, 2 receive queue per NIC port.
 | | ... | [Ver] Measure MaxReceivedRate for 1518B frames using single\
 | | ... | trial throughput test.
@@ -193,7 +193,7 @@
 
 | tc11-9000B-4t4c-ethip4-ip4base-l3fwd-mrr
 | | [Documentation]
-| | ... | [Cfg] DUT runs L3 IPv4 routing config with 4 threads,\
+| | ... | [Cfg] DUT runs L3 IPv4 routing config with \
 | | ... | 4 phy cores, 2 receive queue per NIC port.
 | | ... | [Ver] Measure MaxReceivedRate for 9000B frames using single\
 | | ... | trial throughput test.
@@ -205,7 +205,7 @@
 
 | tc12-IMIX-4t4c-ethip4-ip4base-l3fwd-mrr
 | | [Documentation]
-| | ... | [Cfg] DUT runs L3 IPv4 routing config with 4 threads,\
+| | ... | [Cfg] DUT runs L3 IPv4 routing config with \
 | | ... | 4 phy cores, 2 receive queue per NIC port.
 | | ... | [Ver] Measure MaxReceivedRate for IMIX_v4_1 frames using single\
 | | ... | trial throughput test.
diff --git a/tests/dpdk/perf/10ge2p1x520-ethip4-ip4base-l3fwd-ndrpdrdisc.robot b/tests/dpdk/perf/10ge2p1x520-ethip4-ip4base-l3fwd-ndrpdrdisc.robot
index d72c4233a4..fe6b5b261e 100644
--- a/tests/dpdk/perf/10ge2p1x520-ethip4-ip4base-l3fwd-ndrpdrdisc.robot
+++ b/tests/dpdk/perf/10ge2p1x520-ethip4-ip4base-l3fwd-ndrpdrdisc.robot
@@ -1,4 +1,4 @@
-# Copyright (c) 2016 Cisco and/or its affiliates.
+# Copyright (c) 2018 Cisco and/or its affiliates.
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at:
@@ -66,7 +66,7 @@
 | | ${binary_min}= | Set Variable | ${min_rate}
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
-| | Given Start L3FWD '1' worker threads and '1' rxqueues with jumbo frames 'no'
+| | Given Start L3FWD on all DUTs | 1 | 1 | no
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
 | | ... | ${binary_max} | ${traffic_profile} | ${min_rate} | ${max_rate}
 | | ... | ${threshold}
@@ -86,7 +86,7 @@
 | | ${binary_min}= | Set Variable | ${min_rate}
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
-| | Given Start L3FWD '1' worker threads and '1' rxqueues with jumbo frames 'no'
+| | Given Start L3FWD on all DUTs | 1 | 1 | no
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
 | | ... | ${binary_max} | ${traffic_profile} | ${min_rate} | ${max_rate}
 | | ... | ${threshold} | ${perf_pdr_loss_acceptance}
@@ -107,7 +107,7 @@
 | | ${binary_min}= | Set Variable | ${min_rate}
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
-| | Given Start L3FWD '1' worker threads and '1' rxqueues with jumbo frames 'no'
+| | Given Start L3FWD on all DUTs | 1 | 1 | no
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
 | | ... | ${binary_max} | ${traffic_profile} | ${min_rate} | ${max_rate}
 | | ... | ${threshold}
@@ -127,7 +127,7 @@
 | | ${binary_min}= | Set Variable | ${min_rate}
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
-| | Given Start L3FWD '1' worker threads and '1' rxqueues with jumbo frames 'no'
+| | Given Start L3FWD on all DUTs | 1 | 1 | no
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
 | | ... | ${binary_max} | ${traffic_profile} | ${min_rate} | ${max_rate}
 | | ... | ${threshold} | ${perf_pdr_loss_acceptance}
@@ -148,7 +148,7 @@
 | | ${binary_min}= | Set Variable | ${min_rate}
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
-| | Given Start L3FWD '1' worker threads and '1' rxqueues with jumbo frames 'yes'
+| | Given Start L3FWD on all DUTs | 1 | 1 | yes
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
 | | ... | ${binary_max} | ${traffic_profile} | ${min_rate} | ${max_rate}
 | | ... | ${threshold}
@@ -168,7 +168,7 @@
 | | ${binary_min}= | Set Variable | ${min_rate}
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
-| | Given Start L3FWD '1' worker threads and '1' rxqueues with jumbo frames 'yes'
+| | Given Start L3FWD on all DUTs | 1 | 1 | yes
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
 | | ... | ${binary_max} | ${traffic_profile} | ${min_rate} | ${max_rate}
 | | ... | ${threshold} | ${perf_pdr_loss_acceptance}
@@ -189,7 +189,7 @@
 | | ${binary_min}= | Set Variable | ${min_rate}
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
-| | Given Start L3FWD '2' worker threads and '1' rxqueues with jumbo frames 'no'
+| | Given Start L3FWD on all DUTs | 2 | 1 | no
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
 | | ... | ${binary_max} | ${traffic_profile} | ${min_rate} | ${max_rate}
 | | ... | ${threshold}
@@ -209,7 +209,7 @@
 | | ${binary_min}= | Set Variable | ${min_rate}
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
-| | Given Start L3FWD '2' worker threads and '1' rxqueues with jumbo frames 'no'
+| | Given Start L3FWD on all DUTs | 2 | 1 | no
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
 | | ... | ${binary_max} | ${traffic_profile} | ${min_rate} | ${max_rate}
 | | ... | ${threshold} | ${perf_pdr_loss_acceptance}
@@ -230,7 +230,7 @@
 | | ${binary_min}= | Set Variable | ${min_rate}
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
-| | Given Start L3FWD '2' worker threads and '1' rxqueues with jumbo frames 'no'
+| | Given Start L3FWD on all DUTs | 2 | 1 | no
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
 | | ... | ${binary_max} | ${traffic_profile} | ${min_rate} | ${max_rate}
 | | ... | ${threshold}
@@ -250,7 +250,7 @@
 | | ${binary_min}= | Set Variable | ${min_rate}
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
-| | Given Start L3FWD '2' worker threads and '1' rxqueues with jumbo frames 'no'
+| | Given Start L3FWD on all DUTs | 2 | 1 | no
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
 | | ... | ${binary_max} | ${traffic_profile} | ${min_rate} | ${max_rate}
 | | ... | ${threshold} | ${perf_pdr_loss_acceptance}
@@ -271,7 +271,7 @@
 | | ${binary_min}= | Set Variable | ${min_rate}
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
-| | Given Start L3FWD '2' worker threads and '1' rxqueues with jumbo frames 'yes'
+| | Given Start L3FWD on all DUTs | 2 | 1 | yes
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
 | | ... | ${binary_max} | ${traffic_profile} | ${min_rate} | ${max_rate}
 | | ... | ${threshold}
@@ -291,7 +291,7 @@
 | | ${binary_min}= | Set Variable | ${min_rate}
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
-| | Given Start L3FWD '2' worker threads and '1' rxqueues with jumbo frames 'yes'
+| | Given Start L3FWD on all DUTs | 2 | 1 | yes
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
 | | ... | ${binary_max} | ${traffic_profile} | ${min_rate} | ${max_rate}
 | | ... | ${threshold} | ${perf_pdr_loss_acceptance}
@@ -312,7 +312,7 @@
 | | ${binary_min}= | Set Variable | ${min_rate}
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
-| | Given Start L3FWD '4' worker threads and '2' rxqueues with jumbo frames 'no'
+| | Given Start L3FWD on all DUTs | 4 | 2 | no
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
 | | ... | ${binary_max} | ${traffic_profile} | ${min_rate} | ${max_rate}
 | | ... | ${threshold}
@@ -332,7 +332,7 @@
 | | ${binary_min}= | Set Variable | ${min_rate}
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
-| | Given Start L3FWD '4' worker threads and '2' rxqueues with jumbo frames 'no'
+| | Given Start L3FWD on all DUTs | 4 | 2 | no
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
 | | ... | ${binary_max} | ${traffic_profile} | ${min_rate} | ${max_rate}
 | | ... | ${threshold} | ${perf_pdr_loss_acceptance}
@@ -353,7 +353,7 @@
 | | ${binary_min}= | Set Variable | ${min_rate}
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
-| | Given Start L3FWD '4' worker threads and '2' rxqueues with jumbo frames 'no'
+| | Given Start L3FWD on all DUTs | 4 | 2 | no
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
 | | ... | ${binary_max} | ${traffic_profile} | ${min_rate} | ${max_rate}
 | | ... | ${threshold}
@@ -373,7 +373,7 @@
 | | ${binary_min}= | Set Variable | ${min_rate}
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
-| | Given Start L3FWD '4' worker threads and '2' rxqueues with jumbo frames 'no'
+| | Given Start L3FWD on all DUTs | 4 | 2 | no
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
 | | ... | ${binary_max} | ${traffic_profile} | ${min_rate} | ${max_rate}
 | | ... | ${threshold} | ${perf_pdr_loss_acceptance}
@@ -394,7 +394,7 @@
 | | ${binary_min}= | Set Variable | ${min_rate}
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
-| | Given Start L3FWD '4' worker threads and '2' rxqueues with jumbo frames 'yes'
+| | Given Start L3FWD on all DUTs | 4 | 2 | yes
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
 | | ... | ${binary_max} | ${traffic_profile} | ${min_rate} | ${max_rate}
 | | ... | ${threshold}
@@ -414,7 +414,7 @@
 | | ${binary_min}= | Set Variable | ${min_rate}
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
-| | Given Start L3FWD '4' worker threads and '2' rxqueues with jumbo frames 'yes'
+| | Given Start L3FWD on all DUTs | 4 | 2 | yes
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
 | | ... | ${binary_max} | ${traffic_profile} | ${min_rate} | ${max_rate}
 | | ... | ${threshold} | ${perf_pdr_loss_acceptance}
diff --git a/tests/dpdk/perf/10ge2p1x710-eth-l2xcbase-testpmd-mrr.robot b/tests/dpdk/perf/10ge2p1x710-eth-l2xcbase-testpmd-mrr.robot
index 4adfcca1a0..9257cddb62 100644
--- a/tests/dpdk/perf/10ge2p1x710-eth-l2xcbase-testpmd-mrr.robot
+++ b/tests/dpdk/perf/10ge2p1x710-eth-l2xcbase-testpmd-mrr.robot
@@ -51,8 +51,8 @@
 *** Keywords ***
 | Check RR for eth-l2xcbase-testpmd
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with ${wt} thread(s), ${wt}\
-| | ... | phy core(s), ${rxq} receive queue(s) per NIC port.
+| | ... | [Cfg] DUT runs L2 frame forwarding config with ${wt} phy core(s),\
+| | ... | ${rxq} receive queue(s) per NIC port.
 | | ... | [Ver] Measure MaxReceivedRate for ${framesize} frames using single\
 | | ... | trial throughput test.
 | | ...
@@ -65,7 +65,7 @@
 | | ${jumbo_frames}= | Set Variable If
 | | ... | ${get_framesize} < ${1522} | no | yes
 | | ...
-| | Given Start L2FWD '${wt}' worker threads and '${rxq}' rxqueues with jumbo frames '${jumbo_frames}'
+| | Given Start L2FWD on all DUTs | ${wt} | ${rxq} | ${jumbo_frames}
 | | Then Traffic should pass with maximum rate | ${perf_trial_duration}
 | | ... | ${max_rate}pps | ${framesize} | ${traffic_profile}
 
@@ -121,7 +121,7 @@
 
 | tc05-64B-2t2c-eth-l2xcbase-testpmd-mrr
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with 2 threads,\
+| | ... | [Cfg] DUT runs L2 frame forwarding config with \
 | | ... | 2 phy cores, 1 receive queue per NIC port.
 | | ... | [Ver] Measure MaxReceivedRate for 64B frames using single\
 | | ... | trial throughput test.
@@ -133,7 +133,7 @@
 
 | tc06-1518B-2t2c-eth-l2xcbase-testpmd-mrr
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with 2 threads,\
+| | ... | [Cfg] DUT runs L2 frame forwarding config with \
 | | ... | 2 phy cores, 1 receive queue per NIC port.
 | | ... | [Ver] Measure MaxReceivedRate for 1518B frames using single\
 | | ... | trial throughput test.
@@ -145,7 +145,7 @@
 
 | tc07-9000B-2t2c-eth-l2xcbase-testpmd-mrr
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with 2 threads,\
+| | ... | [Cfg] DUT runs L2 frame forwarding config with \
 | | ... | 2 phy cores, 1 receive queue per NIC port.
 | | ... | [Ver] Measure MaxReceivedRate for 9000B frames using single\
 | | ... | trial throughput test.
@@ -157,7 +157,7 @@
 
 | tc08-IMIX-2t2c-eth-l2xcbase-testpmd-mrr
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with 2 threads,\
+| | ... | [Cfg] DUT runs L2 frame forwarding config with \
 | | ... | 2 phy cores, 1 receive queue per NIC port.
 | | ... | [Ver] Measure MaxReceivedRate for IMIX_v4_1 frames using single\
 | | ... | trial throughput test.
@@ -170,7 +170,7 @@
 
 | tc09-64B-4t4c-eth-l2xcbase-testpmd-mrr
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with 4 threads,\
+| | ... | [Cfg] DUT runs L2 frame forwarding config with \
 | | ... | 4 phy cores, 2 receive queue per NIC port.
 | | ... | [Ver] Measure MaxReceivedRate for 64B frames using single\
 | | ... | trial throughput test.
@@ -182,7 +182,7 @@
 
 | tc10-1518B-4t4c-eth-l2xcbase-testpmd-mrr
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with 4 threads,\
+| | ... | [Cfg] DUT runs L2 frame forwarding config with \
 | | ... | 4 phy cores, 2 receive queue per NIC port.
 | | ... | [Ver] Measure MaxReceivedRate for 1518B frames using single\
 | | ... | trial throughput test.
@@ -194,7 +194,7 @@
 
 | tc11-9000B-4t4c-eth-l2xcbase-testpmd-mrr
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with 4 threads,\
+| | ... | [Cfg] DUT runs L2 frame forwarding config with \
 | | ... | 4 phy cores, 2 receive queue per NIC port.
 | | ... | [Ver] Measure MaxReceivedRate for 9000B frames using single\
 | | ... | trial throughput test.
@@ -206,7 +206,7 @@
 
 | tc12-IMIX-4t4c-eth-l2xcbase-testpmd-mrr
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with 4 threads,\
+| | ... | [Cfg] DUT runs L2 frame forwarding config with \
 | | ... | 4 phy cores, 2 receive queue per NIC port.
 | | ... | [Ver] Measure MaxReceivedRate for IMIX_v4_1 frames using single\
 | | ... | trial throughput test.
diff --git a/tests/dpdk/perf/10ge2p1x710-eth-l2xcbase-testpmd-ndrpdrdisc.robot b/tests/dpdk/perf/10ge2p1x710-eth-l2xcbase-testpmd-ndrpdrdisc.robot
index 06ec4b62f8..fb42ee531c 100644
--- a/tests/dpdk/perf/10ge2p1x710-eth-l2xcbase-testpmd-ndrpdrdisc.robot
+++ b/tests/dpdk/perf/10ge2p1x710-eth-l2xcbase-testpmd-ndrpdrdisc.robot
@@ -1,4 +1,4 @@
-# Copyright (c) 2016 Cisco and/or its affiliates.
+# Copyright (c) 2018 Cisco and/or its affiliates.
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at:
@@ -67,7 +67,7 @@
 | | ${binary_min}= | Set Variable | ${min_rate}
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
-| | Given Start L2FWD '1' worker threads and '1' rxqueues with jumbo frames 'no'
+| | Given Start L2FWD on all DUTs | 1 | 1 | no
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
 | | ... | ${binary_max} | ${traffic_profile}
 | | ... | ${min_rate} | ${max_rate} | ${threshold}
@@ -87,7 +87,7 @@
 | | ${binary_min}= | Set Variable | ${min_rate}
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
-| | Given Start L2FWD '1' worker threads and '1' rxqueues with jumbo frames 'no'
+| | Given Start L2FWD on all DUTs | 1 | 1 | no
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
 | | ... | ${binary_max} | ${traffic_profile}
 | | ... | ${min_rate} | ${max_rate} | ${threshold} | ${perf_pdr_loss_acceptance}
@@ -108,7 +108,7 @@
 | | ${binary_min}= | Set Variable | ${min_rate}
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
-| | Given Start L2FWD '1' worker threads and '1' rxqueues with jumbo frames 'no'
+| | Given Start L2FWD on all DUTs | 1 | 1 | no
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
 | | ... | ${binary_max} | ${traffic_profile}
 | | ... | ${min_rate} | ${max_rate} | ${threshold}
@@ -128,7 +128,7 @@
 | | ${binary_min}= | Set Variable | ${min_rate}
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
-| | Given Start L2FWD '1' worker threads and '1' rxqueues with jumbo frames 'no'
+| | Given Start L2FWD on all DUTs | 1 | 1 | no
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
 | | ... | ${binary_max} | ${traffic_profile}
 | | ... | ${min_rate} | ${max_rate} | ${threshold} | ${perf_pdr_loss_acceptance}
@@ -149,7 +149,7 @@
 | | ${binary_min}= | Set Variable | ${min_rate}
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
-| | Given Start L2FWD '1' worker threads and '1' rxqueues with jumbo frames 'yes'
+| | Given Start L2FWD on all DUTs | 1 | 1 | yes
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
 | | ... | ${binary_max} | ${traffic_profile}
 | | ... | ${min_rate} | ${max_rate} | ${threshold}
@@ -169,7 +169,7 @@
 | | ${binary_min}= | Set Variable | ${min_rate}
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
-| | Given Start L2FWD '1' worker threads and '1' rxqueues with jumbo frames 'yes'
+| | Given Start L2FWD on all DUTs | 1 | 1 | yes
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
 | | ... | ${binary_max} | ${traffic_profile}
 | | ... | ${min_rate} | ${max_rate} | ${threshold} | ${perf_pdr_loss_acceptance}
@@ -190,7 +190,7 @@
 | | ${binary_min}= | Set Variable | ${min_rate}
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
-| | Given Start L2FWD '2' worker threads and '1' rxqueues with jumbo frames 'no'
+| | Given Start L2FWD on all DUTs | 2 | 1 | no
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
 | | ... | ${binary_max} | ${traffic_profile}
 | | ... | ${min_rate} | ${max_rate} | ${threshold}
@@ -210,7 +210,7 @@
 | | ${binary_min}= | Set Variable | ${min_rate}
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
-| | Given Start L2FWD '2' worker threads and '1' rxqueues with jumbo frames 'no'
+| | Given Start L2FWD on all DUTs | 2 | 1 | no
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
 | | ... | ${binary_max} | ${traffic_profile}
 | | ... | ${min_rate} | ${max_rate} | ${threshold} | ${perf_pdr_loss_acceptance}
@@ -231,7 +231,7 @@
 | | ${binary_min}= | Set Variable | ${min_rate}
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
-| | Given Start L2FWD '2' worker threads and '1' rxqueues with jumbo frames 'no'
+| | Given Start L2FWD on all DUTs | 2 | 1 | no
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
 | | ... | ${binary_max} | ${traffic_profile}
 | | ... | ${min_rate} | ${max_rate} | ${threshold}
@@ -251,7 +251,7 @@
 | | ${binary_min}= | Set Variable | ${min_rate}
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
-| | Given Start L2FWD '2' worker threads and '1' rxqueues with jumbo frames 'no'
+| | Given Start L2FWD on all DUTs | 2 | 1 | no
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
 | | ... | ${binary_max} | ${traffic_profile}
 | | ... | ${min_rate} | ${max_rate} | ${threshold} | ${perf_pdr_loss_acceptance}
@@ -272,7 +272,7 @@
 | | ${binary_min}= | Set Variable | ${min_rate}
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
-| | Given Start L2FWD '2' worker threads and '1' rxqueues with jumbo frames 'yes'
+| | Given Start L2FWD on all DUTs | 2 | 1 | yes
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
 | | ... | ${binary_max} | ${traffic_profile}
 | | ... | ${min_rate} | ${max_rate} | ${threshold}
@@ -292,7 +292,7 @@
 | | ${binary_min}= | Set Variable | ${min_rate}
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
-| | Given Start L2FWD '2' worker threads and '1' rxqueues with jumbo frames 'yes'
+| | Given Start L2FWD on all DUTs | 2 | 1 | yes
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
 | | ... | ${binary_max} | ${traffic_profile}
 | | ... | ${min_rate} | ${max_rate} | ${threshold} | ${perf_pdr_loss_acceptance}
@@ -313,7 +313,7 @@
 | | ${binary_min}= | Set Variable | ${min_rate}
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
-| | Given Start L2FWD '4' worker threads and '2' rxqueues with jumbo frames 'no'
+| | Given Start L2FWD on all DUTs | 4 | 2 | no
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
 | | ... | ${binary_max} | ${traffic_profile}
 | | ... | ${min_rate} | ${max_rate} | ${threshold}
@@ -333,7 +333,7 @@
 | | ${binary_min}= | Set Variable | ${min_rate}
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
-| | Given Start L2FWD '4' worker threads and '2' rxqueues with jumbo frames 'no'
+| | Given Start L2FWD on all DUTs | 4 | 2 | no
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
 | | ... | ${binary_max} | ${traffic_profile}
 | | ... | ${min_rate} | ${max_rate} | ${threshold} | ${perf_pdr_loss_acceptance}
@@ -354,7 +354,7 @@
 | | ${binary_min}= | Set Variable | ${min_rate}
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
-| | Given Start L2FWD '4' worker threads and '2' rxqueues with jumbo frames 'no'
+| | Given Start L2FWD on all DUTs | 4 | 2 | no
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
 | | ... | ${binary_max} | ${traffic_profile}
 | | ... | ${min_rate} | ${max_rate} | ${threshold}
@@ -374,7 +374,7 @@
 | | ${binary_min}= | Set Variable | ${min_rate}
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
-| | Given Start L2FWD '4' worker threads and '2' rxqueues with jumbo frames 'no'
+| | Given Start L2FWD on all DUTs | 4 | 2 | no
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
 | | ... | ${binary_max} | ${traffic_profile}
 | | ... | ${min_rate} | ${max_rate} | ${threshold} | ${perf_pdr_loss_acceptance}
@@ -395,7 +395,7 @@
 | | ${binary_min}= | Set Variable | ${min_rate}
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
-| | Given Start L2FWD '4' worker threads and '2' rxqueues with jumbo frames 'yes'
+| | Given Start L2FWD on all DUTs | 4 | 2 | yes
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
 | | ... | ${binary_max} | ${traffic_profile}
 | | ... | ${min_rate} | ${max_rate} | ${threshold}
@@ -415,8 +415,8 @@
 | | ${binary_min}= | Set Variable | ${min_rate}
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
-| | Given Start L2FWD '4' worker threads and '2' rxqueues with jumbo frames 'yes'
+| | Given Start L2FWD on all DUTs | 4 | 2 | yes
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
 | | ... | ${binary_max} | ${traffic_profile}
 | | ... | ${min_rate} | ${max_rate} | ${threshold} | ${perf_pdr_loss_acceptance}
-| | ... | ${perf_pdr_loss_acceptance_type}
\ No newline at end of file
+| | ... | ${perf_pdr_loss_acceptance_type}
diff --git a/tests/dpdk/perf/40ge2p1xl710-eth-l2xcbase-testpmd-mrr.robot b/tests/dpdk/perf/40ge2p1xl710-eth-l2xcbase-testpmd-mrr.robot
index ec7cf1128b..435512408d 100644
--- a/tests/dpdk/perf/40ge2p1xl710-eth-l2xcbase-testpmd-mrr.robot
+++ b/tests/dpdk/perf/40ge2p1xl710-eth-l2xcbase-testpmd-mrr.robot
@@ -53,8 +53,8 @@
 *** Keywords ***
 | Check RR for eth-l2xcbase-testpmd
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with ${wt} thread(s), ${wt}\
-| | ... | phy core(s), ${rxq} receive queue(s) per NIC port.
+| | ... | [Cfg] DUT runs L2 frame forwarding config with ${wt} phy core(s),\
+| | ... | ${rxq} receive queue(s) per NIC port.
 | | ... | [Ver] Measure MaxReceivedRate for ${framesize} frames using single\
 | | ... | trial throughput test.
 | | ...
@@ -69,7 +69,7 @@
 | | ${jumbo_frames}= | Set Variable If
 | | ... | ${get_framesize} < ${1522} | no | yes
 | | ...
-| | Given Start L2FWD '${wt}' worker threads and '${rxq}' rxqueues with jumbo frames '${jumbo_frames}'
+| | Given Start L2FWD on all DUTs | ${wt} | ${rxq} | ${jumbo_frames}
 | | Then Traffic should pass with maximum rate | ${perf_trial_duration}
 | | ... | ${max_rate}pps | ${framesize} | ${traffic_profile}
 
@@ -125,7 +125,7 @@
 
 | tc05-64B-2t2c-eth-l2xcbase-testpmd-mrr
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with 2 threads,\
+| | ... | [Cfg] DUT runs L2 frame forwarding config with \
 | | ... | 2 phy cores, 1 receive queue per NIC port.
 | | ... | [Ver] Measure MaxReceivedRate for 64B frames using single\
 | | ... | trial throughput test.
@@ -137,7 +137,7 @@
 
 | tc06-1518B-2t2c-eth-l2xcbase-testpmd-mrr
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with 2 threads,\
+| | ... | [Cfg] DUT runs L2 frame forwarding config with \
 | | ... | 2 phy cores, 1 receive queue per NIC port.
 | | ... | [Ver] Measure MaxReceivedRate for 1518B frames using single\
 | | ... | trial throughput test.
@@ -149,7 +149,7 @@
 
 | tc07-9000B-2t2c-eth-l2xcbase-testpmd-mrr
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with 2 threads,\
+| | ... | [Cfg] DUT runs L2 frame forwarding config with \
 | | ... | 2 phy cores, 1 receive queue per NIC port.
 | | ... | [Ver] Measure MaxReceivedRate for 9000B frames using single\
 | | ... | trial throughput test.
@@ -161,7 +161,7 @@
 
 | tc08-IMIX-2t2c-eth-l2xcbase-testpmd-mrr
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with 2 threads,\
+| | ... | [Cfg] DUT runs L2 frame forwarding config with \
 | | ... | 2 phy cores, 1 receive queue per NIC port.
 | | ... | [Ver] Measure MaxReceivedRate for IMIX_v4_1 frames using single\
 | | ... | trial throughput test.
@@ -174,7 +174,7 @@
 
 | tc09-64B-4t4c-eth-l2xcbase-testpmd-mrr
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with 4 threads,\
+| | ... | [Cfg] DUT runs L2 frame forwarding config with \
 | | ... | 4 phy cores, 2 receive queue per NIC port.
 | | ... | [Ver] Measure MaxReceivedRate for 64B frames using single\
 | | ... | trial throughput test.
@@ -186,7 +186,7 @@
 
 | tc10-1518B-4t4c-eth-l2xcbase-testpmd-mrr
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with 4 threads,\
+| | ... | [Cfg] DUT runs L2 frame forwarding config with \
 | | ... | 4 phy cores, 2 receive queue per NIC port.
 | | ... | [Ver] Measure MaxReceivedRate for 1518B frames using single\
 | | ... | trial throughput test.
@@ -198,7 +198,7 @@
 
 | tc11-9000B-4t4c-eth-l2xcbase-testpmd-mrr
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with 4 threads,\
+| | ... | [Cfg] DUT runs L2 frame forwarding config with \
 | | ... | 4 phy cores, 2 receive queue per NIC port.
 | | ... | [Ver] Measure MaxReceivedRate for 9000B frames using single\
 | | ... | trial throughput test.
@@ -210,7 +210,7 @@
 
 | tc12-IMIX-4t4c-eth-l2xcbase-testpmd-mrr
 | | [Documentation]
-| | ... | [Cfg] DUT runs L2 frame forwarding config with 4 threads,\
+| | ... | [Cfg] DUT runs L2 frame forwarding config with \
 | | ... | 4 phy cores, 2 receive queue per NIC port.
 | | ... | [Ver] Measure MaxReceivedRate for IMIX_v4_1 frames using single\
 | | ... | trial throughput test.
diff --git a/tests/dpdk/perf/40ge2p1xl710-eth-l2xcbase-testpmd-ndrpdrdisc.robot b/tests/dpdk/perf/40ge2p1xl710-eth-l2xcbase-testpmd-ndrpdrdisc.robot
index 52d178b83e..0916d7d1c1 100644
--- a/tests/dpdk/perf/40ge2p1xl710-eth-l2xcbase-testpmd-ndrpdrdisc.robot
+++ b/tests/dpdk/perf/40ge2p1xl710-eth-l2xcbase-testpmd-ndrpdrdisc.robot
@@ -1,4 +1,4 @@
-# Copyright (c) 2016 Cisco and/or its affiliates.
+# Copyright (c) 2018 Cisco and/or its affiliates.
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at:
@@ -69,7 +69,7 @@
 | | ${binary_min}= | Set Variable | ${min_rate}
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
-| | Given Start L2FWD '1' worker threads and '1' rxqueues with jumbo frames 'no'
+| | Given Start L2FWD on all DUTs | 1 | 1 | no
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
 | | ... | ${binary_max} | ${traffic_profile}
 | | ... | ${min_rate} | ${max_rate} | ${threshold}
@@ -89,7 +89,7 @@
 | | ${binary_min}= | Set Variable | ${min_rate}
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
-| | Given Start L2FWD '1' worker threads and '1' rxqueues with jumbo frames 'no'
+| | Given Start L2FWD on all DUTs | 1 | 1 | no
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
 | | ... | ${binary_max} | ${traffic_profile}
 | | ... | ${min_rate} | ${max_rate} | ${threshold} | ${perf_pdr_loss_acceptance}
@@ -110,7 +110,7 @@
 | | ${binary_min}= | Set Variable | ${min_rate}
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
-| | Given Start L2FWD '1' worker threads and '1' rxqueues with jumbo frames 'no'
+| | Given Start L2FWD on all DUTs | 1 | 1 | no
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
 | | ... | ${binary_max} | ${traffic_profile}
 | | ... | ${min_rate} | ${max_rate} | ${threshold}
@@ -130,7 +130,7 @@
 | | ${binary_min}= | Set Variable | ${min_rate}
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
-| | Given Start L2FWD '1' worker threads and '1' rxqueues with jumbo frames 'no'
+| | Given Start L2FWD on all DUTs | 1 | 1 | no
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
 | | ... | ${binary_max} | ${traffic_profile}
 | | ... | ${min_rate} | ${max_rate} | ${threshold} | ${perf_pdr_loss_acceptance}
@@ -151,7 +151,7 @@
 | | ${binary_min}= | Set Variable | ${min_rate}
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
-| | Given Start L2FWD '1' worker threads and '1' rxqueues with jumbo frames 'yes'
+| | Given Start L2FWD on all DUTs | 1 | 1 | yes
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
 | | ... | ${binary_max} | ${traffic_profile}
 | | ... | ${min_rate} | ${max_rate} | ${threshold}
@@ -171,7 +171,7 @@
 | | ${binary_min}= | Set Variable | ${min_rate}
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
-| | Given Start L2FWD '1' worker threads and '1' rxqueues with jumbo frames 'yes'
+| | Given Start L2FWD on all DUTs | 1 | 1 | yes
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
 | | ... | ${binary_max} | ${traffic_profile}
 | | ... | ${min_rate} | ${max_rate} | ${threshold} | ${perf_pdr_loss_acceptance}
@@ -192,7 +192,7 @@
 | | ${binary_min}= | Set Variable | ${min_rate}
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
-| | Given Start L2FWD '2' worker threads and '1' rxqueues with jumbo frames 'no'
+| | Given Start L2FWD on all DUTs | 2 | 1 | no
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
 | | ... | ${binary_max} | ${traffic_profile}
 | | ... | ${min_rate} | ${max_rate} | ${threshold}
@@ -212,7 +212,7 @@
 | | ${binary_min}= | Set Variable | ${min_rate}
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
-| | Given Start L2FWD '2' worker threads and '1' rxqueues with jumbo frames 'no'
+| | Given Start L2FWD on all DUTs | 2 | 1 | no
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
 | | ... | ${binary_max} | ${traffic_profile}
 | | ... | ${min_rate} | ${max_rate} | ${threshold} | ${perf_pdr_loss_acceptance}
@@ -233,7 +233,7 @@
 | | ${binary_min}= | Set Variable | ${min_rate}
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
-| | Given Start L2FWD '2' worker threads and '1' rxqueues with jumbo frames 'no'
+| | Given Start L2FWD on all DUTs | 2 | 1 | no
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
 | | ... | ${binary_max} | ${traffic_profile}
 | | ... | ${min_rate} | ${max_rate} | ${threshold}
@@ -253,7 +253,7 @@
 | | ${binary_min}= | Set Variable | ${min_rate}
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
-| | Given Start L2FWD '2' worker threads and '1' rxqueues with jumbo frames 'no'
+| | Given Start L2FWD on all DUTs | 2 | 1 | no
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
 | | ... | ${binary_max} | ${traffic_profile}
 | | ... | ${min_rate} | ${max_rate} | ${threshold} | ${perf_pdr_loss_acceptance}
@@ -274,7 +274,7 @@
 | | ${binary_min}= | Set Variable | ${min_rate}
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
-| | Given Start L2FWD '2' worker threads and '1' rxqueues with jumbo frames 'yes'
+| | Given Start L2FWD on all DUTs | 2 | 1 | yes
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
 | | ... | ${binary_max} | ${traffic_profile}
 | | ... | ${min_rate} | ${max_rate} | ${threshold}
@@ -294,7 +294,7 @@
 | | ${binary_min}= | Set Variable | ${min_rate}
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
-| | Given Start L2FWD '2' worker threads and '1' rxqueues with jumbo frames 'yes'
+| | Given Start L2FWD on all DUTs | 2 | 1 | yes
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
 | | ... | ${binary_max} | ${traffic_profile}
 | | ... | ${min_rate} | ${max_rate} | ${threshold} | ${perf_pdr_loss_acceptance}
@@ -315,7 +315,7 @@
 | | ${binary_min}= | Set Variable | ${min_rate}
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
-| | Given Start L2FWD '4' worker threads and '2' rxqueues with jumbo frames 'no'
+| | Given Start L2FWD on all DUTs | 4 | 2 | no
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
 | | ... | ${binary_max} | ${traffic_profile}
 | | ... | ${min_rate} | ${max_rate} | ${threshold}
@@ -335,7 +335,7 @@
 | | ${binary_min}= | Set Variable | ${min_rate}
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
-| | Given Start L2FWD '4' worker threads and '2' rxqueues with jumbo frames 'no'
+| | Given Start L2FWD on all DUTs | 4 | 2 | no
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
 | | ... | ${binary_max} | ${traffic_profile}
 | | ... | ${min_rate} | ${max_rate} | ${threshold} | ${perf_pdr_loss_acceptance}
@@ -356,7 +356,7 @@
 | | ${binary_min}= | Set Variable | ${min_rate}
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
-| | Given Start L2FWD '4' worker threads and '2' rxqueues with jumbo frames 'no'
+| | Given Start L2FWD on all DUTs | 4 | 2 | no
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
 | | ... | ${binary_max} | ${traffic_profile}
 | | ... | ${min_rate} | ${max_rate} | ${threshold}
@@ -376,7 +376,7 @@
 | | ${binary_min}= | Set Variable | ${min_rate}
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
-| | Given Start L2FWD '4' worker threads and '2' rxqueues with jumbo frames 'no'
+| | Given Start L2FWD on all DUTs | 4 | 2 | no
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
 | | ... | ${binary_max} | ${traffic_profile}
 | | ... | ${min_rate} | ${max_rate} | ${threshold} | ${perf_pdr_loss_acceptance}
@@ -397,7 +397,7 @@
 | | ${binary_min}= | Set Variable | ${min_rate}
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
-| | Given Start L2FWD '4' worker threads and '2' rxqueues with jumbo frames 'yes'
+| | Given Start L2FWD on all DUTs | 4 | 2 | yes
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
 | | ... | ${binary_max} | ${traffic_profile}
 | | ... | ${min_rate} | ${max_rate} | ${threshold}
@@ -417,8 +417,8 @@
 | | ${binary_min}= | Set Variable | ${min_rate}
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
-| | Given Start L2FWD '4' worker threads and '2' rxqueues with jumbo frames 'yes'
+| | Given Start L2FWD on all DUTs | 4 | 2 | yes
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
 | | ... | ${binary_max} | ${traffic_profile}
 | | ... | ${min_rate} | ${max_rate} | ${threshold} | ${perf_pdr_loss_acceptance}
-| | ... | ${perf_pdr_loss_acceptance_type}
\ No newline at end of file
+| | ... | ${perf_pdr_loss_acceptance_type}