CSIT-524: Traffic generator using python profiles

Profile name structure:
   [trex|ixia]-[sl|sf]-[topo]-[packet structure]-[scale]

   - Traffic generator - T-rex (trex) or Ixia (ixia)
   - Stateless (sl) or statefull (sf)
   - Topology - 2-node topology (2n) or 3-node topology (3n)
   - Packet structure - eth | ip4/6 | udp
   - Scale - e.g. ip4dst1, ip6dst10000, 4000u15p

Traffic types changed to stream profiles:

 - From: 2-node-bridge
   To:   trex-sl-2n-ethip4-ip4src253

 - From: 3-node-bridge
   To:   trex-sl-3n-ethip4-ip4src254

 - From: 3-node-IPv4-dst-1000000
   To:   trex-sl-3n-ethip4-ip4dst1000000

 - From: 3-node-IPv4-dst-100000
   To:   trex-sl-3n-ethip4-ip4dst100000

 - From: 3-node-IPv4-dst-10000
   To:   trex-sl-3n-ethip4-ip4dst10000

 - From: 3-node-IPv4-dst-1000
   To:   trex-sl-3n-ethip4-ip4dst1000

 - From: 3-node-IPv4-dst-100
   To:   trex-sl-3n-ethip4-ip4dst100

 - From: 3-node-IPv4-dst-1
   To:   trex-sl-3n-ethip4-ip4dst1

 - From: 3-node-IPv4
   To:   trex-sl-3n-ethip4-ip4src253

 - From: 3-node-IPv6-dst-1000000
   To:   trex-sl-3n-ethip6-ip6dst1000000

 - From: 3-node-IPv6-dst-100000
   To:   trex-sl-3n-ethip6-ip6dst100000

 - From: 3-node-IPv6-dst-10000
   To:   trex-sl-3n-ethip6-ip6dst10000

 - From: 3-node-IPv6
   To:   trex-sl-3n-ethip6-ip6src253

 - From: 3-node-xconnect
   To:   trex-sl-3n-ethip4-ip4src254

 - From: 3-node-IPv4-SNAT-1000u-15p
   To:   trex-sl-3n-ethip4udp-1000u15p

 - From: 3-node-IPv4-SNAT-100u-15p
   To:   trex-sl-3n-ethip4udp-100u15p

 - From: 3-node-IPv4-SNAT-10u-15p
   To:   trex-sl-3n-ethip4udp-10u15p

 - From: 3-node-IPv4-SNAT-1u-15p
   To:   trex-sl-3n-ethip4udp-1u15p

 - From: 3-node-IPv4-SNAT-1u-1p
   To:   trex-sl-3n-ethip4udp-1u1p

 - From: 3-node-IPv4-SNAT-2000u-15p
   To:   trex-sl-3n-ethip4udp-2000u15p

 - From: 3-node-IPv4-SNAT-4000u-15p
   To:   trex-sl-3n-ethip4udp-4000u15p

Change-Id: If6a3cf204c93ff9f2cdccc5fd395e26b05483b58
Signed-off-by: Tibor Frank <tifrank@cisco.com>

82 files changed, 5730 insertions, 6346 deletions

diff --git a/tests/perf/10ge2p1vic1227-eth-l2bdbasemaclrn-ndrpdrdisc.robot b/tests/perf/10ge2p1vic1227-eth-l2bdbasemaclrn-ndrpdrdisc.robot
index c7787f3006..351fe1d9da 100644
--- a/tests/perf/10ge2p1vic1227-eth-l2bdbasemaclrn-ndrpdrdisc.robot
+++ b/tests/perf/10ge2p1vic1227-eth-l2bdbasemaclrn-ndrpdrdisc.robot
@@ -23,7 +23,7 @@
 | ...
 | Test Setup | Performance test setup
 | Test Teardown | Performance test teardown | ${min_rate}pps | ${framesize}
-| ... | 3-node-bridge
+| ... | ${traffic_profile}
 | ...
 | Documentation | *RFC2544: Pkt throughput L2BD test cases*
 | ...
@@ -50,6 +50,8 @@
 *** Variables ***
 # Cisco-VIC-1227 bandwidth limit
 | ${s_limit} | ${10000000000}
+# Traffic profile:
+| ${traffic_profile} | trex-sl-3n-ethip4-ip4src254
 
 *** Keywords ***
 | L2 Bridge Domain NDR Binary Search
@@ -73,7 +75,7 @@
 | | Apply startup configuration on all VPP DUTs
 | | L2 bridge domain initialized in a 3-node circular topology
 | | Find NDR using binary search and pps
-| | ... | ${framesize} | ${binary_min} | ${binary_max} | 3-node-bridge
+| | ... | ${framesize} | ${binary_min} | ${binary_max} | ${traffic_profile}
 | | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | L2 Bridge Domain PDR Binary Search
@@ -99,7 +101,7 @@
 | | Apply startup configuration on all VPP DUTs
 | | L2 bridge domain initialized in a 3-node circular topology
 | | Find PDR using binary search and pps
-| | ... | ${framesize} | ${binary_min} | ${binary_max} | 3-node-bridge
+| | ... | ${framesize} | ${binary_min} | ${binary_max} | ${traffic_profile}
 | | ... | ${min_rate} | ${max_rate} | ${threshold}
 | | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
 
diff --git a/tests/perf/10ge2p1x520-dot1ad-l2xcbase-ndrchk.robot b/tests/perf/10ge2p1x520-dot1ad-l2xcbase-ndrchk.robot
index 4cdfd86b1a..517905d640 100644
--- a/tests/perf/10ge2p1x520-dot1ad-l2xcbase-ndrchk.robot
+++ b/tests/perf/10ge2p1x520-dot1ad-l2xcbase-ndrchk.robot
@@ -52,6 +52,8 @@
 | ${inner_vlan_id}= | 200
 | ${type_subif}= | two_tags
 | ${tag_rewrite}= | pop-2
+# Traffic profile:
+| ${traffic_profile} | trex-sl-3n-ethip4-ip4src254
 
 *** Test Cases ***
 | tc01-64B-1t1c-dot1ad-l2xcbase-ndrchk
@@ -77,7 +79,7 @@
 | | ... | ${dut1} | ${dut1_if1} | ${subif_index_1}
 | | ... | ${dut2} | ${dut2_if2} | ${subif_index_2}
 | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | 3-node-xconnect
+| | ... | ${framesize} | ${traffic_profile}
 
 | tc02-1514B-1t1c-dot1ad-l2xcbase-ndrchk
 | | [Documentation]
@@ -102,7 +104,7 @@
 | | ... | ${dut1} | ${dut1_if1} | ${subif_index_1}
 | | ... | ${dut2} | ${dut2_if2} | ${subif_index_2}
 | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | 3-node-xconnect
+| | ... | ${framesize} | ${traffic_profile}
 
 | tc03-9000B-1t1c-dot1ad-l2xcbase-ndrchk
 | | [Documentation]
@@ -126,7 +128,7 @@
 | | ... | ${dut1} | ${dut1_if1} | ${subif_index_1}
 | | ... | ${dut2} | ${dut2_if2} | ${subif_index_2}
 | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | 3-node-xconnect
+| | ... | ${framesize} | ${traffic_profile}
 
 | tc04-64B-2t2c-dot1ad-l2xcbase-ndrchk
 | | [Documentation]
@@ -151,7 +153,7 @@
 | | ... | ${dut1} | ${dut1_if1} | ${subif_index_1}
 | | ... | ${dut2} | ${dut2_if2} | ${subif_index_2}
 | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | 3-node-xconnect
+| | ... | ${framesize} | ${traffic_profile}
 
 | tc05-1514B-2t2c-dot1ad-l2xcbase-ndrchk
 | | [Documentation]
@@ -176,7 +178,7 @@
 | | ... | ${dut1} | ${dut1_if1} | ${subif_index_1}
 | | ... | ${dut2} | ${dut2_if2} | ${subif_index_2}
 | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | 3-node-xconnect
+| | ... | ${framesize} | ${traffic_profile}
 
 | tc06-9000B-2t2c-dot1ad-l2xcbase-ndrchk
 | | [Documentation]
@@ -200,7 +202,7 @@
 | | ... | ${dut1} | ${dut1_if1} | ${subif_index_1}
 | | ... | ${dut2} | ${dut2_if2} | ${subif_index_2}
 | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | 3-node-xconnect
+| | ... | ${framesize} | ${traffic_profile}
 
 | tc07-64B-4t4c-dot1ad-l2xcbase-ndrchk
 | | [Documentation]
@@ -225,7 +227,7 @@
 | | ... | ${dut1} | ${dut1_if1} | ${subif_index_1}
 | | ... | ${dut2} | ${dut2_if2} | ${subif_index_2}
 | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | 3-node-xconnect
+| | ... | ${framesize} | ${traffic_profile}
 
 | tc08-1514B-4t4c-dot1ad-l2xcbase-ndrchk
 | | [Documentation]
@@ -250,7 +252,7 @@
 | | ... | ${dut1} | ${dut1_if1} | ${subif_index_1}
 | | ... | ${dut2} | ${dut2_if2} | ${subif_index_2}
 | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | 3-node-xconnect
+| | ... | ${framesize} | ${traffic_profile}
 
 | tc09-9000B-4t4c-dot1ad-l2xcbase-ndrchk
 | | [Documentation]
@@ -274,4 +276,4 @@
 | | ... | ${dut1} | ${dut1_if1} | ${subif_index_1}
 | | ... | ${dut2} | ${dut2_if2} | ${subif_index_2}
 | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | 3-node-xconnect
+| | ... | ${framesize} | ${traffic_profile}
diff --git a/tests/perf/10ge2p1x520-dot1ad-l2xcbase-ndrpdrdisc.robot b/tests/perf/10ge2p1x520-dot1ad-l2xcbase-ndrpdrdisc.robot
index 32ea31ea85..cafae94722 100644
--- a/tests/perf/10ge2p1x520-dot1ad-l2xcbase-ndrpdrdisc.robot
+++ b/tests/perf/10ge2p1x520-dot1ad-l2xcbase-ndrpdrdisc.robot
@@ -24,7 +24,7 @@
 | ...
 | Test Setup | Performance test setup
 | Test Teardown | Performance test teardown | ${min_rate}pps | ${framesize}
-| ... | 3-node-xconnect
+| ... | ${traffic_profile}
 | ...
 | Documentation | *RFC2544: Pkt throughput L2XC with 802.1ad test cases*
 | ...
@@ -57,6 +57,8 @@
 | ${tag_rewrite}= | pop-2
 # X520-DA2 bandwidth limit
 | ${s_limit} | ${10000000000}
+# Traffic profile:
+| ${traffic_profile} | trex-sl-3n-ethip4-ip4src254
 
 *** Test Cases ***
 | tc01-64B-1t1c-dot1ad-l2xcbase-ndrdisc
@@ -72,10 +74,10 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | And   VPP interfaces in path are up in a 3-node circular topology
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | And VPP interfaces in path are up in a 3-node circular topology
 | | When VLAN subinterfaces initialized on 3-node topology
 | | ... | ${dut1} | ${dut1_if2} | ${dut2} | ${dut2_if1} | ${subid}
 | | ... | ${outer_vlan_id} | ${inner_vlan_id} | ${type_subif}
@@ -86,9 +88,8 @@
 | | ... | ${dut1} | ${dut1_if1} | ${subif_index_1}
 | | ... | ${dut2} | ${dut2_if2} | ${subif_index_2}
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-xconnect
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc02-64B-1t1c-dot1ad-l2xcbase-pdrdisc
 | | [Documentation]
@@ -103,10 +104,10 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | And   VPP interfaces in path are up in a 3-node circular topology
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | And VPP interfaces in path are up in a 3-node circular topology
 | | When VLAN subinterfaces initialized on 3-node topology
 | | ... | ${dut1} | ${dut1_if2} | ${dut2} | ${dut2_if1} | ${subid}
 | | ... | ${outer_vlan_id} | ${inner_vlan_id} | ${type_subif}
@@ -117,11 +118,9 @@
 | | ... | ${dut1} | ${dut1_if1} | ${subif_index_1}
 | | ... | ${dut2} | ${dut2_if2} | ${subif_index_2}
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-xconnect
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
-| | ...                                       | ${perf_pdr_loss_acceptance}
-| | ...                                       | ${perf_pdr_loss_acceptance_type}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
+| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
 
 | tc03-1514B-1t1c-dot1ad-l2xcbase-ndrdisc
 | | [Documentation]
@@ -136,10 +135,10 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | And   VPP interfaces in path are up in a 3-node circular topology
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | And VPP interfaces in path are up in a 3-node circular topology
 | | When VLAN subinterfaces initialized on 3-node topology
 | | ... | ${dut1} | ${dut1_if2} | ${dut2} | ${dut2_if1} | ${subid}
 | | ... | ${outer_vlan_id} | ${inner_vlan_id} | ${type_subif}
@@ -150,9 +149,8 @@
 | | ... | ${dut1} | ${dut1_if1} | ${subif_index_1}
 | | ... | ${dut2} | ${dut2_if2} | ${subif_index_2}
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-xconnect
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc04-1514B-1t1c-dot1ad-l2xcbase-pdrdisc
 | | [Documentation]
@@ -167,10 +165,10 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | And   VPP interfaces in path are up in a 3-node circular topology
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | And VPP interfaces in path are up in a 3-node circular topology
 | | When VLAN subinterfaces initialized on 3-node topology
 | | ... | ${dut1} | ${dut1_if2} | ${dut2} | ${dut2_if1} | ${subid}
 | | ... | ${outer_vlan_id} | ${inner_vlan_id} | ${type_subif}
@@ -181,11 +179,9 @@
 | | ... | ${dut1} | ${dut1_if1} | ${subif_index_1}
 | | ... | ${dut2} | ${dut2_if2} | ${subif_index_2}
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-xconnect
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
-| | ...                                       | ${perf_pdr_loss_acceptance}
-| | ...                                       | ${perf_pdr_loss_acceptance_type}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
+| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
 
 | tc05-9000B-1t1c-dot1ad-l2xcbase-ndrdisc
 | | [Documentation]
@@ -200,9 +196,9 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Apply startup configuration on all VPP DUTs
-| | And   VPP interfaces in path are up in a 3-node circular topology
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Apply startup configuration on all VPP DUTs
+| | And VPP interfaces in path are up in a 3-node circular topology
 | | When VLAN subinterfaces initialized on 3-node topology
 | | ... | ${dut1} | ${dut1_if2} | ${dut2} | ${dut2_if1} | ${subid}
 | | ... | ${outer_vlan_id} | ${inner_vlan_id} | ${type_subif}
@@ -213,9 +209,8 @@
 | | ... | ${dut1} | ${dut1_if1} | ${subif_index_1}
 | | ... | ${dut2} | ${dut2_if2} | ${subif_index_2}
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-xconnect
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc06-9000B-1t1c-dot1ad-l2xcbase-pdrdisc
 | | [Documentation]
@@ -230,9 +225,9 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Apply startup configuration on all VPP DUTs
-| | And   VPP interfaces in path are up in a 3-node circular topology
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Apply startup configuration on all VPP DUTs
+| | And VPP interfaces in path are up in a 3-node circular topology
 | | When VLAN subinterfaces initialized on 3-node topology
 | | ... | ${dut1} | ${dut1_if2} | ${dut2} | ${dut2_if1} | ${subid}
 | | ... | ${outer_vlan_id} | ${inner_vlan_id} | ${type_subif}
@@ -243,11 +238,9 @@
 | | ... | ${dut1} | ${dut1_if1} | ${subif_index_1}
 | | ... | ${dut2} | ${dut2_if2} | ${subif_index_2}
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-xconnect
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
-| | ...                                       | ${perf_pdr_loss_acceptance}
-| | ...                                       | ${perf_pdr_loss_acceptance_type}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
+| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
 
 | tc07-64B-2t2c-dot1ad-l2xcbase-ndrdisc
 | | [Documentation]
@@ -262,10 +255,10 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | And   VPP interfaces in path are up in a 3-node circular topology
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | And VPP interfaces in path are up in a 3-node circular topology
 | | When VLAN subinterfaces initialized on 3-node topology
 | | ... | ${dut1} | ${dut1_if2} | ${dut2} | ${dut2_if1} | ${subid}
 | | ... | ${outer_vlan_id} | ${inner_vlan_id} | ${type_subif}
@@ -276,9 +269,8 @@
 | | ... | ${dut1} | ${dut1_if1} | ${subif_index_1}
 | | ... | ${dut2} | ${dut2_if2} | ${subif_index_2}
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-xconnect
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc08-64B-2t2c-dot1ad-l2xcbase-pdrdisc
 | | [Documentation]
@@ -293,10 +285,10 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | And   VPP interfaces in path are up in a 3-node circular topology
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | And VPP interfaces in path are up in a 3-node circular topology
 | | When VLAN subinterfaces initialized on 3-node topology
 | | ... | ${dut1} | ${dut1_if2} | ${dut2} | ${dut2_if1} | ${subid}
 | | ... | ${outer_vlan_id} | ${inner_vlan_id} | ${type_subif}
@@ -307,11 +299,9 @@
 | | ... | ${dut1} | ${dut1_if1} | ${subif_index_1}
 | | ... | ${dut2} | ${dut2_if2} | ${subif_index_2}
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-xconnect
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
-| | ...                                       | ${perf_pdr_loss_acceptance}
-| | ...                                       | ${perf_pdr_loss_acceptance_type}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
+| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
 
 | tc09-1514B-2t2c-dot1ad-l2xcbase-ndrdisc
 | | [Documentation]
@@ -326,10 +316,10 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | And   VPP interfaces in path are up in a 3-node circular topology
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | And VPP interfaces in path are up in a 3-node circular topology
 | | When VLAN subinterfaces initialized on 3-node topology
 | | ... | ${dut1} | ${dut1_if2} | ${dut2} | ${dut2_if1} | ${subid}
 | | ... | ${outer_vlan_id} | ${inner_vlan_id} | ${type_subif}
@@ -340,9 +330,8 @@
 | | ... | ${dut1} | ${dut1_if1} | ${subif_index_1}
 | | ... | ${dut2} | ${dut2_if2} | ${subif_index_2}
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-xconnect
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc10-1514B-2t2c-dot1ad-l2xcbase-pdrdisc
 | | [Documentation]
@@ -357,10 +346,10 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | And   VPP interfaces in path are up in a 3-node circular topology
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | And VPP interfaces in path are up in a 3-node circular topology
 | | When VLAN subinterfaces initialized on 3-node topology
 | | ... | ${dut1} | ${dut1_if2} | ${dut2} | ${dut2_if1} | ${subid}
 | | ... | ${outer_vlan_id} | ${inner_vlan_id} | ${type_subif}
@@ -371,11 +360,9 @@
 | | ... | ${dut1} | ${dut1_if1} | ${subif_index_1}
 | | ... | ${dut2} | ${dut2_if2} | ${subif_index_2}
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-xconnect
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
-| | ...                                       | ${perf_pdr_loss_acceptance}
-| | ...                                       | ${perf_pdr_loss_acceptance_type}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
+| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
 
 | tc11-9000B-2t2c-dot1ad-l2xcbase-ndrdisc
 | | [Documentation]
@@ -390,9 +377,9 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Apply startup configuration on all VPP DUTs
-| | And   VPP interfaces in path are up in a 3-node circular topology
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Apply startup configuration on all VPP DUTs
+| | And VPP interfaces in path are up in a 3-node circular topology
 | | When VLAN subinterfaces initialized on 3-node topology
 | | ... | ${dut1} | ${dut1_if2} | ${dut2} | ${dut2_if1} | ${subid}
 | | ... | ${outer_vlan_id} | ${inner_vlan_id} | ${type_subif}
@@ -403,9 +390,8 @@
 | | ... | ${dut1} | ${dut1_if1} | ${subif_index_1}
 | | ... | ${dut2} | ${dut2_if2} | ${subif_index_2}
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-xconnect
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc12-9000B-2t2c-dot1ad-l2xcbase-pdrdisc
 | | [Documentation]
@@ -420,9 +406,9 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Apply startup configuration on all VPP DUTs
-| | And   VPP interfaces in path are up in a 3-node circular topology
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Apply startup configuration on all VPP DUTs
+| | And VPP interfaces in path are up in a 3-node circular topology
 | | When VLAN subinterfaces initialized on 3-node topology
 | | ... | ${dut1} | ${dut1_if2} | ${dut2} | ${dut2_if1} | ${subid}
 | | ... | ${outer_vlan_id} | ${inner_vlan_id} | ${type_subif}
@@ -433,11 +419,9 @@
 | | ... | ${dut1} | ${dut1_if1} | ${subif_index_1}
 | | ... | ${dut2} | ${dut2_if2} | ${subif_index_2}
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-xconnect
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
-| | ...                                       | ${perf_pdr_loss_acceptance}
-| | ...                                       | ${perf_pdr_loss_acceptance_type}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
+| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
 
 | tc13-64B-4t4c-dot1ad-l2xcbase-ndrdisc
 | | [Documentation]
@@ -452,10 +436,10 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | And   VPP interfaces in path are up in a 3-node circular topology
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | And VPP interfaces in path are up in a 3-node circular topology
 | | When VLAN subinterfaces initialized on 3-node topology
 | | ... | ${dut1} | ${dut1_if2} | ${dut2} | ${dut2_if1} | ${subid}
 | | ... | ${outer_vlan_id} | ${inner_vlan_id} | ${type_subif}
@@ -466,9 +450,8 @@
 | | ... | ${dut1} | ${dut1_if1} | ${subif_index_1}
 | | ... | ${dut2} | ${dut2_if2} | ${subif_index_2}
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-xconnect
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc14-64B-4t4c-dot1ad-l2xcbase-pdrdisc
 | | [Documentation]
@@ -483,10 +466,10 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | And   VPP interfaces in path are up in a 3-node circular topology
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | And VPP interfaces in path are up in a 3-node circular topology
 | | When VLAN subinterfaces initialized on 3-node topology
 | | ... | ${dut1} | ${dut1_if2} | ${dut2} | ${dut2_if1} | ${subid}
 | | ... | ${outer_vlan_id} | ${inner_vlan_id} | ${type_subif}
@@ -497,11 +480,9 @@
 | | ... | ${dut1} | ${dut1_if1} | ${subif_index_1}
 | | ... | ${dut2} | ${dut2_if2} | ${subif_index_2}
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-xconnect
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
-| | ...                                       | ${perf_pdr_loss_acceptance}
-| | ...                                       | ${perf_pdr_loss_acceptance_type}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
+| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
 
 | tc15-1514B-4t4c-dot1ad-l2xcbase-ndrdisc
 | | [Documentation]
@@ -516,10 +497,10 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | And   VPP interfaces in path are up in a 3-node circular topology
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | And VPP interfaces in path are up in a 3-node circular topology
 | | When VLAN subinterfaces initialized on 3-node topology
 | | ... | ${dut1} | ${dut1_if2} | ${dut2} | ${dut2_if1} | ${subid}
 | | ... | ${outer_vlan_id} | ${inner_vlan_id} | ${type_subif}
@@ -530,9 +511,8 @@
 | | ... | ${dut1} | ${dut1_if1} | ${subif_index_1}
 | | ... | ${dut2} | ${dut2_if2} | ${subif_index_2}
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-xconnect
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc16-1514B-4t4c-dot1ad-l2xcbase-pdrdisc
 | | [Documentation]
@@ -547,10 +527,10 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | And   VPP interfaces in path are up in a 3-node circular topology
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | And VPP interfaces in path are up in a 3-node circular topology
 | | When VLAN subinterfaces initialized on 3-node topology
 | | ... | ${dut1} | ${dut1_if2} | ${dut2} | ${dut2_if1} | ${subid}
 | | ... | ${outer_vlan_id} | ${inner_vlan_id} | ${type_subif}
@@ -561,11 +541,9 @@
 | | ... | ${dut1} | ${dut1_if1} | ${subif_index_1}
 | | ... | ${dut2} | ${dut2_if2} | ${subif_index_2}
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-xconnect
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
-| | ...                                       | ${perf_pdr_loss_acceptance}
-| | ...                                       | ${perf_pdr_loss_acceptance_type}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
+| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
 
 | tc17-9000B-4t4c-dot1ad-l2xcbase-ndrdisc
 | | [Documentation]
@@ -580,9 +558,9 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Apply startup configuration on all VPP DUTs
-| | And   VPP interfaces in path are up in a 3-node circular topology
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Apply startup configuration on all VPP DUTs
+| | And VPP interfaces in path are up in a 3-node circular topology
 | | When VLAN subinterfaces initialized on 3-node topology
 | | ... | ${dut1} | ${dut1_if2} | ${dut2} | ${dut2_if1} | ${subid}
 | | ... | ${outer_vlan_id} | ${inner_vlan_id} | ${type_subif}
@@ -593,9 +571,8 @@
 | | ... | ${dut1} | ${dut1_if1} | ${subif_index_1}
 | | ... | ${dut2} | ${dut2_if2} | ${subif_index_2}
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-xconnect
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc18-9000B-4t4c-dot1ad-l2xcbase-pdrdisc
 | | [Documentation]
@@ -610,9 +587,9 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Apply startup configuration on all VPP DUTs
-| | And   VPP interfaces in path are up in a 3-node circular topology
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Apply startup configuration on all VPP DUTs
+| | And VPP interfaces in path are up in a 3-node circular topology
 | | When VLAN subinterfaces initialized on 3-node topology
 | | ... | ${dut1} | ${dut1_if2} | ${dut2} | ${dut2_if1} | ${subid}
 | | ... | ${outer_vlan_id} | ${inner_vlan_id} | ${type_subif}
@@ -623,8 +600,6 @@
 | | ... | ${dut1} | ${dut1_if1} | ${subif_index_1}
 | | ... | ${dut2} | ${dut2_if2} | ${subif_index_2}
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-xconnect
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
-| | ...                                       | ${perf_pdr_loss_acceptance}
-| | ...                                       | ${perf_pdr_loss_acceptance_type}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
+| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
diff --git a/tests/perf/10ge2p1x520-dot1q-l2bdbasemaclrn-eth-2vhost-1vm-ndrpdrdisc.robot b/tests/perf/10ge2p1x520-dot1q-l2bdbasemaclrn-eth-2vhost-1vm-ndrpdrdisc.robot
index c2cfdf747d..245f969970 100644
--- a/tests/perf/10ge2p1x520-dot1q-l2bdbasemaclrn-eth-2vhost-1vm-ndrpdrdisc.robot
+++ b/tests/perf/10ge2p1x520-dot1q-l2bdbasemaclrn-eth-2vhost-1vm-ndrpdrdisc.robot
@@ -24,7 +24,7 @@
 | ...
 | Test Setup | Performance test setup
 | Test Teardown | Performance test with vhost and VM with dpdk-testpmd teardown
-| ... | ${min_rate}pps | ${framesize} | 3-node-bridge
+| ... | ${min_rate}pps | ${framesize} | ${traffic_profile}
 | ... | dut1_node=${dut1} | dut1_vm_refs=${dut1_vm_refs}
 | ... | dut2_node=${dut2} | dut2_vm_refs=${dut2_vm_refs}
 | ...
@@ -67,6 +67,8 @@
 | ${bd_id2}= | 2
 | ${sock1}= | /tmp/sock-1-${bd_id1}
 | ${sock2}= | /tmp/sock-1-${bd_id2}
+# Traffic profile:
+| ${traffic_profile} | trex-sl-3n-ethip4-ip4src254
 
 *** Test Cases ***
 | tc01-64B-1t1c-dot1q-l2bdbasemaclrn-eth-2vhost-1vm-ndrdisc
@@ -100,8 +102,8 @@
 | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
-| | ... | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc02-64B-1t1c-dot1q-l2bdbasemaclrn-eth-2vhost-1vm-pdrdisc
 | | [Documentation]
@@ -134,8 +136,8 @@
 | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
-| | ... | ${threshold} | ${perf_pdr_loss_acceptance}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold} | ${perf_pdr_loss_acceptance}
 | | ... | ${perf_pdr_loss_acceptance_type}
 
 | tc03-1518B-1t1c-dot1q-l2bdbasemaclrn-eth-2vhost-1vm-ndrdisc
@@ -169,8 +171,8 @@
 | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
-| | ... | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc04-1518B-1t1c-dot1q-l2bdbasemaclrn-eth-2vhost-1vm-pdrdisc
 | | [Documentation]
@@ -203,8 +205,8 @@
 | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
-| | ... | ${threshold} | ${perf_pdr_loss_acceptance}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold} | ${perf_pdr_loss_acceptance}
 | | ... | ${perf_pdr_loss_acceptance_type}
 
 | tc05-IMIX-1t1c-dot1q-l2bdbasemaclrn-eth-2vhost-1vm-ndrdisc
@@ -240,8 +242,8 @@
 | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
-| | ... | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc06-IMIX-1t1c-dot1q-l2bdbasemaclrn-eth-2vhost-1vm-pdrdisc
 | | [Documentation]
@@ -276,8 +278,8 @@
 | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
-| | ... | ${threshold} | ${perf_pdr_loss_acceptance}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold} | ${perf_pdr_loss_acceptance}
 | | ... | ${perf_pdr_loss_acceptance_type}
 
 | tc07-64B-2t2c-dot1q-l2bdbasemaclrn-eth-2vhost-1vm-ndrdisc
@@ -311,8 +313,8 @@
 | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
-| | ... | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc08-64B-2t2c-dot1q-l2bdbasemaclrn-eth-2vhost-1vm-pdrdisc
 | | [Documentation]
@@ -345,8 +347,8 @@
 | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
-| | ... | ${threshold} | ${perf_pdr_loss_acceptance}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold} | ${perf_pdr_loss_acceptance}
 | | ... | ${perf_pdr_loss_acceptance_type}
 
 | tc09-1518B-2t2c-dot1q-l2bdbasemaclrn-eth-2vhost-1vm-ndrdisc
@@ -380,8 +382,8 @@
 | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
-| | ... | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc10-1518B-2t2c-dot1q-l2bdbasemaclrn-eth-2vhost-1vm-pdrdisc
 | | [Documentation]
@@ -414,8 +416,8 @@
 | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
-| | ... | ${threshold} | ${perf_pdr_loss_acceptance}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold} | ${perf_pdr_loss_acceptance}
 | | ... | ${perf_pdr_loss_acceptance_type}
 
 | tc11-IMIX-2t2c-dot1q-l2bdbasemaclrn-eth-2vhost-1vm-ndrdisc
@@ -451,8 +453,8 @@
 | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
-| | ... | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc12-IMIX-2t2c-dot1q-l2bdbasemaclrn-eth-2vhost-1vm-pdrdisc
 | | [Documentation]
@@ -487,8 +489,8 @@
 | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
-| | ... | ${threshold} | ${perf_pdr_loss_acceptance}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold} | ${perf_pdr_loss_acceptance}
 | | ... | ${perf_pdr_loss_acceptance_type}
 
 | tc13-64B-4t4c-dot1q-l2bdbasemaclrn-eth-2vhost-1vm-ndrdisc
@@ -522,8 +524,8 @@
 | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
-| | ... | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc14-64B-4t4c-dot1q-l2bdbasemaclrn-eth-2vhost-1vm-pdrdisc
 | | [Documentation]
@@ -556,8 +558,8 @@
 | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
-| | ... | ${threshold} | ${perf_pdr_loss_acceptance}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold} | ${perf_pdr_loss_acceptance}
 | | ... | ${perf_pdr_loss_acceptance_type}
 
 | tc15-1518B-4t4c-dot1q-l2bdbasemaclrn-eth-2vhost-1vm-ndrdisc
@@ -591,8 +593,8 @@
 | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
-| | ... | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc16-1518B-4t4c-dot1q-l2bdbasemaclrn-eth-2vhost-1vm-pdrdisc
 | | [Documentation]
@@ -625,8 +627,8 @@
 | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
-| | ... | ${threshold} | ${perf_pdr_loss_acceptance}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold} | ${perf_pdr_loss_acceptance}
 | | ... | ${perf_pdr_loss_acceptance_type}
 
 | tc17-IMIX-4t4c-dot1q-l2bdbasemaclrn-eth-2vhost-1vm-ndrdisc
@@ -662,8 +664,8 @@
 | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
-| | ... | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc18-IMIX-4t4c-dot1q-l2bdbasemaclrn-eth-2vhost-1vm-pdrdisc
 | | [Documentation]
@@ -698,6 +700,6 @@
 | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
-| | ... | ${threshold} | ${perf_pdr_loss_acceptance}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold} | ${perf_pdr_loss_acceptance}
 | | ... | ${perf_pdr_loss_acceptance_type}
diff --git a/tests/perf/10ge2p1x520-dot1q-l2xcbase-eth-2vhost-1vm-ndrpdrdisc.robot b/tests/perf/10ge2p1x520-dot1q-l2xcbase-eth-2vhost-1vm-ndrpdrdisc.robot
index c52a8cef6c..75b9c36f9e 100644
--- a/tests/perf/10ge2p1x520-dot1q-l2xcbase-eth-2vhost-1vm-ndrpdrdisc.robot
+++ b/tests/perf/10ge2p1x520-dot1q-l2xcbase-eth-2vhost-1vm-ndrpdrdisc.robot
@@ -24,7 +24,7 @@
 | ...
 | Test Setup | Performance test setup
 | Test Teardown | Performance test with vhost and VM with dpdk-testpmd teardown
-| ... | ${min_rate}pps | ${framesize} | 3-node-xconnect
+| ... | ${min_rate}pps | ${framesize} | ${traffic_profile}
 | ... | dut1_node=${dut1} | dut1_vm_refs=${dut1_vm_refs}
 | ... | dut2_node=${dut2} | dut2_vm_refs=${dut2_vm_refs}
 | ...
@@ -64,6 +64,8 @@
 | ${sock2}= | /tmp/sock-2
 # X520-DA2 bandwidth limit
 | ${s_limit}= | ${10000000000}
+# Traffic profile:
+| ${traffic_profile} | trex-sl-3n-ethip4-ip4src254
 
 *** Test Cases ***
 | tc01-64B-1t1c-eth-l2xcbase-eth-2vhost-1vm-ndrdisc
@@ -96,8 +98,8 @@
 | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
-| | ... | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc02-64B-1t1c-eth-l2xcbase-eth-2vhost-1vm-pdrdisc
 | | [Documentation]
@@ -129,8 +131,8 @@
 | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
-| | ... | ${threshold} | ${perf_pdr_loss_acceptance}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold} | ${perf_pdr_loss_acceptance}
 | | ... | ${perf_pdr_loss_acceptance_type}
 
 | tc03-1518B-1t1c-eth-l2xcbase-eth-2vhost-1vm-ndrdisc
@@ -163,8 +165,8 @@
 | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
-| | ... | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc04-1518B-1t1c-eth-l2xcbase-eth-2vhost-1vm-pdrdisc
 | | [Documentation]
@@ -196,8 +198,8 @@
 | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
-| | ... | ${threshold} | ${perf_pdr_loss_acceptance}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold} | ${perf_pdr_loss_acceptance}
 | | ... | ${perf_pdr_loss_acceptance_type}
 
 | tc05-IMIX-1t1c-eth-l2xcbase-eth-2vhost-1vm-ndrdisc
@@ -232,8 +234,8 @@
 | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
-| | ... | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc06-IMIX-1t1c-eth-l2xcbase-eth-2vhost-1vm-pdrdisc
 | | [Documentation]
@@ -267,8 +269,8 @@
 | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
-| | ... | ${threshold} | ${perf_pdr_loss_acceptance}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold} | ${perf_pdr_loss_acceptance}
 | | ... | ${perf_pdr_loss_acceptance_type}
 
 | tc07-64B-2t2c-eth-l2xcbase-eth-2vhost-1vm-ndrdisc
@@ -301,8 +303,8 @@
 | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
-| | ... | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc08-64B-2t2c-eth-l2xcbase-eth-2vhost-1vm-pdrdisc
 | | [Documentation]
@@ -334,8 +336,8 @@
 | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
-| | ... | ${threshold} | ${perf_pdr_loss_acceptance}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold} | ${perf_pdr_loss_acceptance}
 | | ... | ${perf_pdr_loss_acceptance_type}
 
 | tc09-1518B-2t2c-eth-l2xcbase-eth-2vhost-1vm-ndrdisc
@@ -368,8 +370,8 @@
 | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
-| | ... | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc10-1518B-2t2c-eth-l2xcbase-eth-2vhost-1vm-pdrdisc
 | | [Documentation]
@@ -401,8 +403,8 @@
 | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
-| | ... | ${threshold} | ${perf_pdr_loss_acceptance}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold} | ${perf_pdr_loss_acceptance}
 | | ... | ${perf_pdr_loss_acceptance_type}
 
 | tc11-IMIX-2t2c-eth-l2xcbase-eth-2vhost-1vm-ndrdisc
@@ -437,8 +439,8 @@
 | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
-| | ... | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc12-IMIX-2t2c-eth-l2xcbase-eth-2vhost-1vm-pdrdisc
 | | [Documentation]
@@ -472,8 +474,8 @@
 | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
-| | ... | ${threshold} | ${perf_pdr_loss_acceptance}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold} | ${perf_pdr_loss_acceptance}
 | | ... | ${perf_pdr_loss_acceptance_type}
 
 | tc13-64B-4t4c-eth-l2xcbase-eth-2vhost-1vm-ndrdisc
@@ -506,8 +508,8 @@
 | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
-| | ... | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc14-64B-4t4c-eth-l2xcbase-eth-2vhost-1vm-pdrdisc
 | | [Documentation]
@@ -539,8 +541,8 @@
 | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
-| | ... | ${threshold} | ${perf_pdr_loss_acceptance}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold} | ${perf_pdr_loss_acceptance}
 | | ... | ${perf_pdr_loss_acceptance_type}
 
 | tc15-1518B-4t4c-eth-l2xcbase-eth-2vhost-1vm-ndrdisc
@@ -573,8 +575,8 @@
 | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
-| | ... | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc16-1518B-4t4c-eth-l2xcbase-eth-2vhost-1vm-pdrdisc
 | | [Documentation]
@@ -606,8 +608,8 @@
 | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
-| | ... | ${threshold} | ${perf_pdr_loss_acceptance}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold} | ${perf_pdr_loss_acceptance}
 | | ... | ${perf_pdr_loss_acceptance_type}
 
 | tc17-IMIX-4t4c-eth-l2xcbase-eth-2vhost-1vm-ndrdisc
@@ -642,8 +644,8 @@
 | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
-| | ... | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc18-IMIX-4t4c-eth-l2xcbase-eth-2vhost-1vm-pdrdisc
 | | [Documentation]
@@ -677,6 +679,6 @@
 | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
-| | ... | ${threshold} | ${perf_pdr_loss_acceptance}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold} | ${perf_pdr_loss_acceptance}
 | | ... | ${perf_pdr_loss_acceptance_type}
diff --git a/tests/perf/10ge2p1x520-dot1q-l2xcbase-ndrchk.robot b/tests/perf/10ge2p1x520-dot1q-l2xcbase-ndrchk.robot
index b873322872..cf1fddff23 100644
--- a/tests/perf/10ge2p1x520-dot1q-l2xcbase-ndrchk.robot
+++ b/tests/perf/10ge2p1x520-dot1q-l2xcbase-ndrchk.robot
@@ -48,6 +48,8 @@
 *** Variables ***
 | ${subid}= | 10
 | ${tag_rewrite}= | pop-1
+# Traffic profile:
+| ${traffic_profile} | trex-sl-3n-ethip4-ip4src254
 
 *** Test Cases ***
 | tc01-64B-1t1c-dot1q-l2xcbase-ndrchk
@@ -72,7 +74,7 @@
 | | ... | ${dut1} | ${dut1_if1} | ${subif_index_1}
 | | ... | ${dut2} | ${dut2_if2} | ${subif_index_2}
 | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | 3-node-xconnect
+| | ... | ${framesize} | ${traffic_profile}
 
 | tc02-1518B-1t1c-dot1q-l2xcbase-ndrchk
 | | [Documentation]
@@ -96,7 +98,7 @@
 | | ... | ${dut1} | ${dut1_if1} | ${subif_index_1}
 | | ... | ${dut2} | ${dut2_if2} | ${subif_index_2}
 | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | 3-node-xconnect
+| | ... | ${framesize} | ${traffic_profile}
 
 | tc03-9000B-1t1c-dot1q-l2xcbase-ndrchk
 | | [Documentation]
@@ -119,7 +121,7 @@
 | | ... | ${dut1} | ${dut1_if1} | ${subif_index_1}
 | | ... | ${dut2} | ${dut2_if2} | ${subif_index_2}
 | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | 3-node-xconnect
+| | ... | ${framesize} | ${traffic_profile}
 
 | tc04-64B-2t2c-dot1q-l2xcbase-ndrchk
 | | [Documentation]
@@ -143,7 +145,7 @@
 | | ... | ${dut1} | ${dut1_if1} | ${subif_index_1}
 | | ... | ${dut2} | ${dut2_if2} | ${subif_index_2}
 | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | 3-node-xconnect
+| | ... | ${framesize} | ${traffic_profile}
 
 | tc05-1518B-2t2c-dot1q-l2xcbase-ndrchk
 | | [Documentation]
@@ -167,7 +169,7 @@
 | | ... | ${dut1} | ${dut1_if1} | ${subif_index_1}
 | | ... | ${dut2} | ${dut2_if2} | ${subif_index_2}
 | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | 3-node-xconnect
+| | ... | ${framesize} | ${traffic_profile}
 
 | tc06-9000B-2t2c-dot1q-l2xcbase-ndrchk
 | | [Documentation]
@@ -190,7 +192,7 @@
 | | ... | ${dut1} | ${dut1_if1} | ${subif_index_1}
 | | ... | ${dut2} | ${dut2_if2} | ${subif_index_2}
 | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | 3-node-xconnect
+| | ... | ${framesize} | ${traffic_profile}
 
 | tc07-64B-4t4c-dot1q-l2xcbase-ndrchk
 | | [Documentation]
@@ -214,7 +216,7 @@
 | | ... | ${dut1} | ${dut1_if1} | ${subif_index_1}
 | | ... | ${dut2} | ${dut2_if2} | ${subif_index_2}
 | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | 3-node-xconnect
+| | ... | ${framesize} | ${traffic_profile}
 
 | tc08-1518B-4t4c-dot1q-l2xcbase-ndrchk
 | | [Documentation]
@@ -238,7 +240,7 @@
 | | ... | ${dut1} | ${dut1_if1} | ${subif_index_1}
 | | ... | ${dut2} | ${dut2_if2} | ${subif_index_2}
 | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | 3-node-xconnect
+| | ... | ${framesize} | ${traffic_profile}
 
 | tc09-9000B-4t4c-dot1q-l2xcbase-ndrchk
 | | [Documentation]
@@ -261,4 +263,4 @@
 | | ... | ${dut1} | ${dut1_if1} | ${subif_index_1}
 | | ... | ${dut2} | ${dut2_if2} | ${subif_index_2}
 | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | 3-node-xconnect
+| | ... | ${framesize} | ${traffic_profile}
diff --git a/tests/perf/10ge2p1x520-dot1q-l2xcbase-ndrpdrdisc.robot b/tests/perf/10ge2p1x520-dot1q-l2xcbase-ndrpdrdisc.robot
index ab7be244c8..77edc2adc9 100644
--- a/tests/perf/10ge2p1x520-dot1q-l2xcbase-ndrpdrdisc.robot
+++ b/tests/perf/10ge2p1x520-dot1q-l2xcbase-ndrpdrdisc.robot
@@ -24,7 +24,7 @@
 | ...
 | Test Setup | Performance test setup
 | Test Teardown | Performance test teardown | ${min_rate}pps | ${framesize}
-| ... | 3-node-xconnect
+| ... | ${traffic_profile}
 | ...
 | Documentation | *RFC2544: Pkt throughput L2XC with 802.1q test cases*
 | ...
@@ -53,6 +53,8 @@
 | ${tag_rewrite}= | pop-1
 # X520-DA2 bandwidth limit
 | ${s_limit} | ${10000000000}
+# Traffic profile:
+| ${traffic_profile} | trex-sl-3n-ethip4-ip4src254
 
 *** Test Cases ***
 | tc01-64B-1t1c-dot1q-l2xcbase-ndrdisc
@@ -68,10 +70,10 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | And   VPP interfaces in path are up in a 3-node circular topology
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | And VPP interfaces in path are up in a 3-node circular topology
 | | When VLAN dot1q subinterfaces initialized on 3-node topology
 | | ... | ${dut1} | ${dut1_if2} | ${dut2} | ${dut2_if1} | ${subid}
 | | And L2 tag rewrite method setup on interfaces
@@ -81,9 +83,8 @@
 | | ... | ${dut1} | ${dut1_if1} | ${subif_index_1}
 | | ... | ${dut2} | ${dut2_if2} | ${subif_index_2}
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-xconnect
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc02-64B-1t1c-dot1q-l2xcbase-pdrdisc
 | | [Documentation]
@@ -98,10 +99,10 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | And   VPP interfaces in path are up in a 3-node circular topology
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | And VPP interfaces in path are up in a 3-node circular topology
 | | When VLAN dot1q subinterfaces initialized on 3-node topology
 | | ... | ${dut1} | ${dut1_if2} | ${dut2} | ${dut2_if1} | ${subid}
 | | And L2 tag rewrite method setup on interfaces
@@ -111,11 +112,9 @@
 | | ... | ${dut1} | ${dut1_if1} | ${subif_index_1}
 | | ... | ${dut2} | ${dut2_if2} | ${subif_index_2}
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-xconnect
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
-| | ...                                       | ${perf_pdr_loss_acceptance}
-| | ...                                       | ${perf_pdr_loss_acceptance_type}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
+| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
 
 | tc03-1518B-1t1c-dot1q-l2xcbase-ndrdisc
 | | [Documentation]
@@ -130,10 +129,10 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | And   VPP interfaces in path are up in a 3-node circular topology
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | And VPP interfaces in path are up in a 3-node circular topology
 | | When VLAN dot1q subinterfaces initialized on 3-node topology
 | | ... | ${dut1} | ${dut1_if2} | ${dut2} | ${dut2_if1} | ${subid}
 | | And L2 tag rewrite method setup on interfaces
@@ -143,9 +142,8 @@
 | | ... | ${dut1} | ${dut1_if1} | ${subif_index_1}
 | | ... | ${dut2} | ${dut2_if2} | ${subif_index_2}
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-xconnect
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc04-1518B-1t1c-dot1q-l2xcbase-pdrdisc
 | | [Documentation]
@@ -160,10 +158,10 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | And   VPP interfaces in path are up in a 3-node circular topology
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | And VPP interfaces in path are up in a 3-node circular topology
 | | When VLAN dot1q subinterfaces initialized on 3-node topology
 | | ... | ${dut1} | ${dut1_if2} | ${dut2} | ${dut2_if1} | ${subid}
 | | And L2 tag rewrite method setup on interfaces
@@ -173,11 +171,9 @@
 | | ... | ${dut1} | ${dut1_if1} | ${subif_index_1}
 | | ... | ${dut2} | ${dut2_if2} | ${subif_index_2}
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-xconnect
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
-| | ...                                       | ${perf_pdr_loss_acceptance}
-| | ...                                       | ${perf_pdr_loss_acceptance_type}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
+| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
 
 | tc05-9000B-1t1c-dot1q-l2xcbase-ndrdisc
 | | [Documentation]
@@ -192,9 +188,9 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Apply startup configuration on all VPP DUTs
-| | And   VPP interfaces in path are up in a 3-node circular topology
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Apply startup configuration on all VPP DUTs
+| | And VPP interfaces in path are up in a 3-node circular topology
 | | When VLAN dot1q subinterfaces initialized on 3-node topology
 | | ... | ${dut1} | ${dut1_if2} | ${dut2} | ${dut2_if1} | ${subid}
 | | And L2 tag rewrite method setup on interfaces
@@ -204,9 +200,8 @@
 | | ... | ${dut1} | ${dut1_if1} | ${subif_index_1}
 | | ... | ${dut2} | ${dut2_if2} | ${subif_index_2}
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-xconnect
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc06-9000B-1t1c-dot1q-l2xcbase-pdrdisc
 | | [Documentation]
@@ -221,9 +216,9 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Apply startup configuration on all VPP DUTs
-| | And   VPP interfaces in path are up in a 3-node circular topology
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Apply startup configuration on all VPP DUTs
+| | And VPP interfaces in path are up in a 3-node circular topology
 | | When VLAN dot1q subinterfaces initialized on 3-node topology
 | | ... | ${dut1} | ${dut1_if2} | ${dut2} | ${dut2_if1} | ${subid}
 | | And L2 tag rewrite method setup on interfaces
@@ -233,11 +228,9 @@
 | | ... | ${dut1} | ${dut1_if1} | ${subif_index_1}
 | | ... | ${dut2} | ${dut2_if2} | ${subif_index_2}
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-xconnect
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
-| | ...                                       | ${perf_pdr_loss_acceptance}
-| | ...                                       | ${perf_pdr_loss_acceptance_type}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
+| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
 
 | tc07-64B-2t2c-dot1q-l2xcbase-ndrdisc
 | | [Documentation]
@@ -252,10 +245,10 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | And   VPP interfaces in path are up in a 3-node circular topology
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | And VPP interfaces in path are up in a 3-node circular topology
 | | When VLAN dot1q subinterfaces initialized on 3-node topology
 | | ... | ${dut1} | ${dut1_if2} | ${dut2} | ${dut2_if1} | ${subid}
 | | And L2 tag rewrite method setup on interfaces
@@ -265,9 +258,8 @@
 | | ... | ${dut1} | ${dut1_if1} | ${subif_index_1}
 | | ... | ${dut2} | ${dut2_if2} | ${subif_index_2}
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-xconnect
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc08-64B-2t2c-dot1q-l2xcbase-pdrdisc
 | | [Documentation]
@@ -282,10 +274,10 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | And   VPP interfaces in path are up in a 3-node circular topology
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | And VPP interfaces in path are up in a 3-node circular topology
 | | When VLAN dot1q subinterfaces initialized on 3-node topology
 | | ... | ${dut1} | ${dut1_if2} | ${dut2} | ${dut2_if1} | ${subid}
 | | And L2 tag rewrite method setup on interfaces
@@ -295,11 +287,9 @@
 | | ... | ${dut1} | ${dut1_if1} | ${subif_index_1}
 | | ... | ${dut2} | ${dut2_if2} | ${subif_index_2}
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-xconnect
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
-| | ...                                       | ${perf_pdr_loss_acceptance}
-| | ...                                       | ${perf_pdr_loss_acceptance_type}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
+| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
 
 | tc09-1518B-2t2c-dot1q-l2xcbase-ndrdisc
 | | [Documentation]
@@ -314,10 +304,10 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | And   VPP interfaces in path are up in a 3-node circular topology
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | And VPP interfaces in path are up in a 3-node circular topology
 | | When VLAN dot1q subinterfaces initialized on 3-node topology
 | | ... | ${dut1} | ${dut1_if2} | ${dut2} | ${dut2_if1} | ${subid}
 | | And L2 tag rewrite method setup on interfaces
@@ -327,9 +317,8 @@
 | | ... | ${dut1} | ${dut1_if1} | ${subif_index_1}
 | | ... | ${dut2} | ${dut2_if2} | ${subif_index_2}
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-xconnect
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc10-1518B-2t2c-dot1q-l2xcbase-pdrdisc
 | | [Documentation]
@@ -344,10 +333,10 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | And   VPP interfaces in path are up in a 3-node circular topology
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | And VPP interfaces in path are up in a 3-node circular topology
 | | When VLAN dot1q subinterfaces initialized on 3-node topology
 | | ... | ${dut1} | ${dut1_if2} | ${dut2} | ${dut2_if1} | ${subid}
 | | And L2 tag rewrite method setup on interfaces
@@ -357,11 +346,9 @@
 | | ... | ${dut1} | ${dut1_if1} | ${subif_index_1}
 | | ... | ${dut2} | ${dut2_if2} | ${subif_index_2}
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-xconnect
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
-| | ...                                       | ${perf_pdr_loss_acceptance}
-| | ...                                       | ${perf_pdr_loss_acceptance_type}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
+| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
 
 | tc11-9000B-2t2c-dot1q-l2xcbase-ndrdisc
 | | [Documentation]
@@ -376,9 +363,9 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Apply startup configuration on all VPP DUTs
-| | And   VPP interfaces in path are up in a 3-node circular topology
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Apply startup configuration on all VPP DUTs
+| | And VPP interfaces in path are up in a 3-node circular topology
 | | When VLAN dot1q subinterfaces initialized on 3-node topology
 | | ... | ${dut1} | ${dut1_if2} | ${dut2} | ${dut2_if1} | ${subid}
 | | And L2 tag rewrite method setup on interfaces
@@ -388,9 +375,8 @@
 | | ... | ${dut1} | ${dut1_if1} | ${subif_index_1}
 | | ... | ${dut2} | ${dut2_if2} | ${subif_index_2}
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-xconnect
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc12-9000B-2t2c-dot1q-l2xcbase-pdrdisc
 | | [Documentation]
@@ -405,9 +391,9 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Apply startup configuration on all VPP DUTs
-| | And   VPP interfaces in path are up in a 3-node circular topology
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Apply startup configuration on all VPP DUTs
+| | And VPP interfaces in path are up in a 3-node circular topology
 | | When VLAN dot1q subinterfaces initialized on 3-node topology
 | | ... | ${dut1} | ${dut1_if2} | ${dut2} | ${dut2_if1} | ${subid}
 | | And L2 tag rewrite method setup on interfaces
@@ -417,11 +403,9 @@
 | | ... | ${dut1} | ${dut1_if1} | ${subif_index_1}
 | | ... | ${dut2} | ${dut2_if2} | ${subif_index_2}
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-xconnect
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
-| | ...                                       | ${perf_pdr_loss_acceptance}
-| | ...                                       | ${perf_pdr_loss_acceptance_type}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
+| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
 
 | tc13-64B-4t4c-dot1q-l2xcbase-ndrdisc
 | | [Documentation]
@@ -436,10 +420,10 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | And   VPP interfaces in path are up in a 3-node circular topology
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | And VPP interfaces in path are up in a 3-node circular topology
 | | When VLAN dot1q subinterfaces initialized on 3-node topology
 | | ... | ${dut1} | ${dut1_if2} | ${dut2} | ${dut2_if1} | ${subid}
 | | And L2 tag rewrite method setup on interfaces
@@ -449,9 +433,8 @@
 | | ... | ${dut1} | ${dut1_if1} | ${subif_index_1}
 | | ... | ${dut2} | ${dut2_if2} | ${subif_index_2}
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-xconnect
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc14-64B-4t4c-dot1q-l2xcbase-pdrdisc
 | | [Documentation]
@@ -466,10 +449,10 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | And   VPP interfaces in path are up in a 3-node circular topology
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | And VPP interfaces in path are up in a 3-node circular topology
 | | When VLAN dot1q subinterfaces initialized on 3-node topology
 | | ... | ${dut1} | ${dut1_if2} | ${dut2} | ${dut2_if1} | ${subid}
 | | And L2 tag rewrite method setup on interfaces
@@ -479,11 +462,9 @@
 | | ... | ${dut1} | ${dut1_if1} | ${subif_index_1}
 | | ... | ${dut2} | ${dut2_if2} | ${subif_index_2}
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-xconnect
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
-| | ...                                       | ${perf_pdr_loss_acceptance}
-| | ...                                       | ${perf_pdr_loss_acceptance_type}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
+| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
 
 | tc15-1518B-4t4c-dot1q-l2xcbase-ndrdisc
 | | [Documentation]
@@ -498,10 +479,10 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | And   VPP interfaces in path are up in a 3-node circular topology
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | And VPP interfaces in path are up in a 3-node circular topology
 | | When VLAN dot1q subinterfaces initialized on 3-node topology
 | | ... | ${dut1} | ${dut1_if2} | ${dut2} | ${dut2_if1} | ${subid}
 | | And L2 tag rewrite method setup on interfaces
@@ -511,9 +492,8 @@
 | | ... | ${dut1} | ${dut1_if1} | ${subif_index_1}
 | | ... | ${dut2} | ${dut2_if2} | ${subif_index_2}
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-xconnect
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc16-1518B-4t4c-dot1q-l2xcbase-pdrdisc
 | | [Documentation]
@@ -528,10 +508,10 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | And   VPP interfaces in path are up in a 3-node circular topology
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | And VPP interfaces in path are up in a 3-node circular topology
 | | When VLAN dot1q subinterfaces initialized on 3-node topology
 | | ... | ${dut1} | ${dut1_if2} | ${dut2} | ${dut2_if1} | ${subid}
 | | And L2 tag rewrite method setup on interfaces
@@ -541,11 +521,9 @@
 | | ... | ${dut1} | ${dut1_if1} | ${subif_index_1}
 | | ... | ${dut2} | ${dut2_if2} | ${subif_index_2}
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-xconnect
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
-| | ...                                       | ${perf_pdr_loss_acceptance}
-| | ...                                       | ${perf_pdr_loss_acceptance_type}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
+| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
 
 | tc17-9000B-4t4c-dot1q-l2xcbase-ndrdisc
 | | [Documentation]
@@ -560,9 +538,9 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Apply startup configuration on all VPP DUTs
-| | And   VPP interfaces in path are up in a 3-node circular topology
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Apply startup configuration on all VPP DUTs
+| | And VPP interfaces in path are up in a 3-node circular topology
 | | When VLAN dot1q subinterfaces initialized on 3-node topology
 | | ... | ${dut1} | ${dut1_if2} | ${dut2} | ${dut2_if1} | ${subid}
 | | And L2 tag rewrite method setup on interfaces
@@ -572,9 +550,8 @@
 | | ... | ${dut1} | ${dut1_if1} | ${subif_index_1}
 | | ... | ${dut2} | ${dut2_if2} | ${subif_index_2}
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-xconnect
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc18-9000B-4t4c-dot1q-l2xcbase-pdrdisc
 | | [Documentation]
@@ -589,9 +566,9 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Apply startup configuration on all VPP DUTs
-| | And   VPP interfaces in path are up in a 3-node circular topology
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Apply startup configuration on all VPP DUTs
+| | And VPP interfaces in path are up in a 3-node circular topology
 | | When VLAN dot1q subinterfaces initialized on 3-node topology
 | | ... | ${dut1} | ${dut1_if2} | ${dut2} | ${dut2_if1} | ${subid}
 | | And L2 tag rewrite method setup on interfaces
@@ -601,8 +578,6 @@
 | | ... | ${dut1} | ${dut1_if1} | ${subif_index_1}
 | | ... | ${dut2} | ${dut2_if2} | ${subif_index_2}
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-xconnect
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
-| | ...                                       | ${perf_pdr_loss_acceptance}
-| | ...                                       | ${perf_pdr_loss_acceptance_type}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
+| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
diff --git a/tests/perf/10ge2p1x520-eth-l2bdbasemaclrn-eth-2vhost-1vm-ndrpdrdisc.robot b/tests/perf/10ge2p1x520-eth-l2bdbasemaclrn-eth-2vhost-1vm-ndrpdrdisc.robot
index 99da3df770..07b7ff93a1 100644
--- a/tests/perf/10ge2p1x520-eth-l2bdbasemaclrn-eth-2vhost-1vm-ndrpdrdisc.robot
+++ b/tests/perf/10ge2p1x520-eth-l2bdbasemaclrn-eth-2vhost-1vm-ndrpdrdisc.robot
@@ -24,7 +24,7 @@
 | ...
 | Test Setup | Performance test setup
 | Test Teardown | Performance test with vhost and VM with dpdk-testpmd teardown
-| ... | ${min_rate}pps | ${framesize} | 3-node-bridge
+| ... | ${min_rate}pps | ${framesize} | ${traffic_profile}
 | ... | dut1_node=${dut1} | dut1_vm_refs=${dut1_vm_refs}
 | ... | dut2_node=${dut2} | dut2_vm_refs=${dut2_vm_refs}
 | ...
@@ -63,6 +63,8 @@
 | ${bd_id2}= | 2
 | ${sock1}= | /tmp/sock-1-${bd_id1}
 | ${sock2}= | /tmp/sock-1-${bd_id2}
+# Traffic profile:
+| ${traffic_profile} | trex-sl-3n-ethip4-ip4src254
 
 *** Test Cases ***
 | tc01-64B-1t1c-eth-l2bdbasemaclrn-eth-2vhost-1vm-ndrdisc
@@ -80,21 +82,20 @@
 | | ${dut1_vm_refs}= | Create Dictionary
 | | ${dut2_vm_refs}= | Create Dictionary
 | | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | When  L2 bridge domains with Vhost-User initialized in a 3-node circular topology
-| | ...   | ${bd_id1} | ${bd_id2} | ${sock1} | ${sock2}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | When L2 bridge domains with Vhost-User initialized in a 3-node circular topology
+| | ... | ${bd_id1} | ${bd_id2} | ${sock1} | ${sock2}
 | | ${vm1}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
-| | ...     | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1
+| | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1
 | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1}
 | | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
-| | ...     | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
+| | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-bridge
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc02-64B-1t1c-eth-l2bdbasemaclrn-eth-2vhost-1vm-pdrdisc
 | | [Documentation]
@@ -111,23 +112,21 @@
 | | ${dut1_vm_refs}= | Create Dictionary
 | | ${dut2_vm_refs}= | Create Dictionary
 | | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | When  L2 bridge domains with Vhost-User initialized in a 3-node circular topology
-| | ...   | ${bd_id1} | ${bd_id2} | ${sock1} | ${sock2}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | When L2 bridge domains with Vhost-User initialized in a 3-node circular topology
+| | ... | ${bd_id1} | ${bd_id2} | ${sock1} | ${sock2}
 | | ${vm1}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
-| | ...     | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1
+| | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1
 | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1}
 | | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
-| | ...     | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
+| | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-bridge
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
-| | ...                                       | ${perf_pdr_loss_acceptance}
-| | ...                                       | ${perf_pdr_loss_acceptance_type}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
+| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
 
 | tc03-1518B-1t1c-eth-l2bdbasemaclrn-eth-2vhost-1vm-ndrdisc
 | | [Documentation]
@@ -144,21 +143,20 @@
 | | ${dut1_vm_refs}= | Create Dictionary
 | | ${dut2_vm_refs}= | Create Dictionary
 | | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | When  L2 bridge domains with Vhost-User initialized in a 3-node circular topology
-| | ...   | ${bd_id1} | ${bd_id2} | ${sock1} | ${sock2}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | When L2 bridge domains with Vhost-User initialized in a 3-node circular topology
+| | ... | ${bd_id1} | ${bd_id2} | ${sock1} | ${sock2}
 | | ${vm1}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
-| | ...     | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1
+| | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1
 | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1}
 | | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
-| | ...     | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
+| | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-bridge
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc04-1518B-1t1c-eth-l2bdbasemaclrn-eth-2vhost-1vm-pdrdisc
 | | [Documentation]
@@ -175,23 +173,21 @@
 | | ${dut1_vm_refs}= | Create Dictionary
 | | ${dut2_vm_refs}= | Create Dictionary
 | | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | When  L2 bridge domains with Vhost-User initialized in a 3-node circular topology
-| | ...   | ${bd_id1} | ${bd_id2} | ${sock1} | ${sock2}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | When L2 bridge domains with Vhost-User initialized in a 3-node circular topology
+| | ... | ${bd_id1} | ${bd_id2} | ${sock1} | ${sock2}
 | | ${vm1}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
-| | ...     | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1
+| | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1
 | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1}
 | | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
-| | ...     | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
+| | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-bridge
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
-| | ...                                       | ${perf_pdr_loss_acceptance}
-| | ...                                       | ${perf_pdr_loss_acceptance_type}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
+| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
 
 | tc05-IMIX-1t1c-eth-l2bdbasemaclrn-eth-2vhost-1vm-ndrdisc
 | | [Documentation]
@@ -209,21 +205,20 @@
 | | ${dut1_vm_refs}= | Create Dictionary
 | | ${dut2_vm_refs}= | Create Dictionary
 | | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | When  L2 bridge domains with Vhost-User initialized in a 3-node circular topology
-| | ...   | ${bd_id1} | ${bd_id2} | ${sock1} | ${sock2}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | When L2 bridge domains with Vhost-User initialized in a 3-node circular topology
+| | ... | ${bd_id1} | ${bd_id2} | ${sock1} | ${sock2}
 | | ${vm1}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
-| | ...     | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1
+| | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1
 | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1}
 | | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
-| | ...     | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
+| | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-bridge
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc06-IMIX-1t1c-eth-l2bdbasemaclrn-eth-2vhost-1vm-pdrdisc
 | | [Documentation]
@@ -241,23 +236,21 @@
 | | ${dut1_vm_refs}= | Create Dictionary
 | | ${dut2_vm_refs}= | Create Dictionary
 | | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | When  L2 bridge domains with Vhost-User initialized in a 3-node circular topology
-| | ...   | ${bd_id1} | ${bd_id2} | ${sock1} | ${sock2}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | When L2 bridge domains with Vhost-User initialized in a 3-node circular topology
+| | ... | ${bd_id1} | ${bd_id2} | ${sock1} | ${sock2}
 | | ${vm1}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
-| | ...     | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1
+| | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1
 | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1}
 | | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
-| | ...     | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
+| | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-bridge
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
-| | ...                                       | ${perf_pdr_loss_acceptance}
-| | ...                                       | ${perf_pdr_loss_acceptance_type}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
+| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
 
 | tc07-64B-2t2c-eth-l2bdbasemaclrn-eth-2vhost-1vm-ndrdisc
 | | [Documentation]
@@ -274,21 +267,20 @@
 | | ${dut1_vm_refs}= | Create Dictionary
 | | ${dut2_vm_refs}= | Create Dictionary
 | | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | When  L2 bridge domains with Vhost-User initialized in a 3-node circular topology
-| | ...   | ${bd_id1} | ${bd_id2} | ${sock1} | ${sock2}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | When L2 bridge domains with Vhost-User initialized in a 3-node circular topology
+| | ... | ${bd_id1} | ${bd_id2} | ${sock1} | ${sock2}
 | | ${vm1}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
-| | ...     | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1
+| | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1
 | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1}
 | | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
-| | ...     | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
+| | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-bridge
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc08-64B-2t2c-eth-l2bdbasemaclrn-eth-2vhost-1vm-pdrdisc
 | | [Documentation]
@@ -305,23 +297,21 @@
 | | ${dut1_vm_refs}= | Create Dictionary
 | | ${dut2_vm_refs}= | Create Dictionary
 | | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | When  L2 bridge domains with Vhost-User initialized in a 3-node circular topology
-| | ...   | ${bd_id1} | ${bd_id2} | ${sock1} | ${sock2}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | When L2 bridge domains with Vhost-User initialized in a 3-node circular topology
+| | ... | ${bd_id1} | ${bd_id2} | ${sock1} | ${sock2}
 | | ${vm1}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
-| | ...     | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1
+| | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1
 | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1}
 | | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
-| | ...     | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
+| | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-bridge
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
-| | ...                                       | ${perf_pdr_loss_acceptance}
-| | ...                                       | ${perf_pdr_loss_acceptance_type}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
+| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
 
 | tc09-1518B-2t2c-eth-l2bdbasemaclrn-eth-2vhost-1vm-ndrdisc
 | | [Documentation]
@@ -338,21 +328,20 @@
 | | ${dut1_vm_refs}= | Create Dictionary
 | | ${dut2_vm_refs}= | Create Dictionary
 | | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | When  L2 bridge domains with Vhost-User initialized in a 3-node circular topology
-| | ...   | ${bd_id1} | ${bd_id2} | ${sock1} | ${sock2}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | When L2 bridge domains with Vhost-User initialized in a 3-node circular topology
+| | ... | ${bd_id1} | ${bd_id2} | ${sock1} | ${sock2}
 | | ${vm1}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
-| | ...     | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1
+| | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1
 | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1}
 | | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
-| | ...     | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
+| | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-bridge
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc10-1518B-2t2c-eth-l2bdbasemaclrn-eth-2vhost-1vm-pdrdisc
 | | [Documentation]
@@ -369,23 +358,21 @@
 | | ${dut1_vm_refs}= | Create Dictionary
 | | ${dut2_vm_refs}= | Create Dictionary
 | | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | When  L2 bridge domains with Vhost-User initialized in a 3-node circular topology
-| | ...   | ${bd_id1} | ${bd_id2} | ${sock1} | ${sock2}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | When L2 bridge domains with Vhost-User initialized in a 3-node circular topology
+| | ... | ${bd_id1} | ${bd_id2} | ${sock1} | ${sock2}
 | | ${vm1}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
-| | ...     | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1
+| | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1
 | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1}
 | | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
-| | ...     | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
+| | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-bridge
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
-| | ...                                       | ${perf_pdr_loss_acceptance}
-| | ...                                       | ${perf_pdr_loss_acceptance_type}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
+| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
 
 | tc11-IMIX-2t2c-eth-l2bdbasemaclrn-eth-2vhost-1vm-ndrdisc
 | | [Documentation]
@@ -403,21 +390,20 @@
 | | ${dut1_vm_refs}= | Create Dictionary
 | | ${dut2_vm_refs}= | Create Dictionary
 | | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | When  L2 bridge domains with Vhost-User initialized in a 3-node circular topology
-| | ...   | ${bd_id1} | ${bd_id2} | ${sock1} | ${sock2}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | When L2 bridge domains with Vhost-User initialized in a 3-node circular topology
+| | ... | ${bd_id1} | ${bd_id2} | ${sock1} | ${sock2}
 | | ${vm1}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
-| | ...     | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1
+| | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1
 | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1}
 | | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
-| | ...     | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
+| | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-bridge
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc12-IMIX-2t2c-eth-l2bdbasemaclrn-eth-2vhost-1vm-pdrdisc
 | | [Documentation]
@@ -435,23 +421,21 @@
 | | ${dut1_vm_refs}= | Create Dictionary
 | | ${dut2_vm_refs}= | Create Dictionary
 | | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | When  L2 bridge domains with Vhost-User initialized in a 3-node circular topology
-| | ...   | ${bd_id1} | ${bd_id2} | ${sock1} | ${sock2}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | When L2 bridge domains with Vhost-User initialized in a 3-node circular topology
+| | ... | ${bd_id1} | ${bd_id2} | ${sock1} | ${sock2}
 | | ${vm1}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
-| | ...     | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1
+| | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1
 | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1}
 | | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
-| | ...     | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
+| | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-bridge
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
-| | ...                                       | ${perf_pdr_loss_acceptance}
-| | ...                                       | ${perf_pdr_loss_acceptance_type}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
+| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
 
 | tc13-64B-4t4c-eth-l2bdbasemaclrn-eth-2vhost-1vm-ndrdisc
 | | [Documentation]
@@ -468,21 +452,20 @@
 | | ${dut1_vm_refs}= | Create Dictionary
 | | ${dut2_vm_refs}= | Create Dictionary
 | | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | When  L2 bridge domains with Vhost-User initialized in a 3-node circular topology
-| | ...   | ${bd_id1} | ${bd_id2} | ${sock1} | ${sock2}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | When L2 bridge domains with Vhost-User initialized in a 3-node circular topology
+| | ... | ${bd_id1} | ${bd_id2} | ${sock1} | ${sock2}
 | | ${vm1}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
-| | ...     | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1
+| | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1
 | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1}
 | | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
-| | ...     | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
+| | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-bridge
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc14-64B-4t4c-eth-l2bdbasemaclrn-eth-2vhost-1vm-pdrdisc
 | | [Documentation]
@@ -499,23 +482,21 @@
 | | ${dut1_vm_refs}= | Create Dictionary
 | | ${dut2_vm_refs}= | Create Dictionary
 | | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | When  L2 bridge domains with Vhost-User initialized in a 3-node circular topology
-| | ...   | ${bd_id1} | ${bd_id2} | ${sock1} | ${sock2}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | When L2 bridge domains with Vhost-User initialized in a 3-node circular topology
+| | ... | ${bd_id1} | ${bd_id2} | ${sock1} | ${sock2}
 | | ${vm1}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
-| | ...     | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1
+| | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1
 | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1}
 | | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
-| | ...     | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
+| | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-bridge
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
-| | ...                                       | ${perf_pdr_loss_acceptance}
-| | ...                                       | ${perf_pdr_loss_acceptance_type}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
+| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
 
 | tc15-1518B-4t4c-eth-l2bdbasemaclrn-eth-2vhost-1vm-ndrdisc
 | | [Documentation]
@@ -532,21 +513,20 @@
 | | ${dut1_vm_refs}= | Create Dictionary
 | | ${dut2_vm_refs}= | Create Dictionary
 | | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | When  L2 bridge domains with Vhost-User initialized in a 3-node circular topology
-| | ...   | ${bd_id1} | ${bd_id2} | ${sock1} | ${sock2}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | When L2 bridge domains with Vhost-User initialized in a 3-node circular topology
+| | ... | ${bd_id1} | ${bd_id2} | ${sock1} | ${sock2}
 | | ${vm1}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
-| | ...     | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1
+| | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1
 | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1}
 | | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
-| | ...     | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
+| | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-bridge
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc16-1518B-4t4c-eth-l2bdbasemaclrn-eth-2vhost-1vm-pdrdisc
 | | [Documentation]
@@ -563,23 +543,21 @@
 | | ${dut1_vm_refs}= | Create Dictionary
 | | ${dut2_vm_refs}= | Create Dictionary
 | | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | When  L2 bridge domains with Vhost-User initialized in a 3-node circular topology
-| | ...   | ${bd_id1} | ${bd_id2} | ${sock1} | ${sock2}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | When L2 bridge domains with Vhost-User initialized in a 3-node circular topology
+| | ... | ${bd_id1} | ${bd_id2} | ${sock1} | ${sock2}
 | | ${vm1}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
-| | ...     | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1
+| | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1
 | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1}
 | | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
-| | ...     | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
+| | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-bridge
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
-| | ...                                       | ${perf_pdr_loss_acceptance}
-| | ...                                       | ${perf_pdr_loss_acceptance_type}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
+| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
 
 | tc17-IMIX-4t4c-eth-l2bdbasemaclrn-eth-2vhost-1vm-ndrdisc
 | | [Documentation]
@@ -597,21 +575,20 @@
 | | ${dut1_vm_refs}= | Create Dictionary
 | | ${dut2_vm_refs}= | Create Dictionary
 | | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | When  L2 bridge domains with Vhost-User initialized in a 3-node circular topology
-| | ...   | ${bd_id1} | ${bd_id2} | ${sock1} | ${sock2}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | When L2 bridge domains with Vhost-User initialized in a 3-node circular topology
+| | ... | ${bd_id1} | ${bd_id2} | ${sock1} | ${sock2}
 | | ${vm1}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
-| | ...     | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1
+| | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1
 | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1}
 | | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
-| | ...     | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
+| | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-bridge
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc18-IMIX-4t4c-eth-l2bdbasemaclrn-eth-2vhost-1vm-pdrdisc
 | | [Documentation]
@@ -629,20 +606,18 @@
 | | ${dut1_vm_refs}= | Create Dictionary
 | | ${dut2_vm_refs}= | Create Dictionary
 | | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | When  L2 bridge domains with Vhost-User initialized in a 3-node circular topology
-| | ...   | ${bd_id1} | ${bd_id2} | ${sock1} | ${sock2}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | When L2 bridge domains with Vhost-User initialized in a 3-node circular topology
+| | ... | ${bd_id1} | ${bd_id2} | ${sock1} | ${sock2}
 | | ${vm1}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
-| | ...     | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1
+| | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1
 | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1}
 | | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
-| | ...     | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
+| | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-bridge
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
-| | ...                                       | ${perf_pdr_loss_acceptance}
-| | ...                                       | ${perf_pdr_loss_acceptance_type}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
+| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
diff --git a/tests/perf/10ge2p1x520-eth-l2bdbasemaclrn-eth-4vhost-2vm-ndrpdrdisc.robot b/tests/perf/10ge2p1x520-eth-l2bdbasemaclrn-eth-4vhost-2vm-ndrpdrdisc.robot
index 77a8821c2a..0580a94937 100644
--- a/tests/perf/10ge2p1x520-eth-l2bdbasemaclrn-eth-4vhost-2vm-ndrpdrdisc.robot
+++ b/tests/perf/10ge2p1x520-eth-l2bdbasemaclrn-eth-4vhost-2vm-ndrpdrdisc.robot
@@ -15,7 +15,7 @@
 | Resource | resources/libraries/robot/performance.robot
 | Library | resources.libraries.python.QemuUtils
 | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDRDISC
-| ...        | NIC_Intel-X520-DA2 | ETH | L2BDMACLRN | BASE | VHOST | VM
+| ... | NIC_Intel-X520-DA2 | ETH | L2BDMACLRN | BASE | VHOST | VM
 | Suite Setup | 3-node Performance Suite Setup with DUT's NIC model
 | ... | L2 | Intel-X520-DA2
 | Suite Teardown | 3-node Performance Suite Teardown
@@ -23,9 +23,10 @@
 | Test Teardown | Run Keywords
 | ... | Show Bridge Domain Data On All DUTs
 | ... | AND | Performance test with vhost and VM with dpdk-testpmd teardown
-| ...       | ${min_rate}pps | ${framesize} | 3-node-bridge
-| ...       | dut1_node=${dut1} | dut1_vm_refs=${dut1_vm_refs}
-| ...       | dut2_node=${dut2} | dut2_vm_refs=${dut2_vm_refs}
+| ... | ${min_rate}pps | ${framesize}
+| ... | ${traffic_profile}
+| ... | dut1_node=${dut1} | dut1_vm_refs=${dut1_vm_refs}
+| ... | dut2_node=${dut2} | dut2_vm_refs=${dut2_vm_refs}
 | Documentation | *RFC2544: Pkt throughput L2BD test cases with vhost*
 | ...
 | ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology
@@ -54,12 +55,14 @@
 | ... | *[Ref] Applicable standard specifications:* RFC2544.
 
 *** Variables ***
-#X520-DA2 bandwidth limit
+# X520-DA2 bandwidth limit
 | ${s_limit}= | ${10000000000}
-#CPU settings
+# CPU settings
 | ${system_cpus}= | ${1}
 | ${vpp_cpus}= | ${5}
 | ${vm_cpus}= | ${5}
+# Traffic profile:
+| ${traffic_profile} | trex-sl-3n-ethip4-ip4src254
 
 *** Test Cases ***
 | tc01-64B-1t1c-eth-l2bdbasemaclrn-eth-4vhost-2vm-ndrdisc
@@ -79,14 +82,14 @@
 | | Set Test Variable | ${dut1_vm_refs}
 | | Set Test Variable | ${dut2_vm_refs}
 | | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | When  L2 bridge domains with Vhost-User for '2' VMs initialized in a 3-node circular topology
-| | And   '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology
-| | Then  Find NDR using binary search and pps
-| | ...   | ${framesize} | ${binary_min} | ${binary_max} | 3-node-bridge
-| | ...   | ${min_rate} | ${max_rate} | ${threshold}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | When L2 bridge domains with Vhost-User for '2' VMs initialized in a 3-node circular topology
+| | And '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology
+| | Then Find NDR using binary search and pps
+| | ... | ${framesize} | ${binary_min} | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc02-64B-1t1c-eth-l2bdbasemaclrn-eth-4vhost-2vm-pdrdisc
 | | [Documentation]
@@ -105,15 +108,15 @@
 | | Set Test Variable | ${dut1_vm_refs}
 | | Set Test Variable | ${dut2_vm_refs}
 | | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | When  L2 bridge domains with Vhost-User for '2' VMs initialized in a 3-node circular topology
-| | And   '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology
-| | Then  Find PDR using binary search and pps
-| | ...   | ${framesize} | ${binary_min} | ${binary_max} | 3-node-bridge
-| | ...   | ${min_rate} | ${max_rate} | ${threshold}
-| | ...   | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | When L2 bridge domains with Vhost-User for '2' VMs initialized in a 3-node circular topology
+| | And '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology
+| | 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}
 
 | tc03-1518B-1t1c-eth-l2bdbasemaclrn-eth-4vhost-2vm-ndrdisc
 | | [Documentation]
@@ -132,14 +135,14 @@
 | | Set Test Variable | ${dut1_vm_refs}
 | | Set Test Variable | ${dut2_vm_refs}
 | | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | When  L2 bridge domains with Vhost-User for '2' VMs initialized in a 3-node circular topology
-| | And   '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology
-| | Then  Find NDR using binary search and pps
-| | ...   | ${framesize} | ${binary_min} | ${binary_max} | 3-node-bridge
-| | ...   | ${min_rate} | ${max_rate} | ${threshold}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | When L2 bridge domains with Vhost-User for '2' VMs initialized in a 3-node circular topology
+| | And '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology
+| | Then Find NDR using binary search and pps
+| | ... | ${framesize} | ${binary_min} | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc04-1518B-1t1c-eth-l2bdbasemaclrn-eth-4vhost-2vm-pdrdisc
 | | [Documentation]
@@ -158,15 +161,15 @@
 | | Set Test Variable | ${dut1_vm_refs}
 | | Set Test Variable | ${dut2_vm_refs}
 | | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | When  L2 bridge domains with Vhost-User for '2' VMs initialized in a 3-node circular topology
-| | And   '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology
-| | Then  Find PDR using binary search and pps
-| | ...   | ${framesize} | ${binary_min} | ${binary_max} | 3-node-bridge
-| | ...   | ${min_rate} | ${max_rate} | ${threshold}
-| | ...   | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | When L2 bridge domains with Vhost-User for '2' VMs initialized in a 3-node circular topology
+| | And '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology
+| | 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}
 
 | tc05-IMIX-1t1c-eth-l2bdbasemaclrn-eth-4vhost-2vm-ndrdisc
 | | [Documentation]
@@ -186,14 +189,14 @@
 | | Set Test Variable | ${dut1_vm_refs}
 | | Set Test Variable | ${dut2_vm_refs}
 | | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | When  L2 bridge domains with Vhost-User for '2' VMs initialized in a 3-node circular topology
-| | And   '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology
-| | Then  Find NDR using binary search and pps
-| | ...   | ${framesize} | ${binary_min} | ${binary_max} | 3-node-bridge
-| | ...   | ${min_rate} | ${max_rate} | ${threshold}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | When L2 bridge domains with Vhost-User for '2' VMs initialized in a 3-node circular topology
+| | And '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology
+| | Then Find NDR using binary search and pps
+| | ... | ${framesize} | ${binary_min} | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc06-IMIX-1t1c-eth-l2bdbasemaclrn-eth-4vhost-2vm-pdrdisc
 | | [Documentation]
@@ -213,15 +216,15 @@
 | | Set Test Variable | ${dut1_vm_refs}
 | | Set Test Variable | ${dut2_vm_refs}
 | | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | When  L2 bridge domains with Vhost-User for '2' VMs initialized in a 3-node circular topology
-| | And   '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology
-| | Then  Find PDR using binary search and pps
-| | ...   | ${framesize} | ${binary_min} | ${binary_max} | 3-node-bridge
-| | ...   | ${min_rate} | ${max_rate} | ${threshold}
-| | ...   | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | When L2 bridge domains with Vhost-User for '2' VMs initialized in a 3-node circular topology
+| | And '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology
+| | 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}
 
 | tc07-64B-2t2c-eth-l2bdbasemaclrn-eth-4vhost-2vm-ndrdisc
 | | [Documentation]
@@ -240,14 +243,14 @@
 | | Set Test Variable | ${dut1_vm_refs}
 | | Set Test Variable | ${dut2_vm_refs}
 | | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | When  L2 bridge domains with Vhost-User for '2' VMs initialized in a 3-node circular topology
-| | And   '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology
-| | Then  Find NDR using binary search and pps
-| | ...   | ${framesize} | ${binary_min} | ${binary_max} | 3-node-bridge
-| | ...   | ${min_rate} | ${max_rate} | ${threshold}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | When L2 bridge domains with Vhost-User for '2' VMs initialized in a 3-node circular topology
+| | And '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology
+| | Then Find NDR using binary search and pps
+| | ... | ${framesize} | ${binary_min} | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc08-64B-2t2c-eth-l2bdbasemaclrn-eth-4vhost-2vm-pdrdisc
 | | [Documentation]
@@ -266,15 +269,15 @@
 | | Set Test Variable | ${dut1_vm_refs}
 | | Set Test Variable | ${dut2_vm_refs}
 | | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | When  L2 bridge domains with Vhost-User for '2' VMs initialized in a 3-node circular topology
-| | And   '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology
-| | Then  Find PDR using binary search and pps
-| | ...   | ${framesize} | ${binary_min} | ${binary_max} | 3-node-bridge
-| | ...   | ${min_rate} | ${max_rate} | ${threshold}
-| | ...   | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | When L2 bridge domains with Vhost-User for '2' VMs initialized in a 3-node circular topology
+| | And '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology
+| | 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}
 
 | tc09-1518B-2t2c-eth-l2bdbasemaclrn-eth-4vhost-2vm-ndrdisc
 | | [Documentation]
@@ -293,14 +296,14 @@
 | | Set Test Variable | ${dut1_vm_refs}
 | | Set Test Variable | ${dut2_vm_refs}
 | | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | When  L2 bridge domains with Vhost-User for '2' VMs initialized in a 3-node circular topology
-| | And   '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology
-| | Then  Find NDR using binary search and pps
-| | ...   | ${framesize} | ${binary_min} | ${binary_max} | 3-node-bridge
-| | ...   | ${min_rate} | ${max_rate} | ${threshold}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | When L2 bridge domains with Vhost-User for '2' VMs initialized in a 3-node circular topology
+| | And '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology
+| | Then Find NDR using binary search and pps
+| | ... | ${framesize} | ${binary_min} | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc10-1518B-2t2c-eth-l2bdbasemaclrn-eth-4vhost-2vm-pdrdisc
 | | [Documentation]
@@ -319,15 +322,15 @@
 | | Set Test Variable | ${dut1_vm_refs}
 | | Set Test Variable | ${dut2_vm_refs}
 | | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | When  L2 bridge domains with Vhost-User for '2' VMs initialized in a 3-node circular topology
-| | And   '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology
-| | Then  Find PDR using binary search and pps
-| | ...   | ${framesize} | ${binary_min} | ${binary_max} | 3-node-bridge
-| | ...   | ${min_rate} | ${max_rate} | ${threshold}
-| | ...   | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | When L2 bridge domains with Vhost-User for '2' VMs initialized in a 3-node circular topology
+| | And '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology
+| | 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}
 
 | tc11-IMIX-2t2c-eth-l2bdbasemaclrn-eth-4vhost-2vm-ndrdisc
 | | [Documentation]
@@ -347,14 +350,14 @@
 | | Set Test Variable | ${dut1_vm_refs}
 | | Set Test Variable | ${dut2_vm_refs}
 | | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | When  L2 bridge domains with Vhost-User for '2' VMs initialized in a 3-node circular topology
-| | And   '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology
-| | Then  Find NDR using binary search and pps
-| | ...   | ${framesize} | ${binary_min} | ${binary_max} | 3-node-bridge
-| | ...   | ${min_rate} | ${max_rate} | ${threshold}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | When L2 bridge domains with Vhost-User for '2' VMs initialized in a 3-node circular topology
+| | And '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology
+| | Then Find NDR using binary search and pps
+| | ... | ${framesize} | ${binary_min} | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc12-IMIX-2t2c-eth-l2bdbasemaclrn-eth-4vhost-2vm-pdrdisc
 | | [Documentation]
@@ -374,15 +377,15 @@
 | | Set Test Variable | ${dut1_vm_refs}
 | | Set Test Variable | ${dut2_vm_refs}
 | | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | When  L2 bridge domains with Vhost-User for '2' VMs initialized in a 3-node circular topology
-| | And   '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology
-| | Then  Find PDR using binary search and pps
-| | ...   | ${framesize} | ${binary_min} | ${binary_max} | 3-node-bridge
-| | ...   | ${min_rate} | ${max_rate} | ${threshold}
-| | ...   | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | When L2 bridge domains with Vhost-User for '2' VMs initialized in a 3-node circular topology
+| | And '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology
+| | 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}
 
 | tc13-64B-4t4c-eth-l2bdbasemaclrn-eth-4vhost-2vm-ndrdisc
 | | [Documentation]
@@ -401,14 +404,14 @@
 | | Set Test Variable | ${dut1_vm_refs}
 | | Set Test Variable | ${dut2_vm_refs}
 | | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | When  L2 bridge domains with Vhost-User for '2' VMs initialized in a 3-node circular topology
-| | And   '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology
-| | Then  Find NDR using binary search and pps
-| | ...   | ${framesize} | ${binary_min} | ${binary_max} | 3-node-bridge
-| | ...   | ${min_rate} | ${max_rate} | ${threshold}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | When L2 bridge domains with Vhost-User for '2' VMs initialized in a 3-node circular topology
+| | And '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology
+| | Then Find NDR using binary search and pps
+| | ... | ${framesize} | ${binary_min} | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc14-64B-4t4c-eth-l2bdbasemaclrn-eth-4vhost-2vm-pdrdisc
 | | [Documentation]
@@ -427,15 +430,15 @@
 | | Set Test Variable | ${dut1_vm_refs}
 | | Set Test Variable | ${dut2_vm_refs}
 | | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | When  L2 bridge domains with Vhost-User for '2' VMs initialized in a 3-node circular topology
-| | And   '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology
-| | Then  Find PDR using binary search and pps
-| | ...   | ${framesize} | ${binary_min} | ${binary_max} | 3-node-bridge
-| | ...   | ${min_rate} | ${max_rate} | ${threshold}
-| | ...   | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | When L2 bridge domains with Vhost-User for '2' VMs initialized in a 3-node circular topology
+| | And '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology
+| | 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}
 
 | tc15-1518B-4t4c-eth-l2bdbasemaclrn-eth-4vhost-2vm-ndrdisc
 | | [Documentation]
@@ -454,14 +457,14 @@
 | | Set Test Variable | ${dut1_vm_refs}
 | | Set Test Variable | ${dut2_vm_refs}
 | | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | When  L2 bridge domains with Vhost-User for '2' VMs initialized in a 3-node circular topology
-| | And   '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology
-| | Then  Find NDR using binary search and pps
-| | ...   | ${framesize} | ${binary_min} | ${binary_max} | 3-node-bridge
-| | ...   | ${min_rate} | ${max_rate} | ${threshold}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | When L2 bridge domains with Vhost-User for '2' VMs initialized in a 3-node circular topology
+| | And '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology
+| | Then Find NDR using binary search and pps
+| | ... | ${framesize} | ${binary_min} | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc16-1518B-4t4c-eth-l2bdbasemaclrn-eth-4vhost-2vm-pdrdisc
 | | [Documentation]
@@ -480,15 +483,15 @@
 | | Set Test Variable | ${dut1_vm_refs}
 | | Set Test Variable | ${dut2_vm_refs}
 | | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | When  L2 bridge domains with Vhost-User for '2' VMs initialized in a 3-node circular topology
-| | And   '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology
-| | Then  Find PDR using binary search and pps
-| | ...   | ${framesize} | ${binary_min} | ${binary_max} | 3-node-bridge
-| | ...   | ${min_rate} | ${max_rate} | ${threshold}
-| | ...   | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | When L2 bridge domains with Vhost-User for '2' VMs initialized in a 3-node circular topology
+| | And '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology
+| | 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}
 
 | tc17-IMIX-4t4c-eth-l2bdbasemaclrn-eth-4vhost-2vm-ndrdisc
 | | [Documentation]
@@ -508,14 +511,14 @@
 | | Set Test Variable | ${dut1_vm_refs}
 | | Set Test Variable | ${dut2_vm_refs}
 | | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | When  L2 bridge domains with Vhost-User for '2' VMs initialized in a 3-node circular topology
-| | And   '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology
-| | Then  Find NDR using binary search and pps
-| | ...   | ${framesize} | ${binary_min} | ${binary_max} | 3-node-bridge
-| | ...   | ${min_rate} | ${max_rate} | ${threshold}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | When L2 bridge domains with Vhost-User for '2' VMs initialized in a 3-node circular topology
+| | And '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology
+| | Then Find NDR using binary search and pps
+| | ... | ${framesize} | ${binary_min} | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc18-IMIX-4t4c-eth-l2bdbasemaclrn-eth-4vhost-2vm-pdrdisc
 | | [Documentation]
@@ -535,12 +538,12 @@
 | | Set Test Variable | ${dut1_vm_refs}
 | | Set Test Variable | ${dut2_vm_refs}
 | | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | When  L2 bridge domains with Vhost-User for '2' VMs initialized in a 3-node circular topology
-| | And   '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology
-| | Then  Find PDR using binary search and pps
-| | ...   | ${framesize} | ${binary_min} | ${binary_max} | 3-node-bridge
-| | ...   | ${min_rate} | ${max_rate} | ${threshold}
-| | ...   | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | When L2 bridge domains with Vhost-User for '2' VMs initialized in a 3-node circular topology
+| | And '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology
+| | 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}
diff --git a/tests/perf/10ge2p1x520-eth-l2bdbasemaclrn-ndrchk.robot b/tests/perf/10ge2p1x520-eth-l2bdbasemaclrn-ndrchk.robot
index d77674d898..df91ca58df 100644
--- a/tests/perf/10ge2p1x520-eth-l2bdbasemaclrn-ndrchk.robot
+++ b/tests/perf/10ge2p1x520-eth-l2bdbasemaclrn-ndrchk.robot
@@ -45,6 +45,10 @@
 | ... | TG node interfaces.
 | ... | *[Ref] Applicable standard specifications:* RFC2544.
 
+*** Variables ***
+# Traffic profile:
+| ${traffic_profile} | trex-sl-3n-ethip4-ip4src254
+
 *** Test Cases ***
 | tc01-64B-1t1c-eth-l2bdbasemaclrn-ndrchk
 | | [Documentation]
@@ -60,7 +64,7 @@
 | | 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 | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | 3-node-bridge
+| | ... | ${framesize} | ${traffic_profile}
 
 | tc02-1518B-1t1c-eth-l2bdbasemaclrn-ndrchk
 | | [Documentation]
@@ -76,7 +80,7 @@
 | | 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 | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | 3-node-bridge
+| | ... | ${framesize} | ${traffic_profile}
 
 | tc03-9000B-1t1c-eth-l2bdbasemaclrn-ndrchk
 | | [Documentation]
@@ -91,7 +95,7 @@
 | | 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 | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | 3-node-bridge
+| | ... | ${framesize} | ${traffic_profile}
 
 | tc04-64B-2t2c-eth-l2bdbasemaclrn-ndrchk
 | | [Documentation]
@@ -107,7 +111,7 @@
 | | 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 | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | 3-node-bridge
+| | ... | ${framesize} | ${traffic_profile}
 
 | tc05-1518B-2t2c-eth-l2bdbasemaclrn-ndrchk
 | | [Documentation]
@@ -123,7 +127,7 @@
 | | 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 | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | 3-node-bridge
+| | ... | ${framesize} | ${traffic_profile}
 
 | tc06-9000B-2t2c-eth-l2bdbasemaclrn-ndrchk
 | | [Documentation]
@@ -138,7 +142,7 @@
 | | 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 | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | 3-node-bridge
+| | ... | ${framesize} | ${traffic_profile}
 
 | tc07-64B-4t4c-eth-l2bdbasemaclrn-ndrchk
 | | [Documentation]
@@ -154,7 +158,7 @@
 | | 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 | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | 3-node-bridge
+| | ... | ${framesize} | ${traffic_profile}
 
 | tc08-1518B-4t4c-eth-l2bdbasemaclrn-ndrchk
 | | [Documentation]
@@ -170,7 +174,7 @@
 | | 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 | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | 3-node-bridge
+| | ... | ${framesize} | ${traffic_profile}
 
 | tc09-9000B-4t4c-eth-l2bdbasemaclrn-ndrchk
 | | [Documentation]
@@ -185,4 +189,4 @@
 | | 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 | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | 3-node-bridge
+| | ... | ${framesize} | ${traffic_profile}
diff --git a/tests/perf/10ge2p1x520-eth-l2bdbasemaclrn-ndrpdrdisc.robot b/tests/perf/10ge2p1x520-eth-l2bdbasemaclrn-ndrpdrdisc.robot
index f36903acb9..7372905ecf 100644
--- a/tests/perf/10ge2p1x520-eth-l2bdbasemaclrn-ndrpdrdisc.robot
+++ b/tests/perf/10ge2p1x520-eth-l2bdbasemaclrn-ndrpdrdisc.robot
@@ -23,7 +23,7 @@
 | ...
 | Test Setup | Performance test setup
 | Test Teardown | Performance test teardown | ${min_rate}pps | ${framesize}
-| ... | 3-node-bridge
+| ... | ${traffic_profile}
 | ...
 | Documentation | *RFC2544: Pkt throughput L2BD test cases*
 | ...
@@ -50,6 +50,8 @@
 *** Variables ***
 # X520-DA2 bandwidth limit
 | ${s_limit} | ${10000000000}
+# Traffic profile:
+| ${traffic_profile} | trex-sl-3n-ethip4-ip4src254
 
 *** Keywords ***
 | L2 Bridge Domain NDR Binary Search
@@ -67,7 +69,7 @@
 | | Apply startup configuration on all VPP DUTs
 | | L2 bridge domain initialized in a 3-node circular topology
 | | Find NDR using binary search and pps
-| | ... | ${framesize} | ${binary_min} | ${binary_max} | 3-node-bridge
+| | ... | ${framesize} | ${binary_min} | ${binary_max} | ${traffic_profile}
 | | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | L2 Bridge Domain PDR Binary Search
@@ -85,7 +87,7 @@
 | | Apply startup configuration on all VPP DUTs
 | | L2 bridge domain initialized in a 3-node circular topology
 | | Find PDR using binary search and pps
-| | ... | ${framesize} | ${binary_min} | ${binary_max} | 3-node-bridge
+| | ... | ${framesize} | ${binary_min} | ${binary_max} | ${traffic_profile}
 | | ... | ${min_rate} | ${max_rate} | ${threshold}
 | | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
 
diff --git a/tests/perf/10ge2p1x520-eth-l2xcbase-eth-2vhost-1vm-ndrpdrdisc.robot b/tests/perf/10ge2p1x520-eth-l2xcbase-eth-2vhost-1vm-ndrpdrdisc.robot
index 3578451cb1..a4054a0278 100644
--- a/tests/perf/10ge2p1x520-eth-l2xcbase-eth-2vhost-1vm-ndrpdrdisc.robot
+++ b/tests/perf/10ge2p1x520-eth-l2xcbase-eth-2vhost-1vm-ndrpdrdisc.robot
@@ -24,7 +24,7 @@
 | ...
 | Test Setup | Performance test setup
 | Test Teardown | Performance test with vhost and VM with dpdk-testpmd teardown
-| ... | ${min_rate}pps | ${framesize} | 3-node-xconnect
+| ... | ${min_rate}pps | ${framesize} | ${traffic_profile}
 | ... | dut1_node=${dut1} | dut1_vm_refs=${dut1_vm_refs}
 | ... | dut2_node=${dut2} | dut2_vm_refs=${dut2_vm_refs}
 | ...
@@ -61,7 +61,8 @@
 | ${sock2}= | /tmp/sock-1-${bd_id2}
 # X520-DA2 bandwidth limit
 | ${s_limit} | ${10000000000}
-
+# Traffic profile:
+| ${traffic_profile} | trex-sl-3n-ethip4-ip4src254
 
 *** Test Cases ***
 | tc01-64B-1t1c-eth-l2xcbase-eth-2vhost-1vm-ndrdisc
@@ -79,21 +80,20 @@
 | | ${dut1_vm_refs}= | Create Dictionary
 | | ${dut2_vm_refs}= | Create Dictionary
 | | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | When  L2 xconnect with Vhost-User initialized in a 3-node circular topology
-| | ...   | ${sock1} | ${sock2}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | When L2 xconnect with Vhost-User initialized in a 3-node circular topology
+| | ... | ${sock1} | ${sock2}
 | | ${vm1}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
-| | ...     | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1
+| | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1
 | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1}
 | | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
-| | ...     | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
+| | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-xconnect
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc02-64B-1t1c-eth-l2xcbase-eth-2vhost-1vm-pdrdisc
 | | [Documentation]
@@ -110,23 +110,21 @@
 | | ${dut1_vm_refs}= | Create Dictionary
 | | ${dut2_vm_refs}= | Create Dictionary
 | | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | When  L2 xconnect with Vhost-User initialized in a 3-node circular topology
-| | ...   | ${sock1} | ${sock2}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | When L2 xconnect with Vhost-User initialized in a 3-node circular topology
+| | ... | ${sock1} | ${sock2}
 | | ${vm1}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
-| | ...     | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1
+| | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1
 | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1}
 | | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
-| | ...     | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
+| | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-xconnect
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
-| | ...                                       | ${perf_pdr_loss_acceptance}
-| | ...                                       | ${perf_pdr_loss_acceptance_type}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
+| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
 
 | tc03-1518B-1t1c-eth-l2xcbase-eth-2vhost-1vm-ndrdisc
 | | [Documentation]
@@ -143,21 +141,20 @@
 | | ${dut1_vm_refs}= | Create Dictionary
 | | ${dut2_vm_refs}= | Create Dictionary
 | | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | When  L2 xconnect with Vhost-User initialized in a 3-node circular topology
-| | ...   | ${sock1} | ${sock2}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | When L2 xconnect with Vhost-User initialized in a 3-node circular topology
+| | ... | ${sock1} | ${sock2}
 | | ${vm1}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
-| | ...     | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1
+| | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1
 | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1}
 | | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
-| | ...     | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
+| | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-xconnect
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc04-1518B-1t1c-eth-l2xcbase-eth-2vhost-1vm-pdrdisc
 | | [Documentation]
@@ -174,23 +171,21 @@
 | | ${dut1_vm_refs}= | Create Dictionary
 | | ${dut2_vm_refs}= | Create Dictionary
 | | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | When  L2 xconnect with Vhost-User initialized in a 3-node circular topology
-| | ...   | ${sock1} | ${sock2}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | When L2 xconnect with Vhost-User initialized in a 3-node circular topology
+| | ... | ${sock1} | ${sock2}
 | | ${vm1}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
-| | ...     | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1
+| | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1
 | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1}
 | | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
-| | ...     | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
+| | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-xconnect
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
-| | ...                                       | ${perf_pdr_loss_acceptance}
-| | ...                                       | ${perf_pdr_loss_acceptance_type}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
+| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
 
 | tc05-IMIX-1t1c-eth-l2xcbase-eth-2vhost-1vm-ndrdisc
 | | [Documentation]
@@ -208,21 +203,20 @@
 | | ${dut1_vm_refs}= | Create Dictionary
 | | ${dut2_vm_refs}= | Create Dictionary
 | | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | When  L2 xconnect with Vhost-User initialized in a 3-node circular topology
-| | ...   | ${sock1} | ${sock2}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | When L2 xconnect with Vhost-User initialized in a 3-node circular topology
+| | ... | ${sock1} | ${sock2}
 | | ${vm1}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
-| | ...     | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1
+| | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1
 | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1}
 | | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
-| | ...     | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
+| | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-xconnect
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc06-IMIX-1t1c-eth-l2xcbase-eth-2vhost-1vm-pdrdisc
 | | [Documentation]
@@ -240,23 +234,21 @@
 | | ${dut1_vm_refs}= | Create Dictionary
 | | ${dut2_vm_refs}= | Create Dictionary
 | | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | When  L2 xconnect with Vhost-User initialized in a 3-node circular topology
-| | ...   | ${sock1} | ${sock2}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | When L2 xconnect with Vhost-User initialized in a 3-node circular topology
+| | ... | ${sock1} | ${sock2}
 | | ${vm1}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
-| | ...     | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1
+| | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1
 | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1}
 | | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
-| | ...     | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
+| | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-xconnect
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
-| | ...                                       | ${perf_pdr_loss_acceptance}
-| | ...                                       | ${perf_pdr_loss_acceptance_type}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
+| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
 
 | tc07-64B-2t2c-eth-l2xcbase-eth-2vhost-1vm-ndrdisc
 | | [Documentation]
@@ -273,21 +265,20 @@
 | | ${dut1_vm_refs}= | Create Dictionary
 | | ${dut2_vm_refs}= | Create Dictionary
 | | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | When  L2 xconnect with Vhost-User initialized in a 3-node circular topology
-| | ...   | ${sock1} | ${sock2}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | When L2 xconnect with Vhost-User initialized in a 3-node circular topology
+| | ... | ${sock1} | ${sock2}
 | | ${vm1}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
-| | ...     | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1
+| | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1
 | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1}
 | | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
-| | ...     | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
+| | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-xconnect
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc08-64B-2t2c-eth-l2xcbase-eth-2vhost-1vm-pdrdisc
 | | [Documentation]
@@ -304,23 +295,21 @@
 | | ${dut1_vm_refs}= | Create Dictionary
 | | ${dut2_vm_refs}= | Create Dictionary
 | | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | When  L2 xconnect with Vhost-User initialized in a 3-node circular topology
-| | ...   | ${sock1} | ${sock2}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | When L2 xconnect with Vhost-User initialized in a 3-node circular topology
+| | ... | ${sock1} | ${sock2}
 | | ${vm1}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
-| | ...     | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1
+| | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1
 | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1}
 | | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
-| | ...     | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
+| | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-xconnect
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
-| | ...                                       | ${perf_pdr_loss_acceptance}
-| | ...                                       | ${perf_pdr_loss_acceptance_type}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
+| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
 
 | tc09-1518B-2t2c-eth-l2xcbase-eth-2vhost-1vm-ndrdisc
 | | [Documentation]
@@ -337,21 +326,20 @@
 | | ${dut1_vm_refs}= | Create Dictionary
 | | ${dut2_vm_refs}= | Create Dictionary
 | | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | When  L2 xconnect with Vhost-User initialized in a 3-node circular topology
-| | ...   | ${sock1} | ${sock2}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | When L2 xconnect with Vhost-User initialized in a 3-node circular topology
+| | ... | ${sock1} | ${sock2}
 | | ${vm1}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
-| | ...     | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1
+| | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1
 | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1}
 | | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
-| | ...     | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
+| | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-xconnect
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc10-1518B-2t2c-eth-l2xcbase-eth-2vhost-1vm-pdrdisc
 | | [Documentation]
@@ -368,23 +356,21 @@
 | | ${dut1_vm_refs}= | Create Dictionary
 | | ${dut2_vm_refs}= | Create Dictionary
 | | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | When  L2 xconnect with Vhost-User initialized in a 3-node circular topology
-| | ...   | ${sock1} | ${sock2}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | When L2 xconnect with Vhost-User initialized in a 3-node circular topology
+| | ... | ${sock1} | ${sock2}
 | | ${vm1}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
-| | ...     | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1
+| | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1
 | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1}
 | | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
-| | ...     | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
+| | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-xconnect
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
-| | ...                                       | ${perf_pdr_loss_acceptance}
-| | ...                                       | ${perf_pdr_loss_acceptance_type}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
+| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
 
 | tc11-IMIX-2t2c-eth-l2xcbase-eth-2vhost-1vm-ndrdisc
 | | [Documentation]
@@ -402,21 +388,20 @@
 | | ${dut1_vm_refs}= | Create Dictionary
 | | ${dut2_vm_refs}= | Create Dictionary
 | | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | When  L2 xconnect with Vhost-User initialized in a 3-node circular topology
-| | ...   | ${sock1} | ${sock2}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | When L2 xconnect with Vhost-User initialized in a 3-node circular topology
+| | ... | ${sock1} | ${sock2}
 | | ${vm1}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
-| | ...     | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1
+| | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1
 | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1}
 | | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
-| | ...     | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
+| | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-xconnect
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc12-IMIX-2t2c-eth-l2xcbase-eth-2vhost-1vm-pdrdisc
 | | [Documentation]
@@ -434,23 +419,21 @@
 | | ${dut1_vm_refs}= | Create Dictionary
 | | ${dut2_vm_refs}= | Create Dictionary
 | | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | When  L2 xconnect with Vhost-User initialized in a 3-node circular topology
-| | ...   | ${sock1} | ${sock2}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | When L2 xconnect with Vhost-User initialized in a 3-node circular topology
+| | ... | ${sock1} | ${sock2}
 | | ${vm1}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
-| | ...     | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1
+| | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1
 | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1}
 | | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
-| | ...     | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
+| | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-xconnect
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
-| | ...                                       | ${perf_pdr_loss_acceptance}
-| | ...                                       | ${perf_pdr_loss_acceptance_type}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
+| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
 
 | tc13-64B-4t4c-eth-l2xcbase-eth-2vhost-1vm-ndrdisc
 | | [Documentation]
@@ -467,21 +450,20 @@
 | | ${dut1_vm_refs}= | Create Dictionary
 | | ${dut2_vm_refs}= | Create Dictionary
 | | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | When  L2 xconnect with Vhost-User initialized in a 3-node circular topology
-| | ...   | ${sock1} | ${sock2}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | When L2 xconnect with Vhost-User initialized in a 3-node circular topology
+| | ... | ${sock1} | ${sock2}
 | | ${vm1}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
-| | ...     | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1
+| | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1
 | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1}
 | | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
-| | ...     | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
+| | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-xconnect
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc14-64B-4t4c-eth-l2xcbase-eth-2vhost-1vm-pdrdisc
 | | [Documentation]
@@ -498,23 +480,21 @@
 | | ${dut1_vm_refs}= | Create Dictionary
 | | ${dut2_vm_refs}= | Create Dictionary
 | | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | When  L2 xconnect with Vhost-User initialized in a 3-node circular topology
-| | ...   | ${sock1} | ${sock2}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | When L2 xconnect with Vhost-User initialized in a 3-node circular topology
+| | ... | ${sock1} | ${sock2}
 | | ${vm1}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
-| | ...     | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1
+| | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1
 | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1}
 | | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
-| | ...     | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
+| | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-xconnect
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
-| | ...                                       | ${perf_pdr_loss_acceptance}
-| | ...                                       | ${perf_pdr_loss_acceptance_type}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
+| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
 
 | tc15-1518B-4t4c-eth-l2xcbase-eth-2vhost-1vm-ndrdisc
 | | [Documentation]
@@ -531,21 +511,20 @@
 | | ${dut1_vm_refs}= | Create Dictionary
 | | ${dut2_vm_refs}= | Create Dictionary
 | | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | When  L2 xconnect with Vhost-User initialized in a 3-node circular topology
-| | ...   | ${sock1} | ${sock2}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | When L2 xconnect with Vhost-User initialized in a 3-node circular topology
+| | ... | ${sock1} | ${sock2}
 | | ${vm1}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
-| | ...     | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1
+| | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1
 | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1}
 | | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
-| | ...     | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
+| | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-xconnect
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc16-1518B-4t4c-eth-l2xcbase-eth-2vhost-1vm-pdrdisc
 | | [Documentation]
@@ -562,23 +541,21 @@
 | | ${dut1_vm_refs}= | Create Dictionary
 | | ${dut2_vm_refs}= | Create Dictionary
 | | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | When  L2 xconnect with Vhost-User initialized in a 3-node circular topology
-| | ...   | ${sock1} | ${sock2}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | When L2 xconnect with Vhost-User initialized in a 3-node circular topology
+| | ... | ${sock1} | ${sock2}
 | | ${vm1}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
-| | ...     | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1
+| | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1
 | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1}
 | | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
-| | ...     | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
+| | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-xconnect
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
-| | ...                                       | ${perf_pdr_loss_acceptance}
-| | ...                                       | ${perf_pdr_loss_acceptance_type}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
+| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
 
 | tc17-IMIX-4t4c-eth-l2xcbase-eth-2vhost-1vm-ndrdisc
 | | [Documentation]
@@ -596,21 +573,20 @@
 | | ${dut1_vm_refs}= | Create Dictionary
 | | ${dut2_vm_refs}= | Create Dictionary
 | | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | When  L2 xconnect with Vhost-User initialized in a 3-node circular topology
-| | ...   | ${sock1} | ${sock2}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | When L2 xconnect with Vhost-User initialized in a 3-node circular topology
+| | ... | ${sock1} | ${sock2}
 | | ${vm1}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
-| | ...     | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1
+| | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1
 | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1}
 | | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
-| | ...     | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
+| | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-xconnect
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc18-IMIX-4t4c-eth-l2xcbase-eth-2vhost-1vm-pdrdisc
 | | [Documentation]
@@ -628,20 +604,18 @@
 | | ${dut1_vm_refs}= | Create Dictionary
 | | ${dut2_vm_refs}= | Create Dictionary
 | | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | When  L2 xconnect with Vhost-User initialized in a 3-node circular topology
-| | ...   | ${sock1} | ${sock2}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | When L2 xconnect with Vhost-User initialized in a 3-node circular topology
+| | ... | ${sock1} | ${sock2}
 | | ${vm1}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
-| | ...     | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1
+| | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1
 | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1}
 | | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup
-| | ...     | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
+| | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-xconnect
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
-| | ...                                       | ${perf_pdr_loss_acceptance}
-| | ...                                       | ${perf_pdr_loss_acceptance_type}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
+| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
diff --git a/tests/perf/10ge2p1x520-eth-l2xcbase-eth-4vhost-2vm-ndrpdrdisc.robot b/tests/perf/10ge2p1x520-eth-l2xcbase-eth-4vhost-2vm-ndrpdrdisc.robot
index 0ad1523d89..eeb89fca92 100644
--- a/tests/perf/10ge2p1x520-eth-l2xcbase-eth-4vhost-2vm-ndrpdrdisc.robot
+++ b/tests/perf/10ge2p1x520-eth-l2xcbase-eth-4vhost-2vm-ndrpdrdisc.robot
@@ -24,7 +24,8 @@
 | ...
 | Test Setup | Performance test setup
 | Test Teardown | Performance test with vhost and VM with dpdk-testpmd teardown
-| ... | ${min_rate}pps | ${framesize} | 3-node-xconnect
+| ... | ${min_rate}pps | ${framesize}
+| ... | ${traffic_profile}
 | ... | dut1_node=${dut1} | dut1_vm_refs=${dut1_vm_refs}
 | ... | dut2_node=${dut2} | dut2_vm_refs=${dut2_vm_refs}
 | ...
@@ -61,6 +62,8 @@
 | ${system_cpus}= | ${1}
 | ${vpp_cpus}= | ${5}
 | ${vm_cpus}= | ${5}
+# Traffic profile:
+| ${traffic_profile} | trex-sl-3n-ethip4-ip4src254
 
 *** Test Cases ***
 | tc01-64B-1t1c-eth-l2xcbase-eth-4vhost-2vm-ndrdisc
@@ -80,14 +83,14 @@
 | | Set Test Variable | ${dut1_vm_refs}
 | | Set Test Variable | ${dut2_vm_refs}
 | | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | When  L2 xconnect with Vhost-User for '2' initialized in a 3-node circular topology
-| | And   '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology
-| | Then  Find NDR using binary search and pps
-| | ...   | ${framesize} | ${binary_min} | ${binary_max} | 3-node-xconnect
-| | ...   | ${min_rate} | ${max_rate} | ${threshold}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | When L2 xconnect with Vhost-User for '2' initialized in a 3-node circular topology
+| | And '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology
+| | Then Find NDR using binary search and pps
+| | ... | ${framesize} | ${binary_min} | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc02-64B-1t1c-eth-l2xcbase-eth-4vhost-2vm-pdrdisc
 | | [Documentation]
@@ -106,15 +109,15 @@
 | | Set Test Variable | ${dut1_vm_refs}
 | | Set Test Variable | ${dut2_vm_refs}
 | | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | When  L2 xconnect with Vhost-User for '2' initialized in a 3-node circular topology
-| | And   '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology
-| | Then  Find PDR using binary search and pps
-| | ...   | ${framesize} | ${binary_min} | ${binary_max} | 3-node-xconnect
-| | ...   | ${min_rate} | ${max_rate} | ${threshold}
-| | ...   | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | When L2 xconnect with Vhost-User for '2' initialized in a 3-node circular topology
+| | And '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology
+| | 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}
 
 | tc03-1518B-1t1c-eth-l2xcbase-eth-4vhost-2vm-ndrdisc
 | | [Documentation]
@@ -133,14 +136,14 @@
 | | Set Test Variable | ${dut1_vm_refs}
 | | Set Test Variable | ${dut2_vm_refs}
 | | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | When  L2 xconnect with Vhost-User for '2' initialized in a 3-node circular topology
-| | And   '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology
-| | Then  Find NDR using binary search and pps
-| | ...   | ${framesize} | ${binary_min} | ${binary_max} | 3-node-xconnect
-| | ...   | ${min_rate} | ${max_rate} | ${threshold}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | When L2 xconnect with Vhost-User for '2' initialized in a 3-node circular topology
+| | And '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology
+| | Then Find NDR using binary search and pps
+| | ... | ${framesize} | ${binary_min} | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc04-1518B-1t1c-eth-l2xcbase-eth-4vhost-2vm-pdrdisc
 | | [Documentation]
@@ -159,15 +162,15 @@
 | | Set Test Variable | ${dut1_vm_refs}
 | | Set Test Variable | ${dut2_vm_refs}
 | | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | When  L2 xconnect with Vhost-User for '2' initialized in a 3-node circular topology
-| | And   '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology
-| | Then  Find PDR using binary search and pps
-| | ...   | ${framesize} | ${binary_min} | ${binary_max} | 3-node-xconnect
-| | ...   | ${min_rate} | ${max_rate} | ${threshold}
-| | ...   | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | When L2 xconnect with Vhost-User for '2' initialized in a 3-node circular topology
+| | And '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology
+| | 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}
 
 | tc05-IMIX-1t1c-eth-l2xcbase-eth-4vhost-2vm-ndrdisc
 | | [Documentation]
@@ -187,14 +190,14 @@
 | | Set Test Variable | ${dut1_vm_refs}
 | | Set Test Variable | ${dut2_vm_refs}
 | | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | When  L2 xconnect with Vhost-User for '2' initialized in a 3-node circular topology
-| | And   '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology
-| | Then  Find NDR using binary search and pps
-| | ...   | ${framesize} | ${binary_min} | ${binary_max} | 3-node-xconnect
-| | ...   | ${min_rate} | ${max_rate} | ${threshold}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | When L2 xconnect with Vhost-User for '2' initialized in a 3-node circular topology
+| | And '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology
+| | Then Find NDR using binary search and pps
+| | ... | ${framesize} | ${binary_min} | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc06-IMIX-1t1c-eth-l2xcbase-eth-4vhost-2vm-pdrdisc
 | | [Documentation]
@@ -214,15 +217,15 @@
 | | Set Test Variable | ${dut1_vm_refs}
 | | Set Test Variable | ${dut2_vm_refs}
 | | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | When  L2 xconnect with Vhost-User for '2' initialized in a 3-node circular topology
-| | And   '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology
-| | Then  Find PDR using binary search and pps
-| | ...   | ${framesize} | ${binary_min} | ${binary_max} | 3-node-xconnect
-| | ...   | ${min_rate} | ${max_rate} | ${threshold}
-| | ...   | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | When L2 xconnect with Vhost-User for '2' initialized in a 3-node circular topology
+| | And '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology
+| | 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}
 
 | tc07-64B-2t2c-eth-l2xcbase-eth-4vhost-2vm-ndrdisc
 | | [Documentation]
@@ -241,14 +244,14 @@
 | | Set Test Variable | ${dut1_vm_refs}
 | | Set Test Variable | ${dut2_vm_refs}
 | | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | When  L2 xconnect with Vhost-User for '2' initialized in a 3-node circular topology
-| | And   '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology
-| | Then  Find NDR using binary search and pps
-| | ...   | ${framesize} | ${binary_min} | ${binary_max} | 3-node-xconnect
-| | ...   | ${min_rate} | ${max_rate} | ${threshold}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | When L2 xconnect with Vhost-User for '2' initialized in a 3-node circular topology
+| | And '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology
+| | Then Find NDR using binary search and pps
+| | ... | ${framesize} | ${binary_min} | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc08-64B-2t2c-eth-l2xcbase-eth-4vhost-2vm-pdrdisc
 | | [Documentation]
@@ -267,15 +270,15 @@
 | | Set Test Variable | ${dut1_vm_refs}
 | | Set Test Variable | ${dut2_vm_refs}
 | | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | When  L2 xconnect with Vhost-User for '2' initialized in a 3-node circular topology
-| | And   '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology
-| | Then  Find PDR using binary search and pps
-| | ...   | ${framesize} | ${binary_min} | ${binary_max} | 3-node-xconnect
-| | ...   | ${min_rate} | ${max_rate} | ${threshold}
-| | ...   | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | When L2 xconnect with Vhost-User for '2' initialized in a 3-node circular topology
+| | And '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology
+| | 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}
 
 | tc09-1518B-2t2c-eth-l2xcbase-eth-4vhost-2vm-ndrdisc
 | | [Documentation]
@@ -294,14 +297,14 @@
 | | Set Test Variable | ${dut1_vm_refs}
 | | Set Test Variable | ${dut2_vm_refs}
 | | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | When  L2 xconnect with Vhost-User for '2' initialized in a 3-node circular topology
-| | And   '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology
-| | Then  Find NDR using binary search and pps
-| | ...   | ${framesize} | ${binary_min} | ${binary_max} | 3-node-xconnect
-| | ...   | ${min_rate} | ${max_rate} | ${threshold}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | When L2 xconnect with Vhost-User for '2' initialized in a 3-node circular topology
+| | And '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology
+| | Then Find NDR using binary search and pps
+| | ... | ${framesize} | ${binary_min} | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc10-1518B-2t2c-eth-l2xcbase-eth-4vhost-2vm-pdrdisc
 | | [Documentation]
@@ -320,15 +323,15 @@
 | | Set Test Variable | ${dut1_vm_refs}
 | | Set Test Variable | ${dut2_vm_refs}
 | | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | When  L2 xconnect with Vhost-User for '2' initialized in a 3-node circular topology
-| | And   '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology
-| | Then  Find PDR using binary search and pps
-| | ...   | ${framesize} | ${binary_min} | ${binary_max} | 3-node-xconnect
-| | ...   | ${min_rate} | ${max_rate} | ${threshold}
-| | ...   | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | When L2 xconnect with Vhost-User for '2' initialized in a 3-node circular topology
+| | And '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology
+| | 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}
 
 | tc11-IMIX-2t2c-eth-l2xcbase-eth-4vhost-2vm-ndrdisc
 | | [Documentation]
@@ -348,14 +351,14 @@
 | | Set Test Variable | ${dut1_vm_refs}
 | | Set Test Variable | ${dut2_vm_refs}
 | | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | When  L2 xconnect with Vhost-User for '2' initialized in a 3-node circular topology
-| | And   '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology
-| | Then  Find NDR using binary search and pps
-| | ...   | ${framesize} | ${binary_min} | ${binary_max} | 3-node-xconnect
-| | ...   | ${min_rate} | ${max_rate} | ${threshold}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | When L2 xconnect with Vhost-User for '2' initialized in a 3-node circular topology
+| | And '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology
+| | Then Find NDR using binary search and pps
+| | ... | ${framesize} | ${binary_min} | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc12-IMIX-2t2c-eth-l2xcbase-eth-4vhost-2vm-pdrdisc
 | | [Documentation]
@@ -375,15 +378,15 @@
 | | Set Test Variable | ${dut1_vm_refs}
 | | Set Test Variable | ${dut2_vm_refs}
 | | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | When  L2 xconnect with Vhost-User for '2' initialized in a 3-node circular topology
-| | And   '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology
-| | Then  Find PDR using binary search and pps
-| | ...   | ${framesize} | ${binary_min} | ${binary_max} | 3-node-xconnect
-| | ...   | ${min_rate} | ${max_rate} | ${threshold}
-| | ...   | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | When L2 xconnect with Vhost-User for '2' initialized in a 3-node circular topology
+| | And '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology
+| | 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}
 
 | tc13-64B-4t4c-eth-l2xcbase-eth-4vhost-2vm-ndrdisc
 | | [Documentation]
@@ -402,14 +405,14 @@
 | | Set Test Variable | ${dut1_vm_refs}
 | | Set Test Variable | ${dut2_vm_refs}
 | | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | When  L2 xconnect with Vhost-User for '2' initialized in a 3-node circular topology
-| | And   '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology
-| | Then  Find NDR using binary search and pps
-| | ...   | ${framesize} | ${binary_min} | ${binary_max} | 3-node-xconnect
-| | ...   | ${min_rate} | ${max_rate} | ${threshold}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | When L2 xconnect with Vhost-User for '2' initialized in a 3-node circular topology
+| | And '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology
+| | Then Find NDR using binary search and pps
+| | ... | ${framesize} | ${binary_min} | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc14-64B-4t4c-eth-l2xcbase-eth-4vhost-2vm-pdrdisc
 | | [Documentation]
@@ -428,15 +431,15 @@
 | | Set Test Variable | ${dut1_vm_refs}
 | | Set Test Variable | ${dut2_vm_refs}
 | | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | When  L2 xconnect with Vhost-User for '2' initialized in a 3-node circular topology
-| | And   '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology
-| | Then  Find PDR using binary search and pps
-| | ...   | ${framesize} | ${binary_min} | ${binary_max} | 3-node-xconnect
-| | ...   | ${min_rate} | ${max_rate} | ${threshold}
-| | ...   | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | When L2 xconnect with Vhost-User for '2' initialized in a 3-node circular topology
+| | And '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology
+| | 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}
 
 | tc15-1518B-4t4c-eth-l2xcbase-eth-4vhost-2vm-ndrdisc
 | | [Documentation]
@@ -455,14 +458,14 @@
 | | Set Test Variable | ${dut1_vm_refs}
 | | Set Test Variable | ${dut2_vm_refs}
 | | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | When  L2 xconnect with Vhost-User for '2' initialized in a 3-node circular topology
-| | And   '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology
-| | Then  Find NDR using binary search and pps
-| | ...   | ${framesize} | ${binary_min} | ${binary_max} | 3-node-xconnect
-| | ...   | ${min_rate} | ${max_rate} | ${threshold}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | When L2 xconnect with Vhost-User for '2' initialized in a 3-node circular topology
+| | And '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology
+| | Then Find NDR using binary search and pps
+| | ... | ${framesize} | ${binary_min} | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc16-1518B-4t4c-eth-l2xcbase-eth-4vhost-2vm-pdrdisc
 | | [Documentation]
@@ -481,15 +484,15 @@
 | | Set Test Variable | ${dut1_vm_refs}
 | | Set Test Variable | ${dut2_vm_refs}
 | | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | When  L2 xconnect with Vhost-User for '2' initialized in a 3-node circular topology
-| | And   '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology
-| | Then  Find PDR using binary search and pps
-| | ...   | ${framesize} | ${binary_min} | ${binary_max} | 3-node-xconnect
-| | ...   | ${min_rate} | ${max_rate} | ${threshold}
-| | ...   | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | When L2 xconnect with Vhost-User for '2' initialized in a 3-node circular topology
+| | And '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology
+| | 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}
 
 | tc17-IMIX-4t4c-eth-l2xcbase-eth-4vhost-2vm-ndrdisc
 | | [Documentation]
@@ -509,14 +512,14 @@
 | | Set Test Variable | ${dut1_vm_refs}
 | | Set Test Variable | ${dut2_vm_refs}
 | | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | When  L2 xconnect with Vhost-User for '2' initialized in a 3-node circular topology
-| | And   '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology
-| | Then  Find NDR using binary search and pps
-| | ...   | ${framesize} | ${binary_min} | ${binary_max} | 3-node-xconnect
-| | ...   | ${min_rate} | ${max_rate} | ${threshold}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | When L2 xconnect with Vhost-User for '2' initialized in a 3-node circular topology
+| | And '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology
+| | Then Find NDR using binary search and pps
+| | ... | ${framesize} | ${binary_min} | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc18-IMIX-4t4c-eth-l2xcbase-eth-4vhost-2vm-pdrdisc
 | | [Documentation]
@@ -536,12 +539,12 @@
 | | Set Test Variable | ${dut1_vm_refs}
 | | Set Test Variable | ${dut2_vm_refs}
 | | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | When  L2 xconnect with Vhost-User for '2' initialized in a 3-node circular topology
-| | And   '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology
-| | Then  Find PDR using binary search and pps
-| | ...   | ${framesize} | ${binary_min} | ${binary_max} | 3-node-xconnect
-| | ...   | ${min_rate} | ${max_rate} | ${threshold}
-| | ...   | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | When L2 xconnect with Vhost-User for '2' initialized in a 3-node circular topology
+| | And '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology
+| | 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}
diff --git a/tests/perf/10ge2p1x520-eth-l2xcbase-ndrchk.robot b/tests/perf/10ge2p1x520-eth-l2xcbase-ndrchk.robot
index 0a30226fd4..d571dcc4cc 100644
--- a/tests/perf/10ge2p1x520-eth-l2xcbase-ndrchk.robot
+++ b/tests/perf/10ge2p1x520-eth-l2xcbase-ndrchk.robot
@@ -45,6 +45,10 @@
 | ... | TG node interfaces.
 | ... | *[Ref] Applicable standard specifications:* RFC2544.
 
+*** Variables ***
+# Traffic profile:
+| ${traffic_profile} | trex-sl-3n-ethip4-ip4src254
+
 *** Test Cases ***
 | tc01-64B-1t1c-eth-l2xcbase-ndrchk
 | | [Documentation]
@@ -60,7 +64,7 @@
 | | 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 | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | 3-node-xconnect
+| | ... | ${framesize} | ${traffic_profile}
 
 | tc02-1518B-1t1c-eth-l2xcbase-ndrchk
 | | [Documentation]
@@ -76,7 +80,7 @@
 | | 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 | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | 3-node-xconnect
+| | ... | ${framesize} | ${traffic_profile}
 
 | tc03-9000B-1t1c-eth-l2xcbase-ndrchk
 | | [Documentation]
@@ -91,7 +95,7 @@
 | | 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 | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | 3-node-xconnect
+| | ... | ${framesize} | ${traffic_profile}
 
 | tc04-64B-2t2c-eth-l2xcbase-ndrchk
 | | [Documentation]
@@ -107,7 +111,7 @@
 | | 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 | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | 3-node-xconnect
+| | ... | ${framesize} | ${traffic_profile}
 
 | tc05-1518B-2t2c-eth-l2xcbase-ndrchk
 | | [Documentation]
@@ -123,7 +127,7 @@
 | | 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 | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | 3-node-xconnect
+| | ... | ${framesize} | ${traffic_profile}
 
 | tc06-9000B-2t2c-eth-l2xcbase-ndrchk
 | | [Documentation]
@@ -138,7 +142,7 @@
 | | 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 | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | 3-node-xconnect
+| | ... | ${framesize} | ${traffic_profile}
 
 | tc07-64B-4t4c-eth-l2xcbase-ndrchk
 | | [Documentation]
@@ -154,7 +158,7 @@
 | | 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 | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | 3-node-xconnect
+| | ... | ${framesize} | ${traffic_profile}
 
 | tc08-1518B-4t4c-eth-l2xcbase-ndrchk
 | | [Documentation]
@@ -170,7 +174,7 @@
 | | 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 | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | 3-node-xconnect
+| | ... | ${framesize} | ${traffic_profile}
 
 | tc09-9000B-4t4c-eth-l2xcbase-ndrchk
 | | [Documentation]
@@ -185,4 +189,4 @@
 | | 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 | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | 3-node-xconnect
+| | ... | ${framesize} | ${traffic_profile}
diff --git a/tests/perf/10ge2p1x520-eth-l2xcbase-ndrpdrdisc.robot b/tests/perf/10ge2p1x520-eth-l2xcbase-ndrpdrdisc.robot
index b8a61b501f..ee0d47c1d8 100644
--- a/tests/perf/10ge2p1x520-eth-l2xcbase-ndrpdrdisc.robot
+++ b/tests/perf/10ge2p1x520-eth-l2xcbase-ndrpdrdisc.robot
@@ -25,7 +25,7 @@
 | ...
 | Test Setup | Performance test setup
 | Test Teardown | Performance test teardown | ${min_rate}pps | ${framesize}
-| ... | 3-node-xconnect
+| ... | ${traffic_profile}
 | ...
 | Documentation | *RFC2544: Pkt throughput L2XC test cases*
 | ...
@@ -51,6 +51,8 @@
 *** Variables ***
 # X520-DA2 bandwidth limit
 | ${s_limit} | ${10000000000}
+# Traffic profile:
+| ${traffic_profile} | trex-sl-3n-ethip4-ip4src254
 
 *** Test Cases ***
 | tc01-64B-1t1c-eth-l2xcbase-ndrdisc
@@ -66,14 +68,13 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | 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
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | 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 binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-xconnect
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc02-64B-1t1c-eth-l2xcbase-pdrdisc
 | | [Documentation]
@@ -88,16 +89,14 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | 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
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | 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 PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-xconnect
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
-| | ...                                       | ${perf_pdr_loss_acceptance}
-| | ...                                       | ${perf_pdr_loss_acceptance_type}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
+| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
 
 | tc03-1518B-1t1c-eth-l2xcbase-ndrdisc
 | | [Documentation]
@@ -112,14 +111,13 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | 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
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | 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 binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-xconnect
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc04-1518B-1t1c-eth-l2xcbase-pdrdisc
 | | [Documentation]
@@ -134,16 +132,14 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | 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
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | 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 PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-xconnect
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
-| | ...                                       | ${perf_pdr_loss_acceptance}
-| | ...                                       | ${perf_pdr_loss_acceptance_type}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
+| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
 
 | tc05-9000B-1t1c-eth-l2xcbase-ndrdisc
 | | [Documentation]
@@ -158,13 +154,12 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Apply startup configuration on all VPP DUTs
-| | And   L2 xconnect initialized in a 3-node circular topology
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Apply startup configuration on all VPP DUTs
+| | And L2 xconnect initialized in a 3-node circular topology
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-xconnect
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc06-9000B-1t1c-eth-l2xcbase-pdrdisc
 | | [Documentation]
@@ -179,15 +174,13 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Apply startup configuration on all VPP DUTs
-| | And   L2 xconnect initialized in a 3-node circular topology
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Apply startup configuration on all VPP DUTs
+| | And L2 xconnect initialized in a 3-node circular topology
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-xconnect
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
-| | ...                                       | ${perf_pdr_loss_acceptance}
-| | ...                                       | ${perf_pdr_loss_acceptance_type}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
+| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
 
 | tc07-64B-2t2c-eth-l2xcbase-ndrdisc
 | | [Documentation]
@@ -202,14 +195,13 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | 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
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | 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 binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-xconnect
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc08-64B-2t2c-eth-l2xcbase-pdrdisc
 | | [Documentation]
@@ -224,16 +216,14 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | 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
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | 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 PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-xconnect
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
-| | ...                                       | ${perf_pdr_loss_acceptance}
-| | ...                                       | ${perf_pdr_loss_acceptance_type}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
+| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
 
 | tc09-1518B-2t2c-eth-l2xcbase-ndrdisc
 | | [Documentation]
@@ -248,14 +238,13 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | 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
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | 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 binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-xconnect
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc10-1518B-2t2c-eth-l2xcbase-pdrdisc
 | | [Documentation]
@@ -270,16 +259,14 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | 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
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | 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 PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-xconnect
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
-| | ...                                       | ${perf_pdr_loss_acceptance}
-| | ...                                       | ${perf_pdr_loss_acceptance_type}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
+| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
 
 | tc11-9000B-2t2c-eth-l2xcbase-ndrdisc
 | | [Documentation]
@@ -294,13 +281,12 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Apply startup configuration on all VPP DUTs
-| | And   L2 xconnect initialized in a 3-node circular topology
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Apply startup configuration on all VPP DUTs
+| | And L2 xconnect initialized in a 3-node circular topology
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-xconnect
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc12-9000B-2t2c-eth-l2xcbase-pdrdisc
 | | [Documentation]
@@ -315,15 +301,13 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Apply startup configuration on all VPP DUTs
-| | And   L2 xconnect initialized in a 3-node circular topology
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Apply startup configuration on all VPP DUTs
+| | And L2 xconnect initialized in a 3-node circular topology
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-xconnect
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
-| | ...                                       | ${perf_pdr_loss_acceptance}
-| | ...                                       | ${perf_pdr_loss_acceptance_type}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
+| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
 
 | tc13-64B-4t4c-eth-l2xcbase-ndrdisc
 | | [Documentation]
@@ -338,14 +322,13 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | 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
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | 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 binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-xconnect
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc14-64B-4t4c-eth-l2xcbase-pdrdisc
 | | [Documentation]
@@ -360,16 +343,14 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | 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
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | 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 PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-xconnect
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
-| | ...                                       | ${perf_pdr_loss_acceptance}
-| | ...                                       | ${perf_pdr_loss_acceptance_type}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
+| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
 
 | tc15-1518B-4t4c-eth-l2xcbase-ndrdisc
 | | [Documentation]
@@ -384,14 +365,13 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | 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
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | 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 binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-xconnect
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc16-1518B-4t4c-eth-l2xcbase-pdrdisc
 | | [Documentation]
@@ -406,16 +386,14 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | 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
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | 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 PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-xconnect
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
-| | ...                                       | ${perf_pdr_loss_acceptance}
-| | ...                                       | ${perf_pdr_loss_acceptance_type}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
+| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
 
 | tc17-9000B-4t4c-eth-l2xcbase-ndrdisc
 | | [Documentation]
@@ -430,13 +408,12 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Apply startup configuration on all VPP DUTs
-| | And   L2 xconnect initialized in a 3-node circular topology
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Apply startup configuration on all VPP DUTs
+| | And L2 xconnect initialized in a 3-node circular topology
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-xconnect
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc18-9000B-4t4c-eth-l2xcbase-pdrdisc
 | | [Documentation]
@@ -451,15 +428,13 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Apply startup configuration on all VPP DUTs
-| | And   L2 xconnect initialized in a 3-node circular topology
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Apply startup configuration on all VPP DUTs
+| | And L2 xconnect initialized in a 3-node circular topology
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-xconnect
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
-| | ...                                       | ${perf_pdr_loss_acceptance}
-| | ...                                       | ${perf_pdr_loss_acceptance_type}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
+| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
 
 | tc19-IMIX-1t1c-eth-l2xcbase-ndrdisc
 | | [Documentation]
@@ -475,14 +450,13 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | 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
+| | 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 binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-xconnect
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc20-IMIX-1t1c-eth-l2xcbase-pdrdisc
 | | [Documentation]
@@ -498,13 +472,11 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | 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
+| | 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 PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-xconnect
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
-| | ...                                       | ${perf_pdr_loss_acceptance}
-| | ...                                       | ${perf_pdr_loss_acceptance_type}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
+| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
diff --git a/tests/perf/10ge2p1x520-ethip4-ip4base-copwhtlistbase-ndrchk.robot b/tests/perf/10ge2p1x520-ethip4-ip4base-copwhtlistbase-ndrchk.robot
index d79da18c65..023915cb16 100644
--- a/tests/perf/10ge2p1x520-ethip4-ip4base-copwhtlistbase-ndrchk.robot
+++ b/tests/perf/10ge2p1x520-ethip4-ip4base-copwhtlistbase-ndrchk.robot
@@ -50,6 +50,10 @@
 | ... | TG node interfaces.
 | ... | *[Ref] Applicable standard specifications:* RFC2544.
 
+*** Variables ***
+# Traffic profile:
+| ${traffic_profile} | trex-sl-3n-ethip4-ip4src253
+
 *** Test Cases ***
 | tc01-64B-1t1c-ethip4-ip4base-copwhtlistbase-ndrchk
 | | [Documentation]
@@ -72,7 +76,7 @@
 | | And COP interface enable or disable | ${dut1} | ${dut1_if1} | enable
 | | And COP interface enable or disable | ${dut2} | ${dut2_if2} | enable
 | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv4
+| | ... | ${framesize} | ${traffic_profile}
 
 | tc02-1518B-1t1c-ethip4-ip4base-copwhtlistbase-ndrchk
 | | [Documentation]
@@ -95,7 +99,7 @@
 | | And COP interface enable or disable | ${dut1} | ${dut1_if1} | enable
 | | And COP interface enable or disable | ${dut2} | ${dut2_if2} | enable
 | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv4
+| | ... | ${framesize} | ${traffic_profile}
 
 | tc03-9000B-1t1c-ethip4-ip4base-copwhtlistbase-ndrchk
 | | [Documentation]
@@ -117,7 +121,7 @@
 | | And COP interface enable or disable | ${dut1} | ${dut1_if1} | enable
 | | And COP interface enable or disable | ${dut2} | ${dut2_if2} | enable
 | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv4
+| | ... | ${framesize} | ${traffic_profile}
 
 | tc04-64B-2t2c-ethip4-ip4base-copwhtlistbase-ndrchk
 | | [Documentation]
@@ -140,7 +144,7 @@
 | | And COP interface enable or disable | ${dut1} | ${dut1_if1} | enable
 | | And COP interface enable or disable | ${dut2} | ${dut2_if2} | enable
 | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv4
+| | ... | ${framesize} | ${traffic_profile}
 
 | tc05-1518B-2t2c-ethip4-ip4base-copwhtlistbase-ndrchk
 | | [Documentation]
@@ -163,7 +167,7 @@
 | | And COP interface enable or disable | ${dut1} | ${dut1_if1} | enable
 | | And COP interface enable or disable | ${dut2} | ${dut2_if2} | enable
 | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv4
+| | ... | ${framesize} | ${traffic_profile}
 
 | tc06-9000B-2t2c-ethip4-ip4base-copwhtlistbase-ndrchk
 | | [Documentation]
@@ -185,7 +189,7 @@
 | | And COP interface enable or disable | ${dut1} | ${dut1_if1} | enable
 | | And COP interface enable or disable | ${dut2} | ${dut2_if2} | enable
 | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv4
+| | ... | ${framesize} | ${traffic_profile}
 
 | tc07-64B-4t4c-ethip4-ip4base-copwhtlistbase-ndrchk
 | | [Documentation]
@@ -208,7 +212,7 @@
 | | And COP interface enable or disable | ${dut1} | ${dut1_if1} | enable
 | | And COP interface enable or disable | ${dut2} | ${dut2_if2} | enable
 | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv4
+| | ... | ${framesize} | ${traffic_profile}
 
 | tc08-1518B-4t4c-ethip4-ip4base-copwhtlistbase-ndrchk
 | | [Documentation]
@@ -231,7 +235,7 @@
 | | And COP interface enable or disable | ${dut1} | ${dut1_if1} | enable
 | | And COP interface enable or disable | ${dut2} | ${dut2_if2} | enable
 | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv4
+| | ... | ${framesize} | ${traffic_profile}
 
 | tc09-9000B-4t4c-ethip4-ip4base-copwhtlistbase-ndrchk
 | | [Documentation]
@@ -253,4 +257,4 @@
 | | And COP interface enable or disable | ${dut1} | ${dut1_if1} | enable
 | | And COP interface enable or disable | ${dut2} | ${dut2_if2} | enable
 | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv4
+| | ... | ${framesize} | ${traffic_profile}
diff --git a/tests/perf/10ge2p1x520-ethip4-ip4base-copwhtlistbase-ndrpdrdisc.robot b/tests/perf/10ge2p1x520-ethip4-ip4base-copwhtlistbase-ndrpdrdisc.robot
index bcd9b24842..c1e1a5ad50 100644
--- a/tests/perf/10ge2p1x520-ethip4-ip4base-copwhtlistbase-ndrpdrdisc.robot
+++ b/tests/perf/10ge2p1x520-ethip4-ip4base-copwhtlistbase-ndrpdrdisc.robot
@@ -28,7 +28,7 @@
 | ...
 | Test Setup | Performance test setup
 | Test Teardown | Performance test teardown | ${min_rate}pps | ${framesize}
-| ... | 3-node-IPv4
+| ... | ${traffic_profile}
 | ...
 | Documentation | *RFC2544: Pkt throughput IPv4 whitelist test cases*
 | ...
@@ -56,6 +56,8 @@
 *** Variables ***
 # X520-DA2 bandwidth limit
 | ${s_limit} | ${10000000000}
+# Traffic profile:
+| ${traffic_profile} | trex-sl-3n-ethip4-ip4src253
 
 *** Test Cases ***
 | tc01-64B-1t1c-ethip4-ip4base-copwhtlistbase-ndrdisc
@@ -72,20 +74,19 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | When  IPv4 forwarding initialized in a 3-node circular topology
-| | And   Add fib table | ${dut1} | 10.10.10.0 | 24 | 1 | local
-| | And   Add fib table | ${dut2} | 20.20.20.0 | 24 | 1 | local
-| | And   COP Add whitelist Entry | ${dut1} | ${dut1_if1} | ip4 | 1
-| | And   COP Add whitelist Entry | ${dut2} | ${dut2_if2} | ip4 | 1
-| | And   COP interface enable or disable | ${dut1} | ${dut1_if1} | enable
-| | And   COP interface enable or disable | ${dut2} | ${dut2_if2} | enable
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | When IPv4 forwarding initialized in a 3-node circular topology
+| | And Add fib table | ${dut1} | 10.10.10.0 | 24 | 1 | local
+| | And Add fib table | ${dut2} | 20.20.20.0 | 24 | 1 | local
+| | And COP Add whitelist Entry | ${dut1} | ${dut1_if1} | ip4 | 1
+| | And COP Add whitelist Entry | ${dut2} | ${dut2_if2} | ip4 | 1
+| | And COP interface enable or disable | ${dut1} | ${dut1_if1} | enable
+| | And COP interface enable or disable | ${dut2} | ${dut2_if2} | enable
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-IPv4
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc02-64B-1t1c-ethip4-ip4base-copwhtlistbase-pdrdisc
 | | [Documentation]
@@ -101,22 +102,20 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | When  IPv4 forwarding initialized in a 3-node circular topology
-| | And   Add fib table | ${dut1} | 10.10.10.0 | 24 | 1 | local
-| | And   Add fib table | ${dut2} | 20.20.20.0 | 24 | 1 | local
-| | And   COP Add whitelist Entry | ${dut1} | ${dut1_if1} | ip4 | 1
-| | And   COP Add whitelist Entry | ${dut2} | ${dut2_if2} | ip4 | 1
-| | And   COP interface enable or disable | ${dut1} | ${dut1_if1} | enable
-| | And   COP interface enable or disable | ${dut2} | ${dut2_if2} | enable
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | When IPv4 forwarding initialized in a 3-node circular topology
+| | And Add fib table | ${dut1} | 10.10.10.0 | 24 | 1 | local
+| | And Add fib table | ${dut2} | 20.20.20.0 | 24 | 1 | local
+| | And COP Add whitelist Entry | ${dut1} | ${dut1_if1} | ip4 | 1
+| | And COP Add whitelist Entry | ${dut2} | ${dut2_if2} | ip4 | 1
+| | And COP interface enable or disable | ${dut1} | ${dut1_if1} | enable
+| | And COP interface enable or disable | ${dut2} | ${dut2_if2} | enable
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-IPv4
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
-| | ...                                       | ${perf_pdr_loss_acceptance}
-| | ...                                       | ${perf_pdr_loss_acceptance_type}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
+| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
 
 | tc03-1518B-1t1c-ethip4-ip4base-copwhtlistbase-ndrdisc
 | | [Documentation]
@@ -132,20 +131,19 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | When  IPv4 forwarding initialized in a 3-node circular topology
-| | And   Add fib table | ${dut1} | 10.10.10.0 | 24 | 1 | local
-| | And   Add fib table | ${dut2} | 20.20.20.0 | 24 | 1 | local
-| | And   COP Add whitelist Entry | ${dut1} | ${dut1_if1} | ip4 | 1
-| | And   COP Add whitelist Entry | ${dut2} | ${dut2_if2} | ip4 | 1
-| | And   COP interface enable or disable | ${dut1} | ${dut1_if1} | enable
-| | And   COP interface enable or disable | ${dut2} | ${dut2_if2} | enable
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | When IPv4 forwarding initialized in a 3-node circular topology
+| | And Add fib table | ${dut1} | 10.10.10.0 | 24 | 1 | local
+| | And Add fib table | ${dut2} | 20.20.20.0 | 24 | 1 | local
+| | And COP Add whitelist Entry | ${dut1} | ${dut1_if1} | ip4 | 1
+| | And COP Add whitelist Entry | ${dut2} | ${dut2_if2} | ip4 | 1
+| | And COP interface enable or disable | ${dut1} | ${dut1_if1} | enable
+| | And COP interface enable or disable | ${dut2} | ${dut2_if2} | enable
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-IPv4
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc04-1518B-1t1c-ethip4-ip4base-copwhtlistbase-pdrdisc
 | | [Documentation]
@@ -161,22 +159,20 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | When  IPv4 forwarding initialized in a 3-node circular topology
-| | And   Add fib table | ${dut1} | 10.10.10.0 | 24 | 1 | local
-| | And   Add fib table | ${dut2} | 20.20.20.0 | 24 | 1 | local
-| | And   COP Add whitelist Entry | ${dut1} | ${dut1_if1} | ip4 | 1
-| | And   COP Add whitelist Entry | ${dut2} | ${dut2_if2} | ip4 | 1
-| | And   COP interface enable or disable | ${dut1} | ${dut1_if1} | enable
-| | And   COP interface enable or disable | ${dut2} | ${dut2_if2} | enable
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | When IPv4 forwarding initialized in a 3-node circular topology
+| | And Add fib table | ${dut1} | 10.10.10.0 | 24 | 1 | local
+| | And Add fib table | ${dut2} | 20.20.20.0 | 24 | 1 | local
+| | And COP Add whitelist Entry | ${dut1} | ${dut1_if1} | ip4 | 1
+| | And COP Add whitelist Entry | ${dut2} | ${dut2_if2} | ip4 | 1
+| | And COP interface enable or disable | ${dut1} | ${dut1_if1} | enable
+| | And COP interface enable or disable | ${dut2} | ${dut2_if2} | enable
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-IPv4
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
-| | ...                                       | ${perf_pdr_loss_acceptance}
-| | ...                                       | ${perf_pdr_loss_acceptance_type}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
+| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
 
 | tc05-9000B-1t1c-ethip4-ip4base-copwhtlistbase-ndrdisc
 | | [Documentation]
@@ -192,19 +188,18 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Apply startup configuration on all VPP DUTs
-| | When  IPv4 forwarding initialized in a 3-node circular topology
-| | And   Add fib table | ${dut1} | 10.10.10.0 | 24 | 1 | local
-| | And   Add fib table | ${dut2} | 20.20.20.0 | 24 | 1 | local
-| | And   COP Add whitelist Entry | ${dut1} | ${dut1_if1} | ip4 | 1
-| | And   COP Add whitelist Entry | ${dut2} | ${dut2_if2} | ip4 | 1
-| | And   COP interface enable or disable | ${dut1} | ${dut1_if1} | enable
-| | And   COP interface enable or disable | ${dut2} | ${dut2_if2} | enable
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Apply startup configuration on all VPP DUTs
+| | When IPv4 forwarding initialized in a 3-node circular topology
+| | And Add fib table | ${dut1} | 10.10.10.0 | 24 | 1 | local
+| | And Add fib table | ${dut2} | 20.20.20.0 | 24 | 1 | local
+| | And COP Add whitelist Entry | ${dut1} | ${dut1_if1} | ip4 | 1
+| | And COP Add whitelist Entry | ${dut2} | ${dut2_if2} | ip4 | 1
+| | And COP interface enable or disable | ${dut1} | ${dut1_if1} | enable
+| | And COP interface enable or disable | ${dut2} | ${dut2_if2} | enable
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-IPv4
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc06-9000B-1t1c-ethip4-ip4base-copwhtlistbase-pdrdisc
 | | [Documentation]
@@ -220,21 +215,19 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Apply startup configuration on all VPP DUTs
-| | When  IPv4 forwarding initialized in a 3-node circular topology
-| | And   Add fib table | ${dut1} | 10.10.10.0 | 24 | 1 | local
-| | And   Add fib table | ${dut2} | 20.20.20.0 | 24 | 1 | local
-| | And   COP Add whitelist Entry | ${dut1} | ${dut1_if1} | ip4 | 1
-| | And   COP Add whitelist Entry | ${dut2} | ${dut2_if2} | ip4 | 1
-| | And   COP interface enable or disable | ${dut1} | ${dut1_if1} | enable
-| | And   COP interface enable or disable | ${dut2} | ${dut2_if2} | enable
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Apply startup configuration on all VPP DUTs
+| | When IPv4 forwarding initialized in a 3-node circular topology
+| | And Add fib table | ${dut1} | 10.10.10.0 | 24 | 1 | local
+| | And Add fib table | ${dut2} | 20.20.20.0 | 24 | 1 | local
+| | And COP Add whitelist Entry | ${dut1} | ${dut1_if1} | ip4 | 1
+| | And COP Add whitelist Entry | ${dut2} | ${dut2_if2} | ip4 | 1
+| | And COP interface enable or disable | ${dut1} | ${dut1_if1} | enable
+| | And COP interface enable or disable | ${dut2} | ${dut2_if2} | enable
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-IPv4
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
-| | ...                                       | ${perf_pdr_loss_acceptance}
-| | ...                                       | ${perf_pdr_loss_acceptance_type}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
+| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
 
 | tc07-64B-2t2c-ethip4-ip4base-copwhtlistbase-ndrdisc
 | | [Documentation]
@@ -250,20 +243,19 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | When  IPv4 forwarding initialized in a 3-node circular topology
-| | And   Add fib table | ${dut1} | 10.10.10.0 | 24 | 1 | local
-| | And   Add fib table | ${dut2} | 20.20.20.0 | 24 | 1 | local
-| | And   COP Add whitelist Entry | ${dut1} | ${dut1_if1} | ip4 | 1
-| | And   COP Add whitelist Entry | ${dut2} | ${dut2_if2} | ip4 | 1
-| | And   COP interface enable or disable | ${dut1} | ${dut1_if1} | enable
-| | And   COP interface enable or disable | ${dut2} | ${dut2_if2} | enable
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | When IPv4 forwarding initialized in a 3-node circular topology
+| | And Add fib table | ${dut1} | 10.10.10.0 | 24 | 1 | local
+| | And Add fib table | ${dut2} | 20.20.20.0 | 24 | 1 | local
+| | And COP Add whitelist Entry | ${dut1} | ${dut1_if1} | ip4 | 1
+| | And COP Add whitelist Entry | ${dut2} | ${dut2_if2} | ip4 | 1
+| | And COP interface enable or disable | ${dut1} | ${dut1_if1} | enable
+| | And COP interface enable or disable | ${dut2} | ${dut2_if2} | enable
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-IPv4
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc08-64B-2t2c-ethip4-ip4base-copwhtlistbase-pdrdisc
 | | [Documentation]
@@ -279,22 +271,20 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | When  IPv4 forwarding initialized in a 3-node circular topology
-| | And   Add fib table | ${dut1} | 10.10.10.0 | 24 | 1 | local
-| | And   Add fib table | ${dut2} | 20.20.20.0 | 24 | 1 | local
-| | And   COP Add whitelist Entry | ${dut1} | ${dut1_if1} | ip4 | 1
-| | And   COP Add whitelist Entry | ${dut2} | ${dut2_if2} | ip4 | 1
-| | And   COP interface enable or disable | ${dut1} | ${dut1_if1} | enable
-| | And   COP interface enable or disable | ${dut2} | ${dut2_if2} | enable
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | When IPv4 forwarding initialized in a 3-node circular topology
+| | And Add fib table | ${dut1} | 10.10.10.0 | 24 | 1 | local
+| | And Add fib table | ${dut2} | 20.20.20.0 | 24 | 1 | local
+| | And COP Add whitelist Entry | ${dut1} | ${dut1_if1} | ip4 | 1
+| | And COP Add whitelist Entry | ${dut2} | ${dut2_if2} | ip4 | 1
+| | And COP interface enable or disable | ${dut1} | ${dut1_if1} | enable
+| | And COP interface enable or disable | ${dut2} | ${dut2_if2} | enable
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-IPv4
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
-| | ...                                       | ${perf_pdr_loss_acceptance}
-| | ...                                       | ${perf_pdr_loss_acceptance_type}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
+| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
 
 | tc09-1518B-2t2c-ethip4-ip4base-copwhtlistbase-ndrdisc
 | | [Documentation]
@@ -310,20 +300,19 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | When  IPv4 forwarding initialized in a 3-node circular topology
-| | And   Add fib table | ${dut1} | 10.10.10.0 | 24 | 1 | local
-| | And   Add fib table | ${dut2} | 20.20.20.0 | 24 | 1 | local
-| | And   COP Add whitelist Entry | ${dut1} | ${dut1_if1} | ip4 | 1
-| | And   COP Add whitelist Entry | ${dut2} | ${dut2_if2} | ip4 | 1
-| | And   COP interface enable or disable | ${dut1} | ${dut1_if1} | enable
-| | And   COP interface enable or disable | ${dut2} | ${dut2_if2} | enable
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | When IPv4 forwarding initialized in a 3-node circular topology
+| | And Add fib table | ${dut1} | 10.10.10.0 | 24 | 1 | local
+| | And Add fib table | ${dut2} | 20.20.20.0 | 24 | 1 | local
+| | And COP Add whitelist Entry | ${dut1} | ${dut1_if1} | ip4 | 1
+| | And COP Add whitelist Entry | ${dut2} | ${dut2_if2} | ip4 | 1
+| | And COP interface enable or disable | ${dut1} | ${dut1_if1} | enable
+| | And COP interface enable or disable | ${dut2} | ${dut2_if2} | enable
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-IPv4
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc10-1518B-2t2c-ethip4-ip4base-copwhtlistbase-pdrdisc
 | | [Documentation]
@@ -339,22 +328,20 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | When  IPv4 forwarding initialized in a 3-node circular topology
-| | And   Add fib table | ${dut1} | 10.10.10.0 | 24 | 1 | local
-| | And   Add fib table | ${dut2} | 20.20.20.0 | 24 | 1 | local
-| | And   COP Add whitelist Entry | ${dut1} | ${dut1_if1} | ip4 | 1
-| | And   COP Add whitelist Entry | ${dut2} | ${dut2_if2} | ip4 | 1
-| | And   COP interface enable or disable | ${dut1} | ${dut1_if1} | enable
-| | And   COP interface enable or disable | ${dut2} | ${dut2_if2} | enable
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | When IPv4 forwarding initialized in a 3-node circular topology
+| | And Add fib table | ${dut1} | 10.10.10.0 | 24 | 1 | local
+| | And Add fib table | ${dut2} | 20.20.20.0 | 24 | 1 | local
+| | And COP Add whitelist Entry | ${dut1} | ${dut1_if1} | ip4 | 1
+| | And COP Add whitelist Entry | ${dut2} | ${dut2_if2} | ip4 | 1
+| | And COP interface enable or disable | ${dut1} | ${dut1_if1} | enable
+| | And COP interface enable or disable | ${dut2} | ${dut2_if2} | enable
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-IPv4
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
-| | ...                                       | ${perf_pdr_loss_acceptance}
-| | ...                                       | ${perf_pdr_loss_acceptance_type}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
+| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
 
 | tc11-9000B-2t2c-ethip4-ip4base-copwhtlistbase-ndrdisc
 | | [Documentation]
@@ -370,19 +357,18 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Apply startup configuration on all VPP DUTs
-| | When  IPv4 forwarding initialized in a 3-node circular topology
-| | And   Add fib table | ${dut1} | 10.10.10.0 | 24 | 1 | local
-| | And   Add fib table | ${dut2} | 20.20.20.0 | 24 | 1 | local
-| | And   COP Add whitelist Entry | ${dut1} | ${dut1_if1} | ip4 | 1
-| | And   COP Add whitelist Entry | ${dut2} | ${dut2_if2} | ip4 | 1
-| | And   COP interface enable or disable | ${dut1} | ${dut1_if1} | enable
-| | And   COP interface enable or disable | ${dut2} | ${dut2_if2} | enable
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Apply startup configuration on all VPP DUTs
+| | When IPv4 forwarding initialized in a 3-node circular topology
+| | And Add fib table | ${dut1} | 10.10.10.0 | 24 | 1 | local
+| | And Add fib table | ${dut2} | 20.20.20.0 | 24 | 1 | local
+| | And COP Add whitelist Entry | ${dut1} | ${dut1_if1} | ip4 | 1
+| | And COP Add whitelist Entry | ${dut2} | ${dut2_if2} | ip4 | 1
+| | And COP interface enable or disable | ${dut1} | ${dut1_if1} | enable
+| | And COP interface enable or disable | ${dut2} | ${dut2_if2} | enable
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-IPv4
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc12-9000B-2t2c-ethip4-ip4base-copwhtlistbase-pdrdisc
 | | [Documentation]
@@ -398,21 +384,19 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Apply startup configuration on all VPP DUTs
-| | When  IPv4 forwarding initialized in a 3-node circular topology
-| | And   Add fib table | ${dut1} | 10.10.10.0 | 24 | 1 | local
-| | And   Add fib table | ${dut2} | 20.20.20.0 | 24 | 1 | local
-| | And   COP Add whitelist Entry | ${dut1} | ${dut1_if1} | ip4 | 1
-| | And   COP Add whitelist Entry | ${dut2} | ${dut2_if2} | ip4 | 1
-| | And   COP interface enable or disable | ${dut1} | ${dut1_if1} | enable
-| | And   COP interface enable or disable | ${dut2} | ${dut2_if2} | enable
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Apply startup configuration on all VPP DUTs
+| | When IPv4 forwarding initialized in a 3-node circular topology
+| | And Add fib table | ${dut1} | 10.10.10.0 | 24 | 1 | local
+| | And Add fib table | ${dut2} | 20.20.20.0 | 24 | 1 | local
+| | And COP Add whitelist Entry | ${dut1} | ${dut1_if1} | ip4 | 1
+| | And COP Add whitelist Entry | ${dut2} | ${dut2_if2} | ip4 | 1
+| | And COP interface enable or disable | ${dut1} | ${dut1_if1} | enable
+| | And COP interface enable or disable | ${dut2} | ${dut2_if2} | enable
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-IPv4
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
-| | ...                                       | ${perf_pdr_loss_acceptance}
-| | ...                                       | ${perf_pdr_loss_acceptance_type}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
+| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
 
 | tc13-64B-4t4c-ethip4-ip4base-copwhtlistbase-ndrdisc
 | | [Documentation]
@@ -428,20 +412,19 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | When  IPv4 forwarding initialized in a 3-node circular topology
-| | And   Add fib table | ${dut1} | 10.10.10.0 | 24 | 1 | local
-| | And   Add fib table | ${dut2} | 20.20.20.0 | 24 | 1 | local
-| | And   COP Add whitelist Entry | ${dut1} | ${dut1_if1} | ip4 | 1
-| | And   COP Add whitelist Entry | ${dut2} | ${dut2_if2} | ip4 | 1
-| | And   COP interface enable or disable | ${dut1} | ${dut1_if1} | enable
-| | And   COP interface enable or disable | ${dut2} | ${dut2_if2} | enable
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | When IPv4 forwarding initialized in a 3-node circular topology
+| | And Add fib table | ${dut1} | 10.10.10.0 | 24 | 1 | local
+| | And Add fib table | ${dut2} | 20.20.20.0 | 24 | 1 | local
+| | And COP Add whitelist Entry | ${dut1} | ${dut1_if1} | ip4 | 1
+| | And COP Add whitelist Entry | ${dut2} | ${dut2_if2} | ip4 | 1
+| | And COP interface enable or disable | ${dut1} | ${dut1_if1} | enable
+| | And COP interface enable or disable | ${dut2} | ${dut2_if2} | enable
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-IPv4
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc14-64B-4t4c-ethip4-ip4base-copwhtlistbase-pdrdisc
 | | [Documentation]
@@ -457,22 +440,20 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | When  IPv4 forwarding initialized in a 3-node circular topology
-| | And   Add fib table | ${dut1} | 10.10.10.0 | 24 | 1 | local
-| | And   Add fib table | ${dut2} | 20.20.20.0 | 24 | 1 | local
-| | And   COP Add whitelist Entry | ${dut1} | ${dut1_if1} | ip4 | 1
-| | And   COP Add whitelist Entry | ${dut2} | ${dut2_if2} | ip4 | 1
-| | And   COP interface enable or disable | ${dut1} | ${dut1_if1} | enable
-| | And   COP interface enable or disable | ${dut2} | ${dut2_if2} | enable
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | When IPv4 forwarding initialized in a 3-node circular topology
+| | And Add fib table | ${dut1} | 10.10.10.0 | 24 | 1 | local
+| | And Add fib table | ${dut2} | 20.20.20.0 | 24 | 1 | local
+| | And COP Add whitelist Entry | ${dut1} | ${dut1_if1} | ip4 | 1
+| | And COP Add whitelist Entry | ${dut2} | ${dut2_if2} | ip4 | 1
+| | And COP interface enable or disable | ${dut1} | ${dut1_if1} | enable
+| | And COP interface enable or disable | ${dut2} | ${dut2_if2} | enable
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-IPv4
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
-| | ...                                       | ${perf_pdr_loss_acceptance}
-| | ...                                       | ${perf_pdr_loss_acceptance_type}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
+| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
 
 | tc15-1518B-4t4c-ethip4-ip4base-copwhtlistbase-ndrdisc
 | | [Documentation]
@@ -488,20 +469,19 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | When  IPv4 forwarding initialized in a 3-node circular topology
-| | And   Add fib table | ${dut1} | 10.10.10.0 | 24 | 1 | local
-| | And   Add fib table | ${dut2} | 20.20.20.0 | 24 | 1 | local
-| | And   COP Add whitelist Entry | ${dut1} | ${dut1_if1} | ip4 | 1
-| | And   COP Add whitelist Entry | ${dut2} | ${dut2_if2} | ip4 | 1
-| | And   COP interface enable or disable | ${dut1} | ${dut1_if1} | enable
-| | And   COP interface enable or disable | ${dut2} | ${dut2_if2} | enable
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | When IPv4 forwarding initialized in a 3-node circular topology
+| | And Add fib table | ${dut1} | 10.10.10.0 | 24 | 1 | local
+| | And Add fib table | ${dut2} | 20.20.20.0 | 24 | 1 | local
+| | And COP Add whitelist Entry | ${dut1} | ${dut1_if1} | ip4 | 1
+| | And COP Add whitelist Entry | ${dut2} | ${dut2_if2} | ip4 | 1
+| | And COP interface enable or disable | ${dut1} | ${dut1_if1} | enable
+| | And COP interface enable or disable | ${dut2} | ${dut2_if2} | enable
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-IPv4
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc16-1518B-4t4c-ethip4-ip4base-copwhtlistbase-pdrdisc
 | | [Documentation]
@@ -517,22 +497,20 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | When  IPv4 forwarding initialized in a 3-node circular topology
-| | And   Add fib table | ${dut1} | 10.10.10.0 | 24 | 1 | local
-| | And   Add fib table | ${dut2} | 20.20.20.0 | 24 | 1 | local
-| | And   COP Add whitelist Entry | ${dut1} | ${dut1_if1} | ip4 | 1
-| | And   COP Add whitelist Entry | ${dut2} | ${dut2_if2} | ip4 | 1
-| | And   COP interface enable or disable | ${dut1} | ${dut1_if1} | enable
-| | And   COP interface enable or disable | ${dut2} | ${dut2_if2} | enable
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | When IPv4 forwarding initialized in a 3-node circular topology
+| | And Add fib table | ${dut1} | 10.10.10.0 | 24 | 1 | local
+| | And Add fib table | ${dut2} | 20.20.20.0 | 24 | 1 | local
+| | And COP Add whitelist Entry | ${dut1} | ${dut1_if1} | ip4 | 1
+| | And COP Add whitelist Entry | ${dut2} | ${dut2_if2} | ip4 | 1
+| | And COP interface enable or disable | ${dut1} | ${dut1_if1} | enable
+| | And COP interface enable or disable | ${dut2} | ${dut2_if2} | enable
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-IPv4
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
-| | ...                                       | ${perf_pdr_loss_acceptance}
-| | ...                                       | ${perf_pdr_loss_acceptance_type}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
+| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
 
 | tc17-9000B-4t4c-ethip4-ip4base-copwhtlistbase-ndrdisc
 | | [Documentation]
@@ -548,19 +526,18 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Apply startup configuration on all VPP DUTs
-| | When  IPv4 forwarding initialized in a 3-node circular topology
-| | And   Add fib table | ${dut1} | 10.10.10.0 | 24 | 1 | local
-| | And   Add fib table | ${dut2} | 20.20.20.0 | 24 | 1 | local
-| | And   COP Add whitelist Entry | ${dut1} | ${dut1_if1} | ip4 | 1
-| | And   COP Add whitelist Entry | ${dut2} | ${dut2_if2} | ip4 | 1
-| | And   COP interface enable or disable | ${dut1} | ${dut1_if1} | enable
-| | And   COP interface enable or disable | ${dut2} | ${dut2_if2} | enable
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Apply startup configuration on all VPP DUTs
+| | When IPv4 forwarding initialized in a 3-node circular topology
+| | And Add fib table | ${dut1} | 10.10.10.0 | 24 | 1 | local
+| | And Add fib table | ${dut2} | 20.20.20.0 | 24 | 1 | local
+| | And COP Add whitelist Entry | ${dut1} | ${dut1_if1} | ip4 | 1
+| | And COP Add whitelist Entry | ${dut2} | ${dut2_if2} | ip4 | 1
+| | And COP interface enable or disable | ${dut1} | ${dut1_if1} | enable
+| | And COP interface enable or disable | ${dut2} | ${dut2_if2} | enable
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-IPv4
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc18-9000B-4t4c-ethip4-ip4base-copwhtlistbase-pdrdisc
 | | [Documentation]
@@ -576,18 +553,16 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Apply startup configuration on all VPP DUTs
-| | When  IPv4 forwarding initialized in a 3-node circular topology
-| | And   Add fib table | ${dut1} | 10.10.10.0 | 24 | 1 | local
-| | And   Add fib table | ${dut2} | 20.20.20.0 | 24 | 1 | local
-| | And   COP Add whitelist Entry | ${dut1} | ${dut1_if1} | ip4 | 1
-| | And   COP Add whitelist Entry | ${dut2} | ${dut2_if2} | ip4 | 1
-| | And   COP interface enable or disable | ${dut1} | ${dut1_if1} | enable
-| | And   COP interface enable or disable | ${dut2} | ${dut2_if2} | enable
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Apply startup configuration on all VPP DUTs
+| | When IPv4 forwarding initialized in a 3-node circular topology
+| | And Add fib table | ${dut1} | 10.10.10.0 | 24 | 1 | local
+| | And Add fib table | ${dut2} | 20.20.20.0 | 24 | 1 | local
+| | And COP Add whitelist Entry | ${dut1} | ${dut1_if1} | ip4 | 1
+| | And COP Add whitelist Entry | ${dut2} | ${dut2_if2} | ip4 | 1
+| | And COP interface enable or disable | ${dut1} | ${dut1_if1} | enable
+| | And COP interface enable or disable | ${dut2} | ${dut2_if2} | enable
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-IPv4
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
-| | ...                                       | ${perf_pdr_loss_acceptance}
-| | ...                                       | ${perf_pdr_loss_acceptance_type}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
+| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
diff --git a/tests/perf/10ge2p1x520-ethip4-ip4base-eth-2vhost-1vm-ndrpdrdisc.robot b/tests/perf/10ge2p1x520-ethip4-ip4base-eth-2vhost-1vm-ndrpdrdisc.robot
index 58963a59d9..3bfcf9044f 100644
--- a/tests/perf/10ge2p1x520-ethip4-ip4base-eth-2vhost-1vm-ndrpdrdisc.robot
+++ b/tests/perf/10ge2p1x520-ethip4-ip4base-eth-2vhost-1vm-ndrpdrdisc.robot
@@ -24,7 +24,7 @@
 | ...
 | Test Setup | Performance test setup
 | Test Teardown | Performance test with vhost and VM with dpdk-testpmd teardown
-| ... | ${min_rate}pps | ${framesize} | 3-node-IPv4
+| ... | ${min_rate}pps | ${framesize} | ${traffic_profile}
 | ... | dut1_node=${dut1} | dut1_vm_refs=${dut1_vm_refs}
 | ... | dut2_node=${dut2} | dut2_vm_refs=${dut2_vm_refs}
 | ...
@@ -56,12 +56,14 @@
 | ... | *[Ref] Applicable standard specifications:* RFC2544.
 
 *** Variables ***
-#X520-DA2 bandwidth limit
+# X520-DA2 bandwidth limit
 | ${s_limit} | ${10000000000}
 | ${sock1}= | /tmp/sock-1
 | ${sock2}= | /tmp/sock-2
 | ${fib_table_1}= | 100
 | ${fib_table_2}= | 101
+# Traffic profile:
+| ${traffic_profile} | trex-sl-3n-ethip4-ip4src253
 
 *** Test Cases ***
 | tc01-64B-1t1c-ethip4-ip4base-eth-2vhost-1vm-ndrdisc
@@ -79,23 +81,22 @@
 | | ${dut1_vm_refs}= | Create Dictionary
 | | ${dut2_vm_refs}= | Create Dictionary
 | | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | When  IPv4 forwarding with Vhost initialized in a 3-node circular topology
-| | ...   | ${sock1} | ${sock2}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | When IPv4 forwarding with Vhost initialized in a 3-node circular topology
+| | ... | ${sock1} | ${sock2}
 | | ${vm1}= | And Guest VM with dpdk-testpmd-mac connected via vhost-user is setup
-| | ...     | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1 | ${dut1_vif1_mac}
-| | ...     | ${dut1_vif2_mac}
+| | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1 | ${dut1_vif1_mac}
+| | ... | ${dut1_vif2_mac}
 | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1}
 | | ${vm2}= | And Guest VM with dpdk-testpmd-mac connected via vhost-user is setup
-| | ...     | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | ${dut2_vif1_mac}
-| | ...     | ${dut2_vif2_mac}
+| | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | ${dut2_vif1_mac}
+| | ... | ${dut2_vif2_mac}
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-IPv4
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc02-64B-1t1c-ethip4-ip4base-eth-2vhost-1vm-pdrdisc
 | | [Documentation]
@@ -112,25 +113,23 @@
 | | ${dut1_vm_refs}= | Create Dictionary
 | | ${dut2_vm_refs}= | Create Dictionary
 | | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | When  IPv4 forwarding with Vhost initialized in a 3-node circular topology
-| | ...   | ${sock1} | ${sock2}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | When IPv4 forwarding with Vhost initialized in a 3-node circular topology
+| | ... | ${sock1} | ${sock2}
 | | ${vm1}= | And Guest VM with dpdk-testpmd-mac connected via vhost-user is setup
-| | ...     | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1 | ${dut1_vif1_mac}
-| | ...     | ${dut1_vif2_mac}
+| | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1 | ${dut1_vif1_mac}
+| | ... | ${dut1_vif2_mac}
 | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1}
 | | ${vm2}= | And Guest VM with dpdk-testpmd-mac connected via vhost-user is setup
-| | ...     | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | ${dut2_vif1_mac}
-| | ...     | ${dut2_vif2_mac}
+| | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | ${dut2_vif1_mac}
+| | ... | ${dut2_vif2_mac}
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-IPv4
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
-| | ...                                       | ${perf_pdr_loss_acceptance}
-| | ...                                       | ${perf_pdr_loss_acceptance_type}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
+| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
 
 | tc03-1518B-1t1c-ethip4-ip4base-eth-2vhost-1vm-ndrdisc
 | | [Documentation]
@@ -147,23 +146,22 @@
 | | ${dut1_vm_refs}= | Create Dictionary
 | | ${dut2_vm_refs}= | Create Dictionary
 | | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | When  IPv4 forwarding with Vhost initialized in a 3-node circular topology
-| | ...   | ${sock1} | ${sock2}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | When IPv4 forwarding with Vhost initialized in a 3-node circular topology
+| | ... | ${sock1} | ${sock2}
 | | ${vm1}= | And Guest VM with dpdk-testpmd-mac connected via vhost-user is setup
-| | ...     | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1 | ${dut1_vif1_mac}
-| | ...     | ${dut1_vif2_mac}
+| | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1 | ${dut1_vif1_mac}
+| | ... | ${dut1_vif2_mac}
 | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1}
 | | ${vm2}= | And Guest VM with dpdk-testpmd-mac connected via vhost-user is setup
-| | ...     | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | ${dut2_vif1_mac}
-| | ...     | ${dut2_vif2_mac}
+| | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | ${dut2_vif1_mac}
+| | ... | ${dut2_vif2_mac}
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-IPv4
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc04-1518B-1t1c-ethip4-ip4base-eth-2vhost-1vm-pdrdisc
 | | [Documentation]
@@ -180,25 +178,23 @@
 | | ${dut1_vm_refs}= | Create Dictionary
 | | ${dut2_vm_refs}= | Create Dictionary
 | | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | When  IPv4 forwarding with Vhost initialized in a 3-node circular topology
-| | ...   | ${sock1} | ${sock2}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | When IPv4 forwarding with Vhost initialized in a 3-node circular topology
+| | ... | ${sock1} | ${sock2}
 | | ${vm1}= | And Guest VM with dpdk-testpmd-mac connected via vhost-user is setup
-| | ...     | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1 | ${dut1_vif1_mac}
-| | ...     | ${dut1_vif2_mac}
+| | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1 | ${dut1_vif1_mac}
+| | ... | ${dut1_vif2_mac}
 | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1}
 | | ${vm2}= | And Guest VM with dpdk-testpmd-mac connected via vhost-user is setup
-| | ...     | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | ${dut2_vif1_mac}
-| | ...     | ${dut2_vif2_mac}
+| | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | ${dut2_vif1_mac}
+| | ... | ${dut2_vif2_mac}
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-IPv4
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
-| | ...                                       | ${perf_pdr_loss_acceptance}
-| | ...                                       | ${perf_pdr_loss_acceptance_type}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
+| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
 
 | tc05-IMIX-1t1c-ethip4-ip4base-eth-2vhost-1vm-ndrdisc
 | | [Documentation]
@@ -216,23 +212,22 @@
 | | ${dut1_vm_refs}= | Create Dictionary
 | | ${dut2_vm_refs}= | Create Dictionary
 | | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | When  IPv4 forwarding with Vhost initialized in a 3-node circular topology
-| | ...   | ${sock1} | ${sock2}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | When IPv4 forwarding with Vhost initialized in a 3-node circular topology
+| | ... | ${sock1} | ${sock2}
 | | ${vm1}= | And Guest VM with dpdk-testpmd-mac connected via vhost-user is setup
-| | ...     | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1 | ${dut1_vif1_mac}
-| | ...     | ${dut1_vif2_mac}
+| | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1 | ${dut1_vif1_mac}
+| | ... | ${dut1_vif2_mac}
 | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1}
 | | ${vm2}= | And Guest VM with dpdk-testpmd-mac connected via vhost-user is setup
-| | ...     | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | ${dut2_vif1_mac}
-| | ...     | ${dut2_vif2_mac}
+| | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | ${dut2_vif1_mac}
+| | ... | ${dut2_vif2_mac}
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-IPv4
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc06-IMIX-1t1c-ethip4-ip4base-eth-2vhost-1vm-pdrdisc
 | | [Documentation]
@@ -250,25 +245,23 @@
 | | ${dut1_vm_refs}= | Create Dictionary
 | | ${dut2_vm_refs}= | Create Dictionary
 | | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | When  IPv4 forwarding with Vhost initialized in a 3-node circular topology
-| | ...   | ${sock1} | ${sock2}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | When IPv4 forwarding with Vhost initialized in a 3-node circular topology
+| | ... | ${sock1} | ${sock2}
 | | ${vm1}= | And Guest VM with dpdk-testpmd-mac connected via vhost-user is setup
-| | ...     | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1 | ${dut1_vif1_mac}
-| | ...     | ${dut1_vif2_mac}
+| | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1 | ${dut1_vif1_mac}
+| | ... | ${dut1_vif2_mac}
 | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1}
 | | ${vm2}= | And Guest VM with dpdk-testpmd-mac connected via vhost-user is setup
-| | ...     | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | ${dut2_vif1_mac}
-| | ...     | ${dut2_vif2_mac}
+| | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | ${dut2_vif1_mac}
+| | ... | ${dut2_vif2_mac}
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-IPv4
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
-| | ...                                       | ${perf_pdr_loss_acceptance}
-| | ...                                       | ${perf_pdr_loss_acceptance_type}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
+| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
 
 | tc07-64B-2t2c-ethip4-ip4base-eth-2vhost-1vm-ndrdisc
 | | [Documentation]
@@ -285,23 +278,22 @@
 | | ${dut1_vm_refs}= | Create Dictionary
 | | ${dut2_vm_refs}= | Create Dictionary
 | | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | When  IPv4 forwarding with Vhost initialized in a 3-node circular topology
-| | ...   | ${sock1} | ${sock2}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | When IPv4 forwarding with Vhost initialized in a 3-node circular topology
+| | ... | ${sock1} | ${sock2}
 | | ${vm1}= | And Guest VM with dpdk-testpmd-mac connected via vhost-user is setup
-| | ...     | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1 | ${dut1_vif1_mac}
-| | ...     | ${dut1_vif2_mac}
+| | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1 | ${dut1_vif1_mac}
+| | ... | ${dut1_vif2_mac}
 | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1}
 | | ${vm2}= | And Guest VM with dpdk-testpmd-mac connected via vhost-user is setup
-| | ...     | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | ${dut2_vif1_mac}
-| | ...     | ${dut2_vif2_mac}
+| | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | ${dut2_vif1_mac}
+| | ... | ${dut2_vif2_mac}
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-IPv4
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc08-64B-2t2c-ethip4-ip4base-eth-2vhost-1vm-pdrdisc
 | | [Documentation]
@@ -318,25 +310,23 @@
 | | ${dut1_vm_refs}= | Create Dictionary
 | | ${dut2_vm_refs}= | Create Dictionary
 | | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | When  IPv4 forwarding with Vhost initialized in a 3-node circular topology
-| | ...   | ${sock1} | ${sock2}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | When IPv4 forwarding with Vhost initialized in a 3-node circular topology
+| | ... | ${sock1} | ${sock2}
 | | ${vm1}= | And Guest VM with dpdk-testpmd-mac connected via vhost-user is setup
-| | ...     | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1 | ${dut1_vif1_mac}
-| | ...     | ${dut1_vif2_mac}
+| | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1 | ${dut1_vif1_mac}
+| | ... | ${dut1_vif2_mac}
 | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1}
 | | ${vm2}= | And Guest VM with dpdk-testpmd-mac connected via vhost-user is setup
-| | ...     | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | ${dut2_vif1_mac}
-| | ...     | ${dut2_vif2_mac}
+| | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | ${dut2_vif1_mac}
+| | ... | ${dut2_vif2_mac}
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-IPv4
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
-| | ...                                       | ${perf_pdr_loss_acceptance}
-| | ...                                       | ${perf_pdr_loss_acceptance_type}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
+| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
 
 | tc09-1518B-2t2c-ethip4-ip4base-eth-2vhost-1vm-ndrdisc
 | | [Documentation]
@@ -353,23 +343,22 @@
 | | ${dut1_vm_refs}= | Create Dictionary
 | | ${dut2_vm_refs}= | Create Dictionary
 | | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | When  IPv4 forwarding with Vhost initialized in a 3-node circular topology
-| | ...   | ${sock1} | ${sock2}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | When IPv4 forwarding with Vhost initialized in a 3-node circular topology
+| | ... | ${sock1} | ${sock2}
 | | ${vm1}= | And Guest VM with dpdk-testpmd-mac connected via vhost-user is setup
-| | ...     | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1 | ${dut1_vif1_mac}
-| | ...     | ${dut1_vif2_mac}
+| | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1 | ${dut1_vif1_mac}
+| | ... | ${dut1_vif2_mac}
 | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1}
 | | ${vm2}= | And Guest VM with dpdk-testpmd-mac connected via vhost-user is setup
-| | ...     | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | ${dut2_vif1_mac}
-| | ...     | ${dut2_vif2_mac}
+| | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | ${dut2_vif1_mac}
+| | ... | ${dut2_vif2_mac}
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-IPv4
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc10-1518B-2t2c-ethip4-ip4base-eth-2vhost-1vm-pdrdisc
 | | [Documentation]
@@ -386,25 +375,23 @@
 | | ${dut1_vm_refs}= | Create Dictionary
 | | ${dut2_vm_refs}= | Create Dictionary
 | | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | When  IPv4 forwarding with Vhost initialized in a 3-node circular topology
-| | ...   | ${sock1} | ${sock2}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | When IPv4 forwarding with Vhost initialized in a 3-node circular topology
+| | ... | ${sock1} | ${sock2}
 | | ${vm1}= | And Guest VM with dpdk-testpmd-mac connected via vhost-user is setup
-| | ...     | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1 | ${dut1_vif1_mac}
-| | ...     | ${dut1_vif2_mac}
+| | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1 | ${dut1_vif1_mac}
+| | ... | ${dut1_vif2_mac}
 | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1}
 | | ${vm2}= | And Guest VM with dpdk-testpmd-mac connected via vhost-user is setup
-| | ...     | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | ${dut2_vif1_mac}
-| | ...     | ${dut2_vif2_mac}
+| | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | ${dut2_vif1_mac}
+| | ... | ${dut2_vif2_mac}
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-IPv4
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
-| | ...                                       | ${perf_pdr_loss_acceptance}
-| | ...                                       | ${perf_pdr_loss_acceptance_type}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
+| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
 
 | tc11-IMIX-2t2c-ethip4-ip4base-eth-2vhost-1vm-ndrdisc
 | | [Documentation]
@@ -422,23 +409,22 @@
 | | ${dut1_vm_refs}= | Create Dictionary
 | | ${dut2_vm_refs}= | Create Dictionary
 | | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | When  IPv4 forwarding with Vhost initialized in a 3-node circular topology
-| | ...   | ${sock1} | ${sock2}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | When IPv4 forwarding with Vhost initialized in a 3-node circular topology
+| | ... | ${sock1} | ${sock2}
 | | ${vm1}= | And Guest VM with dpdk-testpmd-mac connected via vhost-user is setup
-| | ...     | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1 | ${dut1_vif1_mac}
-| | ...     | ${dut1_vif2_mac}
+| | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1 | ${dut1_vif1_mac}
+| | ... | ${dut1_vif2_mac}
 | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1}
 | | ${vm2}= | And Guest VM with dpdk-testpmd-mac connected via vhost-user is setup
-| | ...     | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | ${dut2_vif1_mac}
-| | ...     | ${dut2_vif2_mac}
+| | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | ${dut2_vif1_mac}
+| | ... | ${dut2_vif2_mac}
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-IPv4
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc12-IMIX-2t2c-ethip4-ip4base-eth-2vhost-1vm-pdrdisc
 | | [Documentation]
@@ -456,25 +442,23 @@
 | | ${dut1_vm_refs}= | Create Dictionary
 | | ${dut2_vm_refs}= | Create Dictionary
 | | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | When  IPv4 forwarding with Vhost initialized in a 3-node circular topology
-| | ...   | ${sock1} | ${sock2}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | When IPv4 forwarding with Vhost initialized in a 3-node circular topology
+| | ... | ${sock1} | ${sock2}
 | | ${vm1}= | And Guest VM with dpdk-testpmd-mac connected via vhost-user is setup
-| | ...     | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1 | ${dut1_vif1_mac}
-| | ...     | ${dut1_vif2_mac}
+| | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1 | ${dut1_vif1_mac}
+| | ... | ${dut1_vif2_mac}
 | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1}
 | | ${vm2}= | And Guest VM with dpdk-testpmd-mac connected via vhost-user is setup
-| | ...     | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | ${dut2_vif1_mac}
-| | ...     | ${dut2_vif2_mac}
+| | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | ${dut2_vif1_mac}
+| | ... | ${dut2_vif2_mac}
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-IPv4
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
-| | ...                                       | ${perf_pdr_loss_acceptance}
-| | ...                                       | ${perf_pdr_loss_acceptance_type}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
+| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
 
 | tc13-64B-4t4c-ethip4-ip4base-eth-2vhost-1vm-ndrdisc
 | | [Documentation]
@@ -491,23 +475,22 @@
 | | ${dut1_vm_refs}= | Create Dictionary
 | | ${dut2_vm_refs}= | Create Dictionary
 | | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | When  IPv4 forwarding with Vhost initialized in a 3-node circular topology
-| | ...   | ${sock1} | ${sock2}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | When IPv4 forwarding with Vhost initialized in a 3-node circular topology
+| | ... | ${sock1} | ${sock2}
 | | ${vm1}= | And Guest VM with dpdk-testpmd-mac connected via vhost-user is setup
-| | ...     | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1 | ${dut1_vif1_mac}
-| | ...     | ${dut1_vif2_mac}
+| | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1 | ${dut1_vif1_mac}
+| | ... | ${dut1_vif2_mac}
 | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1}
 | | ${vm2}= | And Guest VM with dpdk-testpmd-mac connected via vhost-user is setup
-| | ...     | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | ${dut2_vif1_mac}
-| | ...     | ${dut2_vif2_mac}
+| | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | ${dut2_vif1_mac}
+| | ... | ${dut2_vif2_mac}
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-IPv4
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc14-64B-4t4c-ethip4-ip4base-eth-2vhost-1vm-pdrdisc
 | | [Documentation]
@@ -524,25 +507,23 @@
 | | ${dut1_vm_refs}= | Create Dictionary
 | | ${dut2_vm_refs}= | Create Dictionary
 | | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | When  IPv4 forwarding with Vhost initialized in a 3-node circular topology
-| | ...   | ${sock1} | ${sock2}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | When IPv4 forwarding with Vhost initialized in a 3-node circular topology
+| | ... | ${sock1} | ${sock2}
 | | ${vm1}= | And Guest VM with dpdk-testpmd-mac connected via vhost-user is setup
-| | ...     | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1 | ${dut1_vif1_mac}
-| | ...     | ${dut1_vif2_mac}
+| | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1 | ${dut1_vif1_mac}
+| | ... | ${dut1_vif2_mac}
 | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1}
 | | ${vm2}= | And Guest VM with dpdk-testpmd-mac connected via vhost-user is setup
-| | ...     | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | ${dut2_vif1_mac}
-| | ...     | ${dut2_vif2_mac}
+| | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | ${dut2_vif1_mac}
+| | ... | ${dut2_vif2_mac}
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-IPv4
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
-| | ...                                       | ${perf_pdr_loss_acceptance}
-| | ...                                       | ${perf_pdr_loss_acceptance_type}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
+| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
 
 | tc15-1518B-4t4c-ethip4-ip4base-eth-2vhost-1vm-ndrdisc
 | | [Documentation]
@@ -559,23 +540,22 @@
 | | ${dut1_vm_refs}= | Create Dictionary
 | | ${dut2_vm_refs}= | Create Dictionary
 | | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | When  IPv4 forwarding with Vhost initialized in a 3-node circular topology
-| | ...   | ${sock1} | ${sock2}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | When IPv4 forwarding with Vhost initialized in a 3-node circular topology
+| | ... | ${sock1} | ${sock2}
 | | ${vm1}= | And Guest VM with dpdk-testpmd-mac connected via vhost-user is setup
-| | ...     | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1 | ${dut1_vif1_mac}
-| | ...     | ${dut1_vif2_mac}
+| | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1 | ${dut1_vif1_mac}
+| | ... | ${dut1_vif2_mac}
 | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1}
 | | ${vm2}= | And Guest VM with dpdk-testpmd-mac connected via vhost-user is setup
-| | ...     | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | ${dut2_vif1_mac}
-| | ...     | ${dut2_vif2_mac}
+| | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | ${dut2_vif1_mac}
+| | ... | ${dut2_vif2_mac}
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-IPv4
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc16-1518B-4t4c-ethip4-ip4base-eth-2vhost-1vm-pdrdisc
 | | [Documentation]
@@ -592,25 +572,23 @@
 | | ${dut1_vm_refs}= | Create Dictionary
 | | ${dut2_vm_refs}= | Create Dictionary
 | | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | When  IPv4 forwarding with Vhost initialized in a 3-node circular topology
-| | ...   | ${sock1} | ${sock2}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | When IPv4 forwarding with Vhost initialized in a 3-node circular topology
+| | ... | ${sock1} | ${sock2}
 | | ${vm1}= | And Guest VM with dpdk-testpmd-mac connected via vhost-user is setup
-| | ...     | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1 | ${dut1_vif1_mac}
-| | ...     | ${dut1_vif2_mac}
+| | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1 | ${dut1_vif1_mac}
+| | ... | ${dut1_vif2_mac}
 | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1}
 | | ${vm2}= | And Guest VM with dpdk-testpmd-mac connected via vhost-user is setup
-| | ...     | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | ${dut2_vif1_mac}
-| | ...     | ${dut2_vif2_mac}
+| | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | ${dut2_vif1_mac}
+| | ... | ${dut2_vif2_mac}
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-IPv4
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
-| | ...                                       | ${perf_pdr_loss_acceptance}
-| | ...                                       | ${perf_pdr_loss_acceptance_type}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
+| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
 
 | tc17-IMIX-4t4c-ethip4-ip4base-eth-2vhost-1vm-ndrdisc
 | | [Documentation]
@@ -628,23 +606,22 @@
 | | ${dut1_vm_refs}= | Create Dictionary
 | | ${dut2_vm_refs}= | Create Dictionary
 | | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | When  IPv4 forwarding with Vhost initialized in a 3-node circular topology
-| | ...   | ${sock1} | ${sock2}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | When IPv4 forwarding with Vhost initialized in a 3-node circular topology
+| | ... | ${sock1} | ${sock2}
 | | ${vm1}= | And Guest VM with dpdk-testpmd-mac connected via vhost-user is setup
-| | ...     | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1 | ${dut1_vif1_mac}
-| | ...     | ${dut1_vif2_mac}
+| | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1 | ${dut1_vif1_mac}
+| | ... | ${dut1_vif2_mac}
 | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1}
 | | ${vm2}= | And Guest VM with dpdk-testpmd-mac connected via vhost-user is setup
-| | ...     | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | ${dut2_vif1_mac}
-| | ...     | ${dut2_vif2_mac}
+| | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | ${dut2_vif1_mac}
+| | ... | ${dut2_vif2_mac}
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-IPv4
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc18-IMIX-4t4c-ethip4-ip4base-eth-2vhost-1vm-pdrdisc
 | | [Documentation]
@@ -662,22 +639,20 @@
 | | ${dut1_vm_refs}= | Create Dictionary
 | | ${dut2_vm_refs}= | Create Dictionary
 | | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | When  IPv4 forwarding with Vhost initialized in a 3-node circular topology
-| | ...   | ${sock1} | ${sock2}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | When IPv4 forwarding with Vhost initialized in a 3-node circular topology
+| | ... | ${sock1} | ${sock2}
 | | ${vm1}= | And Guest VM with dpdk-testpmd-mac connected via vhost-user is setup
-| | ...     | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1 | ${dut1_vif1_mac}
-| | ...     | ${dut1_vif2_mac}
+| | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1 | ${dut1_vif1_mac}
+| | ... | ${dut1_vif2_mac}
 | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1}
 | | ${vm2}= | And Guest VM with dpdk-testpmd-mac connected via vhost-user is setup
-| | ...     | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | ${dut2_vif1_mac}
-| | ...     | ${dut2_vif2_mac}
+| | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | ${dut2_vif1_mac}
+| | ... | ${dut2_vif2_mac}
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-IPv4
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
-| | ...                                       | ${perf_pdr_loss_acceptance}
-| | ...                                       | ${perf_pdr_loss_acceptance_type}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
+| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
diff --git a/tests/perf/10ge2p1x520-ethip4-ip4base-eth-4vhost-2vm-ndrpdrdisc.robot b/tests/perf/10ge2p1x520-ethip4-ip4base-eth-4vhost-2vm-ndrpdrdisc.robot
index 29b7e59510..cf26caf1d4 100644
--- a/tests/perf/10ge2p1x520-ethip4-ip4base-eth-4vhost-2vm-ndrpdrdisc.robot
+++ b/tests/perf/10ge2p1x520-ethip4-ip4base-eth-4vhost-2vm-ndrpdrdisc.robot
@@ -24,7 +24,8 @@
 | ...
 | Test Setup | Performance test setup
 | Test Teardown | Performance test with vhost and VM with dpdk-testpmd teardown
-| ... | ${min_rate}pps | ${framesize} | 3-node-IPv4
+| ... | ${min_rate}pps | ${framesize}
+| ... | ${traffic_profile}
 | ... | dut1_node=${dut1} | dut1_vm_refs=${dut1_vm_refs}
 | ... | dut2_node=${dut2} | dut2_vm_refs=${dut2_vm_refs}
 | ...
@@ -56,12 +57,14 @@
 | ... | *[Ref] Applicable standard specifications:* RFC2544.
 
 *** Variables ***
-#X520-DA2 bandwidth limit
+# X520-DA2 bandwidth limit
 | ${s_limit}= | ${10000000000}
-#CPU settings
+# CPU settings
 | ${system_cpus}= | ${1}
 | ${vpp_cpus}= | ${5}
 | ${vm_cpus}= | ${5}
+# Traffic profile:
+| ${traffic_profile} | trex-sl-3n-ethip4-ip4src253
 
 *** Test Cases ***
 | tc01-64B-1t1c-ethip4-ip4base-eth-4vhost-2vm-ndrdisc
@@ -81,14 +84,14 @@
 | | Set Test Variable | ${dut1_vm_refs}
 | | Set Test Variable | ${dut2_vm_refs}
 | | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | When  IPv4 forwarding with Vhost-User for '2' VMs initialized in a 3-node circular topology
-| | And   '2' Guest VMs with dpdk-testpmd-mac connected via vhost-user is setup in a 3-node circular topology
-| | Then  Find NDR using binary search and pps
-| | ...   | ${framesize} | ${binary_min} | ${binary_max} | 3-node-IPv4
-| | ...   | ${min_rate} | ${max_rate} | ${threshold}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | When IPv4 forwarding with Vhost-User for '2' VMs initialized in a 3-node circular topology
+| | And '2' Guest VMs with dpdk-testpmd-mac connected via vhost-user is setup in a 3-node circular topology
+| | Then Find NDR using binary search and pps
+| | ... | ${framesize} | ${binary_min} | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc02-64B-1t1c-ethip4-ip4base-eth-4vhost-2vm-pdrdisc
 | | [Documentation]
@@ -107,15 +110,15 @@
 | | Set Test Variable | ${dut1_vm_refs}
 | | Set Test Variable | ${dut2_vm_refs}
 | | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | When  IPv4 forwarding with Vhost-User for '2' VMs initialized in a 3-node circular topology
-| | And   '2' Guest VMs with dpdk-testpmd-mac connected via vhost-user is setup in a 3-node circular topology
-| | Then  Find PDR using binary search and pps
-| | ...   | ${framesize} | ${binary_min} | ${binary_max} | 3-node-IPv4
-| | ...   | ${min_rate} | ${max_rate} | ${threshold}
-| | ...   | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | When IPv4 forwarding with Vhost-User for '2' VMs initialized in a 3-node circular topology
+| | And '2' Guest VMs with dpdk-testpmd-mac connected via vhost-user is setup in a 3-node circular topology
+| | 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}
 
 | tc03-1518B-1t1c-ethip4-ip4base-eth-4vhost-2vm-ndrdisc
 | | [Documentation]
@@ -134,14 +137,14 @@
 | | Set Test Variable | ${dut1_vm_refs}
 | | Set Test Variable | ${dut2_vm_refs}
 | | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | When  IPv4 forwarding with Vhost-User for '2' VMs initialized in a 3-node circular topology
-| | And   '2' Guest VMs with dpdk-testpmd-mac connected via vhost-user is setup in a 3-node circular topology
-| | Then  Find NDR using binary search and pps
-| | ...   | ${framesize} | ${binary_min} | ${binary_max} | 3-node-IPv4
-| | ...   | ${min_rate} | ${max_rate} | ${threshold}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | When IPv4 forwarding with Vhost-User for '2' VMs initialized in a 3-node circular topology
+| | And '2' Guest VMs with dpdk-testpmd-mac connected via vhost-user is setup in a 3-node circular topology
+| | Then Find NDR using binary search and pps
+| | ... | ${framesize} | ${binary_min} | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc04-1518B-1t1c-ethip4-ip4base-eth-4vhost-2vm-pdrdisc
 | | [Documentation]
@@ -160,15 +163,15 @@
 | | Set Test Variable | ${dut1_vm_refs}
 | | Set Test Variable | ${dut2_vm_refs}
 | | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | When  IPv4 forwarding with Vhost-User for '2' VMs initialized in a 3-node circular topology
-| | And   '2' Guest VMs with dpdk-testpmd-mac connected via vhost-user is setup in a 3-node circular topology
-| | Then  Find PDR using binary search and pps
-| | ...   | ${framesize} | ${binary_min} | ${binary_max} | 3-node-IPv4
-| | ...   | ${min_rate} | ${max_rate} | ${threshold}
-| | ...   | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | When IPv4 forwarding with Vhost-User for '2' VMs initialized in a 3-node circular topology
+| | And '2' Guest VMs with dpdk-testpmd-mac connected via vhost-user is setup in a 3-node circular topology
+| | 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}
 
 | tc05-IMIX-1t1c-ethip4-ip4base-eth-4vhost-2vm-ndrdisc
 | | [Documentation]
@@ -188,14 +191,14 @@
 | | Set Test Variable | ${dut1_vm_refs}
 | | Set Test Variable | ${dut2_vm_refs}
 | | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | When  IPv4 forwarding with Vhost-User for '2' VMs initialized in a 3-node circular topology
-| | And   '2' Guest VMs with dpdk-testpmd-mac connected via vhost-user is setup in a 3-node circular topology
-| | Then  Find NDR using binary search and pps
-| | ...   | ${framesize} | ${binary_min} | ${binary_max} | 3-node-IPv4
-| | ...   | ${min_rate} | ${max_rate} | ${threshold}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | When IPv4 forwarding with Vhost-User for '2' VMs initialized in a 3-node circular topology
+| | And '2' Guest VMs with dpdk-testpmd-mac connected via vhost-user is setup in a 3-node circular topology
+| | Then Find NDR using binary search and pps
+| | ... | ${framesize} | ${binary_min} | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc06-IMIX-1t1c-ethip4-ip4base-eth-4vhost-2vm-pdrdisc
 | | [Documentation]
@@ -215,15 +218,15 @@
 | | Set Test Variable | ${dut1_vm_refs}
 | | Set Test Variable | ${dut2_vm_refs}
 | | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | When  IPv4 forwarding with Vhost-User for '2' VMs initialized in a 3-node circular topology
-| | And   '2' Guest VMs with dpdk-testpmd-mac connected via vhost-user is setup in a 3-node circular topology
-| | Then  Find PDR using binary search and pps
-| | ...   | ${framesize} | ${binary_min} | ${binary_max} | 3-node-IPv4
-| | ...   | ${min_rate} | ${max_rate} | ${threshold}
-| | ...   | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | When IPv4 forwarding with Vhost-User for '2' VMs initialized in a 3-node circular topology
+| | And '2' Guest VMs with dpdk-testpmd-mac connected via vhost-user is setup in a 3-node circular topology
+| | 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}
 
 | tc07-64B-2t2c-ethip4-ip4base-eth-4vhost-2vm-ndrdisc
 | | [Documentation]
@@ -242,14 +245,14 @@
 | | Set Test Variable | ${dut1_vm_refs}
 | | Set Test Variable | ${dut2_vm_refs}
 | | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | When  IPv4 forwarding with Vhost-User for '2' VMs initialized in a 3-node circular topology
-| | And   '2' Guest VMs with dpdk-testpmd-mac connected via vhost-user is setup in a 3-node circular topology
-| | Then  Find NDR using binary search and pps
-| | ...   | ${framesize} | ${binary_min} | ${binary_max} | 3-node-IPv4
-| | ...   | ${min_rate} | ${max_rate} | ${threshold}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | When IPv4 forwarding with Vhost-User for '2' VMs initialized in a 3-node circular topology
+| | And '2' Guest VMs with dpdk-testpmd-mac connected via vhost-user is setup in a 3-node circular topology
+| | Then Find NDR using binary search and pps
+| | ... | ${framesize} | ${binary_min} | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc08-64B-2t2c-ethip4-ip4base-eth-4vhost-2vm-pdrdisc
 | | [Documentation]
@@ -268,15 +271,15 @@
 | | Set Test Variable | ${dut1_vm_refs}
 | | Set Test Variable | ${dut2_vm_refs}
 | | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | When  IPv4 forwarding with Vhost-User for '2' VMs initialized in a 3-node circular topology
-| | And   '2' Guest VMs with dpdk-testpmd-mac connected via vhost-user is setup in a 3-node circular topology
-| | Then  Find PDR using binary search and pps
-| | ...   | ${framesize} | ${binary_min} | ${binary_max} | 3-node-IPv4
-| | ...   | ${min_rate} | ${max_rate} | ${threshold}
-| | ...   | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | When IPv4 forwarding with Vhost-User for '2' VMs initialized in a 3-node circular topology
+| | And '2' Guest VMs with dpdk-testpmd-mac connected via vhost-user is setup in a 3-node circular topology
+| | 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}
 
 | tc09-1518B-2t2c-ethip4-ip4base-eth-4vhost-2vm-ndrdisc
 | | [Documentation]
@@ -295,14 +298,14 @@
 | | Set Test Variable | ${dut1_vm_refs}
 | | Set Test Variable | ${dut2_vm_refs}
 | | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | When  IPv4 forwarding with Vhost-User for '2' VMs initialized in a 3-node circular topology
-| | And   '2' Guest VMs with dpdk-testpmd-mac connected via vhost-user is setup in a 3-node circular topology
-| | Then  Find NDR using binary search and pps
-| | ...   | ${framesize} | ${binary_min} | ${binary_max} | 3-node-IPv4
-| | ...   | ${min_rate} | ${max_rate} | ${threshold}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | When IPv4 forwarding with Vhost-User for '2' VMs initialized in a 3-node circular topology
+| | And '2' Guest VMs with dpdk-testpmd-mac connected via vhost-user is setup in a 3-node circular topology
+| | Then Find NDR using binary search and pps
+| | ... | ${framesize} | ${binary_min} | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc10-1518B-2t2c-ethip4-ip4base-eth-4vhost-2vm-pdrdisc
 | | [Documentation]
@@ -321,15 +324,15 @@
 | | Set Test Variable | ${dut1_vm_refs}
 | | Set Test Variable | ${dut2_vm_refs}
 | | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | When  IPv4 forwarding with Vhost-User for '2' VMs initialized in a 3-node circular topology
-| | And   '2' Guest VMs with dpdk-testpmd-mac connected via vhost-user is setup in a 3-node circular topology
-| | Then  Find PDR using binary search and pps
-| | ...   | ${framesize} | ${binary_min} | ${binary_max} | 3-node-IPv4
-| | ...   | ${min_rate} | ${max_rate} | ${threshold}
-| | ...   | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | When IPv4 forwarding with Vhost-User for '2' VMs initialized in a 3-node circular topology
+| | And '2' Guest VMs with dpdk-testpmd-mac connected via vhost-user is setup in a 3-node circular topology
+| | 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}
 
 | tc11-IMIX-2t2c-ethip4-ip4base-eth-4vhost-2vm-ndrdisc
 | | [Documentation]
@@ -349,14 +352,14 @@
 | | Set Test Variable | ${dut1_vm_refs}
 | | Set Test Variable | ${dut2_vm_refs}
 | | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | When  IPv4 forwarding with Vhost-User for '2' VMs initialized in a 3-node circular topology
-| | And   '2' Guest VMs with dpdk-testpmd-mac connected via vhost-user is setup in a 3-node circular topology
-| | Then  Find NDR using binary search and pps
-| | ...   | ${framesize} | ${binary_min} | ${binary_max} | 3-node-IPv4
-| | ...   | ${min_rate} | ${max_rate} | ${threshold}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | When IPv4 forwarding with Vhost-User for '2' VMs initialized in a 3-node circular topology
+| | And '2' Guest VMs with dpdk-testpmd-mac connected via vhost-user is setup in a 3-node circular topology
+| | Then Find NDR using binary search and pps
+| | ... | ${framesize} | ${binary_min} | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc12-IMIX-2t2c-ethip4-ip4base-eth-4vhost-2vm-pdrdisc
 | | [Documentation]
@@ -376,15 +379,15 @@
 | | Set Test Variable | ${dut1_vm_refs}
 | | Set Test Variable | ${dut2_vm_refs}
 | | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | When  IPv4 forwarding with Vhost-User for '2' VMs initialized in a 3-node circular topology
-| | And   '2' Guest VMs with dpdk-testpmd-mac connected via vhost-user is setup in a 3-node circular topology
-| | Then  Find PDR using binary search and pps
-| | ...   | ${framesize} | ${binary_min} | ${binary_max} | 3-node-IPv4
-| | ...   | ${min_rate} | ${max_rate} | ${threshold}
-| | ...   | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | When IPv4 forwarding with Vhost-User for '2' VMs initialized in a 3-node circular topology
+| | And '2' Guest VMs with dpdk-testpmd-mac connected via vhost-user is setup in a 3-node circular topology
+| | 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}
 
 | tc13-64B-4t4c-ethip4-ip4base-eth-4vhost-2vm-ndrdisc
 | | [Documentation]
@@ -403,14 +406,14 @@
 | | Set Test Variable | ${dut1_vm_refs}
 | | Set Test Variable | ${dut2_vm_refs}
 | | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | When  IPv4 forwarding with Vhost-User for '2' VMs initialized in a 3-node circular topology
-| | And   '2' Guest VMs with dpdk-testpmd-mac connected via vhost-user is setup in a 3-node circular topology
-| | Then  Find NDR using binary search and pps
-| | ...   | ${framesize} | ${binary_min} | ${binary_max} | 3-node-IPv4
-| | ...   | ${min_rate} | ${max_rate} | ${threshold}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | When IPv4 forwarding with Vhost-User for '2' VMs initialized in a 3-node circular topology
+| | And '2' Guest VMs with dpdk-testpmd-mac connected via vhost-user is setup in a 3-node circular topology
+| | Then Find NDR using binary search and pps
+| | ... | ${framesize} | ${binary_min} | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc14-64B-4t4c-ethip4-ip4base-eth-4vhost-2vm-pdrdisc
 | | [Documentation]
@@ -429,15 +432,15 @@
 | | Set Test Variable | ${dut1_vm_refs}
 | | Set Test Variable | ${dut2_vm_refs}
 | | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | When  IPv4 forwarding with Vhost-User for '2' VMs initialized in a 3-node circular topology
-| | And   '2' Guest VMs with dpdk-testpmd-mac connected via vhost-user is setup in a 3-node circular topology
-| | Then  Find PDR using binary search and pps
-| | ...   | ${framesize} | ${binary_min} | ${binary_max} | 3-node-IPv4
-| | ...   | ${min_rate} | ${max_rate} | ${threshold}
-| | ...   | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | When IPv4 forwarding with Vhost-User for '2' VMs initialized in a 3-node circular topology
+| | And '2' Guest VMs with dpdk-testpmd-mac connected via vhost-user is setup in a 3-node circular topology
+| | 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}
 
 | tc15-1518B-4t4c-ethip4-ip4base-eth-4vhost-2vm-ndrdisc
 | | [Documentation]
@@ -456,14 +459,14 @@
 | | Set Test Variable | ${dut1_vm_refs}
 | | Set Test Variable | ${dut2_vm_refs}
 | | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | When  IPv4 forwarding with Vhost-User for '2' VMs initialized in a 3-node circular topology
-| | And   '2' Guest VMs with dpdk-testpmd-mac connected via vhost-user is setup in a 3-node circular topology
-| | Then  Find NDR using binary search and pps
-| | ...   | ${framesize} | ${binary_min} | ${binary_max} | 3-node-IPv4
-| | ...   | ${min_rate} | ${max_rate} | ${threshold}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | When IPv4 forwarding with Vhost-User for '2' VMs initialized in a 3-node circular topology
+| | And '2' Guest VMs with dpdk-testpmd-mac connected via vhost-user is setup in a 3-node circular topology
+| | Then Find NDR using binary search and pps
+| | ... | ${framesize} | ${binary_min} | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc16-1518B-4t4c-ethip4-ip4base-eth-4vhost-2vm-pdrdisc
 | | [Documentation]
@@ -482,15 +485,15 @@
 | | Set Test Variable | ${dut1_vm_refs}
 | | Set Test Variable | ${dut2_vm_refs}
 | | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | When  IPv4 forwarding with Vhost-User for '2' VMs initialized in a 3-node circular topology
-| | And   '2' Guest VMs with dpdk-testpmd-mac connected via vhost-user is setup in a 3-node circular topology
-| | Then  Find PDR using binary search and pps
-| | ...   | ${framesize} | ${binary_min} | ${binary_max} | 3-node-IPv4
-| | ...   | ${min_rate} | ${max_rate} | ${threshold}
-| | ...   | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | When IPv4 forwarding with Vhost-User for '2' VMs initialized in a 3-node circular topology
+| | And '2' Guest VMs with dpdk-testpmd-mac connected via vhost-user is setup in a 3-node circular topology
+| | 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}
 
 | tc17-IMIX-4t4c-ethip4-ip4base-eth-4vhost-2vm-ndrdisc
 | | [Documentation]
@@ -510,14 +513,14 @@
 | | Set Test Variable | ${dut1_vm_refs}
 | | Set Test Variable | ${dut2_vm_refs}
 | | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | When  IPv4 forwarding with Vhost-User for '2' VMs initialized in a 3-node circular topology
-| | And   '2' Guest VMs with dpdk-testpmd-mac connected via vhost-user is setup in a 3-node circular topology
-| | Then  Find NDR using binary search and pps
-| | ...   | ${framesize} | ${binary_min} | ${binary_max} | 3-node-IPv4
-| | ...   | ${min_rate} | ${max_rate} | ${threshold}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | When IPv4 forwarding with Vhost-User for '2' VMs initialized in a 3-node circular topology
+| | And '2' Guest VMs with dpdk-testpmd-mac connected via vhost-user is setup in a 3-node circular topology
+| | Then Find NDR using binary search and pps
+| | ... | ${framesize} | ${binary_min} | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc18-IMIX-4t4c-ethip4-ip4base-eth-4vhost-2vm-pdrdisc
 | | [Documentation]
@@ -537,12 +540,12 @@
 | | Set Test Variable | ${dut1_vm_refs}
 | | Set Test Variable | ${dut2_vm_refs}
 | | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | When  IPv4 forwarding with Vhost-User for '2' VMs initialized in a 3-node circular topology
-| | And   '2' Guest VMs with dpdk-testpmd-mac connected via vhost-user is setup in a 3-node circular topology
-| | Then  Find PDR using binary search and pps
-| | ...   | ${framesize} | ${binary_min} | ${binary_max} | 3-node-IPv4
-| | ...   | ${min_rate} | ${max_rate} | ${threshold}
-| | ...   | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | When IPv4 forwarding with Vhost-User for '2' VMs initialized in a 3-node circular topology
+| | And '2' Guest VMs with dpdk-testpmd-mac connected via vhost-user is setup in a 3-node circular topology
+| | 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}
diff --git a/tests/perf/10ge2p1x520-ethip4-ip4base-iacldstbase-ndrchk.robot b/tests/perf/10ge2p1x520-ethip4-ip4base-iacldstbase-ndrchk.robot
index 8077961b53..b293f4fd04 100644
--- a/tests/perf/10ge2p1x520-ethip4-ip4base-iacldstbase-ndrchk.robot
+++ b/tests/perf/10ge2p1x520-ethip4-ip4base-iacldstbase-ndrchk.robot
@@ -50,6 +50,10 @@
 | ... | TG node interfaces.
 | ... | *[Ref] Applicable standard specifications:* RFC2544.
 
+*** Variables ***
+# Traffic profile:
+| ${traffic_profile} | trex-sl-3n-ethip4-ip4src253
+
 *** Test Cases ***
 | tc01-64B-1t1c-ethip4-ip4base-iacldstbase-ndrchk
 | | [Documentation]
@@ -80,7 +84,7 @@
 | | And Vpp Enable Input Acl Interface
 | | ... | ${dut2} | ${dut2_if2} | ip4 | ${table_idx}
 | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv4
+| | ... | ${framesize} | ${traffic_profile}
 
 | tc02-1518B-1t1c-ethip4-ip4base-iacldstbase-ndrchk
 | | [Documentation]
@@ -111,7 +115,7 @@
 | | And Vpp Enable Input Acl Interface
 | | ... | ${dut2} | ${dut2_if2} | ip4 | ${table_idx}
 | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv4
+| | ... | ${framesize} | ${traffic_profile}
 
 | tc03-9000B-1t1c-ethip4-ip4base-iacldstbase-ndrchk
 | | [Documentation]
@@ -141,7 +145,7 @@
 | | And Vpp Enable Input Acl Interface
 | | ... | ${dut2} | ${dut2_if2} | ip4 | ${table_idx}
 | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv4
+| | ... | ${framesize} | ${traffic_profile}
 
 | tc04-64B-2t2c-ethip4-ip4base-iacldstbase-ndrchk
 | | [Documentation]
@@ -172,7 +176,7 @@
 | | And Vpp Enable Input Acl Interface
 | | ... | ${dut2} | ${dut2_if2} | ip4 | ${table_idx}
 | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv4
+| | ... | ${framesize} | ${traffic_profile}
 
 | tc05-1518B-2t2c-ethip4-ip4base-iacldstbase-ndrchk
 | | [Documentation]
@@ -203,7 +207,7 @@
 | | And Vpp Enable Input Acl Interface
 | | ... | ${dut2} | ${dut2_if2} | ip4 | ${table_idx}
 | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv4
+| | ... | ${framesize} | ${traffic_profile}
 
 | tc06-9000B-2t2c-ethip4-ip4base-iacldstbase-ndrchk
 | | [Documentation]
@@ -233,7 +237,7 @@
 | | And Vpp Enable Input Acl Interface
 | | ... | ${dut2} | ${dut2_if2} | ip4 | ${table_idx}
 | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv4
+| | ... | ${framesize} | ${traffic_profile}
 
 | tc07-64B-4t4c-ethip4-ip4base-iacldstbase-ndrchk
 | | [Documentation]
@@ -264,7 +268,7 @@
 | | And Vpp Enable Input Acl Interface
 | | ... | ${dut2} | ${dut2_if2} | ip4 | ${table_idx}
 | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv4
+| | ... | ${framesize} | ${traffic_profile}
 
 | tc08-1518B-4t4c-ethip4-ip4base-iacldstbase-ndrchk
 | | [Documentation]
@@ -295,7 +299,7 @@
 | | And Vpp Enable Input Acl Interface
 | | ... | ${dut2} | ${dut2_if2} | ip4 | ${table_idx}
 | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv4
+| | ... | ${framesize} | ${traffic_profile}
 
 | tc09-9000B-4t4c-ethip4-ip4base-iacldstbase-ndrchk
 | | [Documentation]
@@ -325,4 +329,4 @@
 | | And Vpp Enable Input Acl Interface
 | | ... | ${dut2} | ${dut2_if2} | ip4 | ${table_idx}
 | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv4
+| | ... | ${framesize} | ${traffic_profile}
diff --git a/tests/perf/10ge2p1x520-ethip4-ip4base-iacldstbase-ndrpdrdisc.robot b/tests/perf/10ge2p1x520-ethip4-ip4base-iacldstbase-ndrpdrdisc.robot
index cad0c70792..0721698afb 100644
--- a/tests/perf/10ge2p1x520-ethip4-ip4base-iacldstbase-ndrpdrdisc.robot
+++ b/tests/perf/10ge2p1x520-ethip4-ip4base-iacldstbase-ndrpdrdisc.robot
@@ -28,7 +28,7 @@
 | ...
 | Test Setup | Performance test setup
 | Test Teardown | Performance test teardown | ${min_rate}pps | ${framesize}
-| ... | 3-node-IPv4
+| ... | ${traffic_profile}
 | ...
 | Documentation | *RFC2544: Pkt throughput IPv4 iAcl whitelist test cases*
 | ...
@@ -56,6 +56,8 @@
 *** Variables ***
 # X520-DA2 bandwidth limit
 | ${s_limit} | ${10000000000}
+# Traffic profile:
+| ${traffic_profile} | trex-sl-3n-ethip4-ip4src253
 
 *** Test Cases ***
 | tc01-64B-1t1c-ethip4-ip4base-iacldstbase-ndrdisc
@@ -72,10 +74,10 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | When  IPv4 forwarding initialized in a 3-node circular topology
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | When IPv4 forwarding initialized in a 3-node circular topology
 | | ${table_idx} | ${skip_n} | ${match_n}= | And Vpp Creates Classify Table L3
 | | ... | ${dut1} | ip4 | dst
 | | And Vpp Configures Classify Session L3
@@ -91,9 +93,8 @@
 | | And Vpp Enable Input Acl Interface
 | | ... | ${dut2} | ${dut2_if2} | ip4 | ${table_idx}
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-IPv4
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc02-64B-1t1c-ethip4-ip4base-iacldstbase-pdrdisc
 | | [Documentation]
@@ -109,10 +110,10 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | When  IPv4 forwarding initialized in a 3-node circular topology
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | When IPv4 forwarding initialized in a 3-node circular topology
 | | ${table_idx} | ${skip_n} | ${match_n}= | And Vpp Creates Classify Table L3
 | | ... | ${dut1} | ip4 | dst
 | | And Vpp Configures Classify Session L3
@@ -128,11 +129,9 @@
 | | And Vpp Enable Input Acl Interface
 | | ... | ${dut2} | ${dut2_if2} | ip4 | ${table_idx}
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-IPv4
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
-| | ...                                       | ${perf_pdr_loss_acceptance}
-| | ...                                       | ${perf_pdr_loss_acceptance_type}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
+| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
 
 | tc03-1518B-1t1c-ethip4-ip4base-iacldstbase-ndrdisc
 | | [Documentation]
@@ -148,10 +147,10 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | When  IPv4 forwarding initialized in a 3-node circular topology
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | When IPv4 forwarding initialized in a 3-node circular topology
 | | ${table_idx} | ${skip_n} | ${match_n}= | And Vpp Creates Classify Table L3
 | | ... | ${dut1} | ip4 | dst
 | | And Vpp Configures Classify Session L3
@@ -167,9 +166,8 @@
 | | And Vpp Enable Input Acl Interface
 | | ... | ${dut2} | ${dut2_if2} | ip4 | ${table_idx}
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-IPv4
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc04-1518B-1t1c-ethip4-ip4base-iacldstbase-pdrdisc
 | | [Documentation]
@@ -185,10 +183,10 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | When  IPv4 forwarding initialized in a 3-node circular topology
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | When IPv4 forwarding initialized in a 3-node circular topology
 | | ${table_idx} | ${skip_n} | ${match_n}= | And Vpp Creates Classify Table L3
 | | ... | ${dut1} | ip4 | dst
 | | And Vpp Configures Classify Session L3
@@ -204,11 +202,9 @@
 | | And Vpp Enable Input Acl Interface
 | | ... | ${dut2} | ${dut2_if2} | ip4 | ${table_idx}
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-IPv4
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
-| | ...                                       | ${perf_pdr_loss_acceptance}
-| | ...                                       | ${perf_pdr_loss_acceptance_type}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
+| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
 
 | tc05-9000B-1t1c-ethip4-ip4base-iacldstbase-ndrdisc
 | | [Documentation]
@@ -224,9 +220,9 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Apply startup configuration on all VPP DUTs
-| | When  IPv4 forwarding initialized in a 3-node circular topology
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Apply startup configuration on all VPP DUTs
+| | When IPv4 forwarding initialized in a 3-node circular topology
 | | ${table_idx} | ${skip_n} | ${match_n}= | And Vpp Creates Classify Table L3
 | | ... | ${dut1} | ip4 | dst
 | | And Vpp Configures Classify Session L3
@@ -242,9 +238,8 @@
 | | And Vpp Enable Input Acl Interface
 | | ... | ${dut2} | ${dut2_if2} | ip4 | ${table_idx}
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-IPv4
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc06-9000B-1t1c-ethip4-ip4base-iacldstbase-pdrdisc
 | | [Documentation]
@@ -260,9 +255,9 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Apply startup configuration on all VPP DUTs
-| | When  IPv4 forwarding initialized in a 3-node circular topology
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Apply startup configuration on all VPP DUTs
+| | When IPv4 forwarding initialized in a 3-node circular topology
 | | ${table_idx} | ${skip_n} | ${match_n}= | And Vpp Creates Classify Table L3
 | | ... | ${dut1} | ip4 | dst
 | | And Vpp Configures Classify Session L3
@@ -278,11 +273,9 @@
 | | And Vpp Enable Input Acl Interface
 | | ... | ${dut2} | ${dut2_if2} | ip4 | ${table_idx}
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-IPv4
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
-| | ...                                       | ${perf_pdr_loss_acceptance}
-| | ...                                       | ${perf_pdr_loss_acceptance_type}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
+| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
 
 | tc07-64B-2t2c-ethip4-ip4base-iacldstbase-ndrdisc
 | | [Documentation]
@@ -298,10 +291,10 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | When  IPv4 forwarding initialized in a 3-node circular topology
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | When IPv4 forwarding initialized in a 3-node circular topology
 | | ${table_idx} | ${skip_n} | ${match_n}= | And Vpp Creates Classify Table L3
 | | ... | ${dut1} | ip4 | dst
 | | And Vpp Configures Classify Session L3
@@ -317,9 +310,8 @@
 | | And Vpp Enable Input Acl Interface
 | | ... | ${dut2} | ${dut2_if2} | ip4 | ${table_idx}
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-IPv4
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc08-64B-2t2c-ethip4-ip4base-iacldstbase-pdrdisc
 | | [Documentation]
@@ -335,10 +327,10 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | When  IPv4 forwarding initialized in a 3-node circular topology
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | When IPv4 forwarding initialized in a 3-node circular topology
 | | ${table_idx} | ${skip_n} | ${match_n}= | And Vpp Creates Classify Table L3
 | | ... | ${dut1} | ip4 | dst
 | | And Vpp Configures Classify Session L3
@@ -354,11 +346,9 @@
 | | And Vpp Enable Input Acl Interface
 | | ... | ${dut2} | ${dut2_if2} | ip4 | ${table_idx}
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-IPv4
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
-| | ...                                       | ${perf_pdr_loss_acceptance}
-| | ...                                       | ${perf_pdr_loss_acceptance_type}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
+| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
 
 | tc09-1518B-2t2c-ethip4-ip4base-iacldstbase-ndrdisc
 | | [Documentation]
@@ -374,10 +364,10 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | When  IPv4 forwarding initialized in a 3-node circular topology
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | When IPv4 forwarding initialized in a 3-node circular topology
 | | ${table_idx} | ${skip_n} | ${match_n}= | And Vpp Creates Classify Table L3
 | | ... | ${dut1} | ip4 | dst
 | | And Vpp Configures Classify Session L3
@@ -393,9 +383,8 @@
 | | And Vpp Enable Input Acl Interface
 | | ... | ${dut2} | ${dut2_if2} | ip4 | ${table_idx}
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-IPv4
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc10-1518B-2t2c-ethip4-ip4base-iacldstbase-pdrdisc
 | | [Documentation]
@@ -411,10 +400,10 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | When  IPv4 forwarding initialized in a 3-node circular topology
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | When IPv4 forwarding initialized in a 3-node circular topology
 | | ${table_idx} | ${skip_n} | ${match_n}= | And Vpp Creates Classify Table L3
 | | ... | ${dut1} | ip4 | dst
 | | And Vpp Configures Classify Session L3
@@ -430,11 +419,9 @@
 | | And Vpp Enable Input Acl Interface
 | | ... | ${dut2} | ${dut2_if2} | ip4 | ${table_idx}
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-IPv4
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
-| | ...                                       | ${perf_pdr_loss_acceptance}
-| | ...                                       | ${perf_pdr_loss_acceptance_type}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
+| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
 
 | tc11-9000B-2t2c-ethip4-ip4base-iacldstbase-ndrdisc
 | | [Documentation]
@@ -450,9 +437,9 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Apply startup configuration on all VPP DUTs
-| | When  IPv4 forwarding initialized in a 3-node circular topology
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Apply startup configuration on all VPP DUTs
+| | When IPv4 forwarding initialized in a 3-node circular topology
 | | ${table_idx} | ${skip_n} | ${match_n}= | And Vpp Creates Classify Table L3
 | | ... | ${dut1} | ip4 | dst
 | | And Vpp Configures Classify Session L3
@@ -468,9 +455,8 @@
 | | And Vpp Enable Input Acl Interface
 | | ... | ${dut2} | ${dut2_if2} | ip4 | ${table_idx}
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-IPv4
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc12-9000B-2t2c-ethip4-ip4base-iacldstbase-pdrdisc
 | | [Documentation]
@@ -486,9 +472,9 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Apply startup configuration on all VPP DUTs
-| | When  IPv4 forwarding initialized in a 3-node circular topology
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Apply startup configuration on all VPP DUTs
+| | When IPv4 forwarding initialized in a 3-node circular topology
 | | ${table_idx} | ${skip_n} | ${match_n}= | And Vpp Creates Classify Table L3
 | | ... | ${dut1} | ip4 | dst
 | | And Vpp Configures Classify Session L3
@@ -504,11 +490,9 @@
 | | And Vpp Enable Input Acl Interface
 | | ... | ${dut2} | ${dut2_if2} | ip4 | ${table_idx}
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-IPv4
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
-| | ...                                       | ${perf_pdr_loss_acceptance}
-| | ...                                       | ${perf_pdr_loss_acceptance_type}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
+| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
 
 | tc13-64B-4t4c-ethip4-ip4base-iacldstbase-ndrdisc
 | | [Documentation]
@@ -524,10 +508,10 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | When  IPv4 forwarding initialized in a 3-node circular topology
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | When IPv4 forwarding initialized in a 3-node circular topology
 | | ${table_idx} | ${skip_n} | ${match_n}= | And Vpp Creates Classify Table L3
 | | ... | ${dut1} | ip4 | dst
 | | And Vpp Configures Classify Session L3
@@ -543,9 +527,8 @@
 | | And Vpp Enable Input Acl Interface
 | | ... | ${dut2} | ${dut2_if2} | ip4 | ${table_idx}
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-IPv4
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc14-64B-4t4c-ethip4-ip4base-iacldstbase-pdrdisc
 | | [Documentation]
@@ -561,10 +544,10 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | When  IPv4 forwarding initialized in a 3-node circular topology
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | When IPv4 forwarding initialized in a 3-node circular topology
 | | ${table_idx} | ${skip_n} | ${match_n}= | And Vpp Creates Classify Table L3
 | | ... | ${dut1} | ip4 | dst
 | | And Vpp Configures Classify Session L3
@@ -580,11 +563,9 @@
 | | And Vpp Enable Input Acl Interface
 | | ... | ${dut2} | ${dut2_if2} | ip4 | ${table_idx}
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-IPv4
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
-| | ...                                       | ${perf_pdr_loss_acceptance}
-| | ...                                       | ${perf_pdr_loss_acceptance_type}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
+| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
 
 | tc15-1518B-4t4c-ethip4-ip4base-iacldstbase-ndrdisc
 | | [Documentation]
@@ -600,10 +581,10 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | When  IPv4 forwarding initialized in a 3-node circular topology
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | When IPv4 forwarding initialized in a 3-node circular topology
 | | ${table_idx} | ${skip_n} | ${match_n}= | And Vpp Creates Classify Table L3
 | | ... | ${dut1} | ip4 | dst
 | | And Vpp Configures Classify Session L3
@@ -619,9 +600,8 @@
 | | And Vpp Enable Input Acl Interface
 | | ... | ${dut2} | ${dut2_if2} | ip4 | ${table_idx}
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-IPv4
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc16-1518B-4t4c-ethip4-ip4base-iacldstbase-pdrdisc
 | | [Documentation]
@@ -637,10 +617,10 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | When  IPv4 forwarding initialized in a 3-node circular topology
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | When IPv4 forwarding initialized in a 3-node circular topology
 | | ${table_idx} | ${skip_n} | ${match_n}= | And Vpp Creates Classify Table L3
 | | ... | ${dut1} | ip4 | dst
 | | And Vpp Configures Classify Session L3
@@ -656,11 +636,9 @@
 | | And Vpp Enable Input Acl Interface
 | | ... | ${dut2} | ${dut2_if2} | ip4 | ${table_idx}
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-IPv4
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
-| | ...                                       | ${perf_pdr_loss_acceptance}
-| | ...                                       | ${perf_pdr_loss_acceptance_type}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
+| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
 
 | tc17-9000B-4t4c-ethip4-ip4base-iacldstbase-ndrdisc
 | | [Documentation]
@@ -676,9 +654,9 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Apply startup configuration on all VPP DUTs
-| | When  IPv4 forwarding initialized in a 3-node circular topology
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Apply startup configuration on all VPP DUTs
+| | When IPv4 forwarding initialized in a 3-node circular topology
 | | ${table_idx} | ${skip_n} | ${match_n}= | And Vpp Creates Classify Table L3
 | | ... | ${dut1} | ip4 | dst
 | | And Vpp Configures Classify Session L3
@@ -694,9 +672,8 @@
 | | And Vpp Enable Input Acl Interface
 | | ... | ${dut2} | ${dut2_if2} | ip4 | ${table_idx}
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-IPv4
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc18-9000B-4t4c-ethip4-ip4base-iacldstbase-pdrdisc
 | | [Documentation]
@@ -712,9 +689,9 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Apply startup configuration on all VPP DUTs
-| | When  IPv4 forwarding initialized in a 3-node circular topology
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Apply startup configuration on all VPP DUTs
+| | When IPv4 forwarding initialized in a 3-node circular topology
 | | ${table_idx} | ${skip_n} | ${match_n}= | And Vpp Creates Classify Table L3
 | | ... | ${dut1} | ip4 | dst
 | | And Vpp Configures Classify Session L3
@@ -730,8 +707,6 @@
 | | And Vpp Enable Input Acl Interface
 | | ... | ${dut2} | ${dut2_if2} | ip4 | ${table_idx}
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-IPv4
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
-| | ...                                       | ${perf_pdr_loss_acceptance}
-| | ...                                       | ${perf_pdr_loss_acceptance_type}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
+| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
diff --git a/tests/perf/10ge2p1x520-ethip4-ip4base-ipolicemarkbase-ndrchk.robot b/tests/perf/10ge2p1x520-ethip4-ip4base-ipolicemarkbase-ndrchk.robot
index 6e1d6a07eb..86341c3041 100644
--- a/tests/perf/10ge2p1x520-ethip4-ip4base-ipolicemarkbase-ndrchk.robot
+++ b/tests/perf/10ge2p1x520-ethip4-ip4base-ipolicemarkbase-ndrchk.robot
@@ -53,6 +53,8 @@
 *** Variables ***
 | ${cir}= | ${100}
 | ${eir}= | ${150}
+# Traffic profile:
+| ${traffic_profile} | trex-sl-3n-ethip4-ip4src253
 
 *** Test Cases ***
 | tc01-64B-1t1c-ethip4-ip4base-ipolicemarkbase-ndrchk
@@ -72,7 +74,7 @@
 | | And IPv4 forwarding initialized in a 3-node circular topology
 | | And IPv4 policer 2r3c-'ca' initialized in a 3-node circular topology
 | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv4
+| | ... | ${framesize} | ${traffic_profile}
 
 | tc02-1518B-1t1c-ethip4-ip4base-ipolicemarkbase-ndrchk
 | | [Documentation]
@@ -91,7 +93,7 @@
 | | When IPv4 forwarding initialized in a 3-node circular topology
 | | And IPv4 policer 2r3c-'ca' initialized in a 3-node circular topology
 | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv4
+| | ... | ${framesize} | ${traffic_profile}
 
 | tc03-9000B-1t1c-ethip4-ip4base-ipolicemarkbase-ndrchk
 | | [Documentation]
@@ -109,7 +111,7 @@
 | | And IPv4 forwarding initialized in a 3-node circular topology
 | | And IPv4 policer 2r3c-'ca' initialized in a 3-node circular topology
 | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv4
+| | ... | ${framesize} | ${traffic_profile}
 
 | tc04-64B-2t2c-ethip4-ip4base-ipolicemarkbase-ndrchk
 | | [Documentation]
@@ -128,7 +130,7 @@
 | | And IPv4 forwarding initialized in a 3-node circular topology
 | | And IPv4 policer 2r3c-'ca' initialized in a 3-node circular topology
 | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv4
+| | ... | ${framesize} | ${traffic_profile}
 
 | tc05-1518B-2t2c-ethip4-ip4base-ipolicemarkbase-ndrchk
 | | [Documentation]
@@ -147,7 +149,7 @@
 | | And IPv4 forwarding initialized in a 3-node circular topology
 | | And IPv4 policer 2r3c-'ca' initialized in a 3-node circular topology
 | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv4
+| | ... | ${framesize} | ${traffic_profile}
 
 | tc06-9000B-2t2c-ethip4-ip4base-ipolicemarkbase-ndrchk
 | | [Documentation]
@@ -165,7 +167,7 @@
 | | And IPv4 forwarding initialized in a 3-node circular topology
 | | And IPv4 policer 2r3c-'ca' initialized in a 3-node circular topology
 | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv4
+| | ... | ${framesize} | ${traffic_profile}
 
 | tc07-64B-4t4c-ethip4-ip4base-ipolicemarkbase-ndrchk
 | | [Documentation]
@@ -184,7 +186,7 @@
 | | And IPv4 forwarding initialized in a 3-node circular topology
 | | And IPv4 policer 2r3c-'ca' initialized in a 3-node circular topology
 | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv4
+| | ... | ${framesize} | ${traffic_profile}
 
 | tc08-1518B-4t4c-ethip4-ip4base-ipolicemarkbase-ndrchk
 | | [Documentation]
@@ -203,7 +205,7 @@
 | | And IPv4 forwarding initialized in a 3-node circular topology
 | | And IPv4 policer 2r3c-'ca' initialized in a 3-node circular topology
 | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv4
+| | ... | ${framesize} | ${traffic_profile}
 
 | tc09-9000B-4t4c-ethip4-ip4base-ipolicemarkbase-ndrchk
 | | [Documentation]
@@ -221,4 +223,4 @@
 | | And IPv4 forwarding initialized in a 3-node circular topology
 | | And IPv4 policer 2r3c-'ca' initialized in a 3-node circular topology
 | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv4
+| | ... | ${framesize} | ${traffic_profile}
diff --git a/tests/perf/10ge2p1x520-ethip4-ip4base-ipolicemarkbase-ndrpdrdisc.robot b/tests/perf/10ge2p1x520-ethip4-ip4base-ipolicemarkbase-ndrpdrdisc.robot
index 1a527c9097..2e75e5315d 100644
--- a/tests/perf/10ge2p1x520-ethip4-ip4base-ipolicemarkbase-ndrpdrdisc.robot
+++ b/tests/perf/10ge2p1x520-ethip4-ip4base-ipolicemarkbase-ndrpdrdisc.robot
@@ -28,7 +28,7 @@
 | ...
 | Test Setup | Performance test setup
 | Test Teardown | Performance test teardown | ${min_rate}pps | ${framesize}
-| ... | 3-node-IPv4
+| ... | ${traffic_profile}
 | ...
 | Documentation | *RFC2544: Pkt throughput IPv4 policer test cases*
 | ...
@@ -58,6 +58,8 @@
 | ${s_limit} | ${10000000000}
 | ${cir}= | ${100}
 | ${eir}= | ${150}
+# Traffic profile:
+| ${traffic_profile} | trex-sl-3n-ethip4-ip4src253
 
 *** Test Cases ***
 | tc01-64B-1t1c-ethip4-ip4base-ipolicemarkbase-ndrdisc
@@ -76,15 +78,14 @@
 | | Set Test Variable | ${cb} | ${framesize}
 | | Set Test Variable | ${eb} | ${framesize}
 | | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | When  IPv4 forwarding initialized in a 3-node circular topology
-| | And   IPv4 policer 2r3c-'ca' initialized in a 3-node circular topology
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | When IPv4 forwarding initialized in a 3-node circular topology
+| | And IPv4 policer 2r3c-'ca' 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}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc02-64B-1t1c-ethip4-ip4base-ipolicemarkbase-pdrdisc
 | | [Documentation]
@@ -102,17 +103,15 @@
 | | Set Test Variable | ${cb} | ${framesize}
 | | Set Test Variable | ${eb} | ${framesize}
 | | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | When  IPv4 forwarding initialized in a 3-node circular topology
-| | And   IPv4 policer 2r3c-'ca' initialized in a 3-node circular topology
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | When IPv4 forwarding initialized in a 3-node circular topology
+| | And IPv4 policer 2r3c-'ca' initialized in a 3-node circular topology
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-IPv4
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
-| | ...                                       | ${perf_pdr_loss_acceptance}
-| | ...                                       | ${perf_pdr_loss_acceptance_type}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
+| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
 
 | tc03-1518B-1t1c-ethip4-ip4base-ipolicemarkbase-ndrdisc
 | | [Documentation]
@@ -130,15 +129,14 @@
 | | Set Test Variable | ${cb} | ${framesize}
 | | Set Test Variable | ${eb} | ${framesize}
 | | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | When  IPv4 forwarding initialized in a 3-node circular topology
-| | And   IPv4 policer 2r3c-'ca' initialized in a 3-node circular topology
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | When IPv4 forwarding initialized in a 3-node circular topology
+| | And IPv4 policer 2r3c-'ca' 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}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc04-1518B-1t1c-ethip4-ip4base-ipolicemarkbase-pdrdisc
 | | [Documentation]
@@ -156,17 +154,15 @@
 | | Set Test Variable | ${cb} | ${framesize}
 | | Set Test Variable | ${eb} | ${framesize}
 | | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | When  IPv4 forwarding initialized in a 3-node circular topology
-| | And   IPv4 policer 2r3c-'ca' initialized in a 3-node circular topology
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | When IPv4 forwarding initialized in a 3-node circular topology
+| | And IPv4 policer 2r3c-'ca' initialized in a 3-node circular topology
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-IPv4
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
-| | ...                                       | ${perf_pdr_loss_acceptance}
-| | ...                                       | ${perf_pdr_loss_acceptance_type}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
+| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
 
 | tc05-9000B-1t1c-ethip4-ip4base-ipolicemarkbase-ndrdisc
 | | [Documentation]
@@ -184,14 +180,13 @@
 | | Set Test Variable | ${cb} | ${framesize}
 | | Set Test Variable | ${eb} | ${framesize}
 | | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Apply startup configuration on all VPP DUTs
-| | When  IPv4 forwarding initialized in a 3-node circular topology
-| | And   IPv4 policer 2r3c-'ca' initialized in a 3-node circular topology
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Apply startup configuration on all VPP DUTs
+| | When IPv4 forwarding initialized in a 3-node circular topology
+| | And IPv4 policer 2r3c-'ca' 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}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc06-9000B-1t1c-ethip4-ip4base-ipolicemarkbase-pdrdisc
 | | [Documentation]
@@ -209,16 +204,14 @@
 | | Set Test Variable | ${cb} | ${framesize}
 | | Set Test Variable | ${eb} | ${framesize}
 | | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Apply startup configuration on all VPP DUTs
-| | When  IPv4 forwarding initialized in a 3-node circular topology
-| | And   IPv4 policer 2r3c-'ca' initialized in a 3-node circular topology
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Apply startup configuration on all VPP DUTs
+| | When IPv4 forwarding initialized in a 3-node circular topology
+| | And IPv4 policer 2r3c-'ca' initialized in a 3-node circular topology
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-IPv4
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
-| | ...                                       | ${perf_pdr_loss_acceptance}
-| | ...                                       | ${perf_pdr_loss_acceptance_type}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
+| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
 
 | tc07-64B-2t2c-ethip4-ip4base-ipolicemarkbase-ndrdisc
 | | [Documentation]
@@ -236,15 +229,14 @@
 | | Set Test Variable | ${cb} | ${framesize}
 | | Set Test Variable | ${eb} | ${framesize}
 | | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | When  IPv4 forwarding initialized in a 3-node circular topology
-| | And   IPv4 policer 2r3c-'ca' initialized in a 3-node circular topology
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | When IPv4 forwarding initialized in a 3-node circular topology
+| | And IPv4 policer 2r3c-'ca' 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}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc08-64B-2t2c-ethip4-ip4base-ipolicemarkbase-pdrdisc
 | | [Documentation]
@@ -262,17 +254,15 @@
 | | Set Test Variable | ${cb} | ${framesize}
 | | Set Test Variable | ${eb} | ${framesize}
 | | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | When  IPv4 forwarding initialized in a 3-node circular topology
-| | And   IPv4 policer 2r3c-'ca' initialized in a 3-node circular topology
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | When IPv4 forwarding initialized in a 3-node circular topology
+| | And IPv4 policer 2r3c-'ca' initialized in a 3-node circular topology
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-IPv4
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
-| | ...                                       | ${perf_pdr_loss_acceptance}
-| | ...                                       | ${perf_pdr_loss_acceptance_type}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
+| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
 
 | tc09-1518B-2t2c-ethip4-ip4base-ipolicemarkbase-ndrdisc
 | | [Documentation]
@@ -290,15 +280,14 @@
 | | Set Test Variable | ${cb} | ${framesize}
 | | Set Test Variable | ${eb} | ${framesize}
 | | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | When  IPv4 forwarding initialized in a 3-node circular topology
-| | And   IPv4 policer 2r3c-'ca' initialized in a 3-node circular topology
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | When IPv4 forwarding initialized in a 3-node circular topology
+| | And IPv4 policer 2r3c-'ca' 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}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc10-1518B-2t2c-ethip4-ip4base-ipolicemarkbase-pdrdisc
 | | [Documentation]
@@ -316,17 +305,15 @@
 | | Set Test Variable | ${cb} | ${framesize}
 | | Set Test Variable | ${eb} | ${framesize}
 | | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | When  IPv4 forwarding initialized in a 3-node circular topology
-| | And   IPv4 policer 2r3c-'ca' initialized in a 3-node circular topology
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | When IPv4 forwarding initialized in a 3-node circular topology
+| | And IPv4 policer 2r3c-'ca' initialized in a 3-node circular topology
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-IPv4
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
-| | ...                                       | ${perf_pdr_loss_acceptance}
-| | ...                                       | ${perf_pdr_loss_acceptance_type}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
+| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
 
 | tc11-9000B-2t2c-ethip4-ip4base-ipolicemarkbase-ndrdisc
 | | [Documentation]
@@ -344,14 +331,13 @@
 | | Set Test Variable | ${cb} | ${framesize}
 | | Set Test Variable | ${eb} | ${framesize}
 | | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Apply startup configuration on all VPP DUTs
-| | When  IPv4 forwarding initialized in a 3-node circular topology
-| | And   IPv4 policer 2r3c-'ca' initialized in a 3-node circular topology
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Apply startup configuration on all VPP DUTs
+| | When IPv4 forwarding initialized in a 3-node circular topology
+| | And IPv4 policer 2r3c-'ca' 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}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc12-9000B-2t2c-ethip4-ip4base-ipolicemarkbase-pdrdisc
 | | [Documentation]
@@ -369,16 +355,14 @@
 | | Set Test Variable | ${cb} | ${framesize}
 | | Set Test Variable | ${eb} | ${framesize}
 | | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Apply startup configuration on all VPP DUTs
-| | When  IPv4 forwarding initialized in a 3-node circular topology
-| | And   IPv4 policer 2r3c-'ca' initialized in a 3-node circular topology
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Apply startup configuration on all VPP DUTs
+| | When IPv4 forwarding initialized in a 3-node circular topology
+| | And IPv4 policer 2r3c-'ca' initialized in a 3-node circular topology
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-IPv4
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
-| | ...                                       | ${perf_pdr_loss_acceptance}
-| | ...                                       | ${perf_pdr_loss_acceptance_type}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
+| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
 
 | tc13-64B-4t4c-ethip4-ip4base-ipolicemarkbase-ndrdisc
 | | [Documentation]
@@ -396,15 +380,14 @@
 | | Set Test Variable | ${cb} | ${framesize}
 | | Set Test Variable | ${eb} | ${framesize}
 | | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | When  IPv4 forwarding initialized in a 3-node circular topology
-| | And   IPv4 policer 2r3c-'ca' initialized in a 3-node circular topology
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | When IPv4 forwarding initialized in a 3-node circular topology
+| | And IPv4 policer 2r3c-'ca' 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}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc14-64B-4t4c-ethip4-ip4base-ipolicemarkbase-pdrdisc
 | | [Documentation]
@@ -422,17 +405,15 @@
 | | Set Test Variable | ${cb} | ${framesize}
 | | Set Test Variable | ${eb} | ${framesize}
 | | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | When  IPv4 forwarding initialized in a 3-node circular topology
-| | And   IPv4 policer 2r3c-'ca' initialized in a 3-node circular topology
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | When IPv4 forwarding initialized in a 3-node circular topology
+| | And IPv4 policer 2r3c-'ca' initialized in a 3-node circular topology
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-IPv4
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
-| | ...                                       | ${perf_pdr_loss_acceptance}
-| | ...                                       | ${perf_pdr_loss_acceptance_type}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
+| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
 
 | tc15-1518B-4t4c-ethip4-ip4base-ipolicemarkbase-ndrdisc
 | | [Documentation]
@@ -450,15 +431,14 @@
 | | Set Test Variable | ${cb} | ${framesize}
 | | Set Test Variable | ${eb} | ${framesize}
 | | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | When  IPv4 forwarding initialized in a 3-node circular topology
-| | And   IPv4 policer 2r3c-'ca' initialized in a 3-node circular topology
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | When IPv4 forwarding initialized in a 3-node circular topology
+| | And IPv4 policer 2r3c-'ca' 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}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc16-1518B-4t4c-ethip4-ip4base-ipolicemarkbase-pdrdisc
 | | [Documentation]
@@ -476,17 +456,15 @@
 | | Set Test Variable | ${cb} | ${framesize}
 | | Set Test Variable | ${eb} | ${framesize}
 | | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | When  IPv4 forwarding initialized in a 3-node circular topology
-| | And   IPv4 policer 2r3c-'ca' initialized in a 3-node circular topology
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | When IPv4 forwarding initialized in a 3-node circular topology
+| | And IPv4 policer 2r3c-'ca' initialized in a 3-node circular topology
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-IPv4
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
-| | ...                                       | ${perf_pdr_loss_acceptance}
-| | ...                                       | ${perf_pdr_loss_acceptance_type}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
+| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
 
 | tc17-9000B-4t4c-ethip4-ip4base-ipolicemarkbase-ndrdisc
 | | [Documentation]
@@ -504,14 +482,13 @@
 | | Set Test Variable | ${cb} | ${framesize}
 | | Set Test Variable | ${eb} | ${framesize}
 | | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Apply startup configuration on all VPP DUTs
-| | When  IPv4 forwarding initialized in a 3-node circular topology
-| | And   IPv4 policer 2r3c-'ca' initialized in a 3-node circular topology
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Apply startup configuration on all VPP DUTs
+| | When IPv4 forwarding initialized in a 3-node circular topology
+| | And IPv4 policer 2r3c-'ca' 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}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc18-9000B-4t4c-ethip4-ip4base-ipolicemarkbase-pdrdisc
 | | [Documentation]
@@ -529,13 +506,11 @@
 | | Set Test Variable | ${cb} | ${framesize}
 | | Set Test Variable | ${eb} | ${framesize}
 | | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Apply startup configuration on all VPP DUTs
-| | When  IPv4 forwarding initialized in a 3-node circular topology
-| | And   IPv4 policer 2r3c-'ca' initialized in a 3-node circular topology
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Apply startup configuration on all VPP DUTs
+| | When IPv4 forwarding initialized in a 3-node circular topology
+| | And IPv4 policer 2r3c-'ca' initialized in a 3-node circular topology
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-IPv4
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
-| | ...                                       | ${perf_pdr_loss_acceptance}
-| | ...                                       | ${perf_pdr_loss_acceptance_type}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
+| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
diff --git a/tests/perf/10ge2p1x520-ethip4-ip4base-ndrchk.robot b/tests/perf/10ge2p1x520-ethip4-ip4base-ndrchk.robot
index 30d3d97591..8f949a39ee 100644
--- a/tests/perf/10ge2p1x520-ethip4-ip4base-ndrchk.robot
+++ b/tests/perf/10ge2p1x520-ethip4-ip4base-ndrchk.robot
@@ -51,6 +51,10 @@
 | ... | TG node interfaces.
 | ... | *[Ref] Applicable standard specifications:* RFC2544.
 
+*** Variables ***
+# Traffic profile:
+| ${traffic_profile} | trex-sl-3n-ethip4-ip4src253
+
 *** Test Cases ***
 | tc01-64B-1t1c-ethip4-ip4base-ndrchk
 | | [Documentation]
@@ -66,7 +70,7 @@
 | | 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 | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv4
+| | ... | ${framesize} | ${traffic_profile}
 
 | tc02-1518B-1t1c-ethip4-ip4base-ndrchk
 | | [Documentation]
@@ -82,7 +86,7 @@
 | | 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 | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv4
+| | ... | ${framesize} | ${traffic_profile}
 
 | tc03-9000B-1t1c-ethip4-ip4base-ndrchk
 | | [Documentation]
@@ -97,7 +101,7 @@
 | | 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 | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv4
+| | ... | ${framesize} | ${traffic_profile}
 
 | tc04-64B-2t2c-ethip4-ip4base-ndrchk
 | | [Documentation]
@@ -113,7 +117,7 @@
 | | 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 | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv4
+| | ... | ${framesize} | ${traffic_profile}
 
 | tc05-1518B-2t2c-ethip4-ip4base-ndrchk
 | | [Documentation]
@@ -129,7 +133,7 @@
 | | 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 | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv4
+| | ... | ${framesize} | ${traffic_profile}
 
 | tc06-9000B-2t2c-ethip4-ip4base-ndrchk
 | | [Documentation]
@@ -144,7 +148,7 @@
 | | 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 | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv4
+| | ... | ${framesize} | ${traffic_profile}
 
 | tc07-64B-4t4c-ethip4-ip4base-ndrchk
 | | [Documentation]
@@ -160,7 +164,7 @@
 | | 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 | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv4
+| | ... | ${framesize} | ${traffic_profile}
 
 | tc08-1518B-4t4c-ethip4-ip4base-ndrchk
 | | [Documentation]
@@ -176,7 +180,7 @@
 | | 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 | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv4
+| | ... | ${framesize} | ${traffic_profile}
 
 | tc08-9000B-4t4c-ethip4-ip4base-ndrchk
 | | [Documentation]
@@ -191,4 +195,4 @@
 | | 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 | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv4
+| | ... | ${framesize} | ${traffic_profile}
diff --git a/tests/perf/10ge2p1x520-ethip4-ip4base-ndrpdrdisc.robot b/tests/perf/10ge2p1x520-ethip4-ip4base-ndrpdrdisc.robot
index 4e9150fde8..8f2bee9aad 100644
--- a/tests/perf/10ge2p1x520-ethip4-ip4base-ndrpdrdisc.robot
+++ b/tests/perf/10ge2p1x520-ethip4-ip4base-ndrpdrdisc.robot
@@ -30,7 +30,7 @@
 | ...
 | Test Setup | Performance test setup
 | Test Teardown | Performance test teardown | ${min_rate}pps | ${framesize}
-| ... | 3-node-IPv4
+| ... | ${traffic_profile}
 | ...
 | Documentation | *RFC2544: Pkt throughput IPv4 routing test cases*
 | ...
@@ -57,6 +57,8 @@
 *** Variables ***
 # X520-DA2 bandwidth limit
 | ${s_limit} | ${10000000000}
+# Traffic profile:
+| ${traffic_profile} | trex-sl-3n-ethip4-ip4src253
 
 *** Test Cases ***
 | tc01-64B-1t1c-ethip4-ip4base-ndrdisc
@@ -72,14 +74,13 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | 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
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | 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}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc02-64B-1t1c-ethip4-ip4base-pdrdisc
 | | [Documentation]
@@ -94,16 +95,14 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | 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
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | 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 PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-IPv4
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
-| | ...                                       | ${perf_pdr_loss_acceptance}
-| | ...                                       | ${perf_pdr_loss_acceptance_type}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
+| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
 
 | tc03-1518B-1t1c-ethip4-ip4base-ndrdisc
 | | [Documentation]
@@ -118,14 +117,13 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | 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
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | 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}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc04-1518B-1t1c-ethip4-ip4base-pdrdisc
 | | [Documentation]
@@ -140,16 +138,14 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | 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
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | 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 PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-IPv4
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
-| | ...                                       | ${perf_pdr_loss_acceptance}
-| | ...                                       | ${perf_pdr_loss_acceptance_type}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
+| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
 
 | tc05-9000B-1t1c-ethip4-ip4base-ndrdisc
 | | [Documentation]
@@ -164,13 +160,12 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Apply startup configuration on all VPP DUTs
-| | And   IPv4 forwarding initialized in a 3-node circular topology
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | 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}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc06-9000B-1t1c-ethip4-ip4base-pdrdisc
 | | [Documentation]
@@ -185,15 +180,13 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Apply startup configuration on all VPP DUTs
-| | And   IPv4 forwarding initialized in a 3-node circular topology
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Apply startup configuration on all VPP DUTs
+| | And IPv4 forwarding initialized in a 3-node circular topology
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-IPv4
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
-| | ...                                       | ${perf_pdr_loss_acceptance}
-| | ...                                       | ${perf_pdr_loss_acceptance_type}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
+| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
 
 | tc07-64B-2t2c-ethip4-ip4base-ndrdisc
 | | [Documentation]
@@ -208,14 +201,13 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | 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
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | 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}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc08-64B-2t2c-ethip4-ip4base-pdrdisc
 | | [Documentation]
@@ -230,16 +222,14 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | 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
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | 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 PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-IPv4
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
-| | ...                                       | ${perf_pdr_loss_acceptance}
-| | ...                                       | ${perf_pdr_loss_acceptance_type}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
+| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
 
 | tc09-1518B-2t2c-ethip4-ip4base-ndrdisc
 | | [Documentation]
@@ -254,14 +244,13 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | 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
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | 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}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc10-1518B-2t2c-ethip4-ip4base-pdrdisc
 | | [Documentation]
@@ -276,16 +265,14 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | 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
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | 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 PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-IPv4
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
-| | ...                                       | ${perf_pdr_loss_acceptance}
-| | ...                                       | ${perf_pdr_loss_acceptance_type}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
+| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
 
 | tc11-9000B-2t2c-ethip4-ip4base-ndrdisc
 | | [Documentation]
@@ -300,13 +287,12 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Apply startup configuration on all VPP DUTs
-| | And   IPv4 forwarding initialized in a 3-node circular topology
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | 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}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc12-9000B-2t2c-ethip4-ip4base-pdrdisc
 | | [Documentation]
@@ -321,15 +307,13 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Apply startup configuration on all VPP DUTs
-| | And   IPv4 forwarding initialized in a 3-node circular topology
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Apply startup configuration on all VPP DUTs
+| | And IPv4 forwarding initialized in a 3-node circular topology
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-IPv4
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
-| | ...                                       | ${perf_pdr_loss_acceptance}
-| | ...                                       | ${perf_pdr_loss_acceptance_type}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
+| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
 
 | tc13-64B-4t4c-ethip4-ip4base-ndrdisc
 | | [Documentation]
@@ -344,14 +328,13 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | 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
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | 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}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc14-64B-4t4c-ethip4-ip4base-pdrdisc
 | | [Documentation]
@@ -366,16 +349,14 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | 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
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | 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 PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-IPv4
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
-| | ...                                       | ${perf_pdr_loss_acceptance}
-| | ...                                       | ${perf_pdr_loss_acceptance_type}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
+| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
 
 | tc15-1518B-4t4c-ethip4-ip4base-ndrdisc
 | | [Documentation]
@@ -390,14 +371,13 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | 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
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | 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}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc16-1518B-4t4c-ethip4-ip4base-pdrdisc
 | | [Documentation]
@@ -412,16 +392,14 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | 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
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | 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 PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-IPv4
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
-| | ...                                       | ${perf_pdr_loss_acceptance}
-| | ...                                       | ${perf_pdr_loss_acceptance_type}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
+| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
 
 | tc17-9000B-4t4c-ethip4-ip4base-ndrdisc
 | | [Documentation]
@@ -436,13 +414,12 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Apply startup configuration on all VPP DUTs
-| | And   IPv4 forwarding initialized in a 3-node circular topology
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | 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}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc18-9000B-4t4c-ethip4-ip4base-pdrdisc
 | | [Documentation]
@@ -457,15 +434,13 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Apply startup configuration on all VPP DUTs
-| | And   IPv4 forwarding initialized in a 3-node circular topology
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Apply startup configuration on all VPP DUTs
+| | And IPv4 forwarding initialized in a 3-node circular topology
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-IPv4
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
-| | ...                                       | ${perf_pdr_loss_acceptance}
-| | ...                                       | ${perf_pdr_loss_acceptance_type}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
+| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
 
 | tc19-IMIX-1t1c-ethip4-ip4base-ndrdisc
 | | [Documentation]
@@ -481,14 +456,13 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | 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
+| | 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}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc20-IMIX-1t1c-ethip4-ip4base-pdrdisc
 | | [Documentation]
@@ -504,13 +478,11 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | 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
+| | 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 PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-IPv4
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
-| | ...                                       | ${perf_pdr_loss_acceptance}
-| | ...                                       | ${perf_pdr_loss_acceptance_type}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
+| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
diff --git a/tests/perf/10ge2p1x520-ethip4-ip4base-snat-ndrpdrdisc.robot b/tests/perf/10ge2p1x520-ethip4-ip4base-snat-ndrpdrdisc.robot
index f5aad07a10..3f97e074cf 100644
--- a/tests/perf/10ge2p1x520-ethip4-ip4base-snat-ndrpdrdisc.robot
+++ b/tests/perf/10ge2p1x520-ethip4-ip4base-snat-ndrpdrdisc.robot
@@ -60,6 +60,8 @@
 *** Variables ***
 # X520-DA2 bandwidth limit
 | ${s_limit} | ${10000000000}
+# Traffic profile:
+| ${traffic_profile} | trex-sl-3n-ethip4udp-1u1p
 
 *** Test Cases ***
 | tc01-64B-1t1c-ethip4-ip4base-snat-1u-1p-ndrdisc
@@ -71,7 +73,7 @@
 | | ... | linerate, step 100kpps.
 | | ...
 | | [Teardown] | Run keywords | Performance test teardown | ${min_rate}pps
-| | ... | ${framesize} | 3-node-IPv4-SNAT-1u-1p
+| | ... | ${framesize} | ${traffic_profile}
 | | ... | AND | Show SNAT verbose | ${dut1}
 | | ... | AND | Show SNAT verbose | ${dut2}
 | | ...
@@ -90,8 +92,8 @@
 | | And Apply startup configuration on all VPP DUTs
 | | When SNAT is initialized in a 3-node circular topology
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | 3-node-IPv4-SNAT-1u-1p | ${min_rate} | ${max_rate}
-| | ... | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc02-64B-1t1c-ethip4-ip4base-snat-1u-1p-pdrdisc
 | | [Documentation]
@@ -102,7 +104,7 @@
 | | ... | linerate, step 100kpps.
 | | ...
 | | [Teardown] | Performance test teardown | ${min_rate}pps | ${framesize}
-| | ... | 3-node-IPv4-SNAT-1u-1p
+| | ... | ${traffic_profile}
 | | ...
 | | [Tags] | 64B | 1T1C | STHREAD | PDRDISC | SKIP_PATCH
 | | ...
@@ -119,8 +121,8 @@
 | | And Apply startup configuration on all VPP DUTs
 | | When SNAT is initialized in a 3-node circular topology
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | 3-node-IPv4-SNAT-1u-1p | ${min_rate} | ${max_rate}
-| | ... | ${threshold} | ${perf_pdr_loss_acceptance}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold} | ${perf_pdr_loss_acceptance}
 | | ... | ${perf_pdr_loss_acceptance_type}
 
 | tc03-1518B-1t1c-ethip4-ip4base-snat-1u-1p-ndrdisc
@@ -132,7 +134,7 @@
 | | ... | linerate, step 100kpps.
 | | ...
 | | [Teardown] | Run keywords | Performance test teardown | ${min_rate}pps
-| | ... | ${framesize} | 3-node-IPv4-SNAT-1u-1p
+| | ... | ${framesize} | ${traffic_profile}
 | | ... | AND | Show SNAT verbose | ${dut1}
 | | ... | AND | Show SNAT verbose | ${dut2}
 | | ...
@@ -151,8 +153,8 @@
 | | And Apply startup configuration on all VPP DUTs
 | | When SNAT is initialized in a 3-node circular topology
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | 3-node-IPv4-SNAT-1u-1p | ${min_rate} | ${max_rate}
-| | ... | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc04-1518B-1t1c-ethip4-ip4base-snat-1u-1p-pdrdisc
 | | [Documentation]
@@ -163,7 +165,7 @@
 | | ... | linerate, step 100kpps.
 | | ...
 | | [Teardown] | Performance test teardown | ${min_rate}pps | ${framesize}
-| | ... | 3-node-IPv4-SNAT-1u-1p
+| | ... | ${traffic_profile}
 | | ...
 | | [Tags] | 1518B | 1T1C | STHREAD | PDRDISC | SKIP_PATCH
 | | ...
@@ -180,8 +182,8 @@
 | | And Apply startup configuration on all VPP DUTs
 | | When SNAT is initialized in a 3-node circular topology
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | 3-node-IPv4-SNAT-1u-1p | ${min_rate} | ${max_rate}
-| | ... | ${threshold} | ${perf_pdr_loss_acceptance}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold} | ${perf_pdr_loss_acceptance}
 | | ... | ${perf_pdr_loss_acceptance_type}
 
 | tc05-IMIX-1t1c-ethip4-ip4base-snat-1u-1p-ndrdisc
@@ -193,7 +195,7 @@
 | | ... | linerate, step 100kpps.
 | | ...
 | | [Teardown] | Run keywords | Performance test teardown | ${min_rate}pps
-| | ... | ${framesize} | 3-node-IPv4-SNAT-1u-1p
+| | ... | ${framesize} | ${traffic_profile}
 | | ... | AND | Show SNAT verbose | ${dut1}
 | | ... | AND | Show SNAT verbose | ${dut2}
 | | ...
@@ -212,8 +214,8 @@
 | | And Apply startup configuration on all VPP DUTs
 | | When SNAT is initialized in a 3-node circular topology
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | 3-node-IPv4-SNAT-1u-1p | ${min_rate} | ${max_rate}
-| | ... | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc06-IMIX-1t1c-ethip4-ip4base-snat-1u-1p-pdrdisc
 | | [Documentation]
@@ -224,7 +226,7 @@
 | | ... | linerate, step 100kpps.
 | | ...
 | | [Teardown] | Performance test teardown | ${min_rate}pps | ${framesize}
-| | ... | 3-node-IPv4-SNAT-1u-1p
+| | ... | ${traffic_profile}
 | | ...
 | | [Tags] | IMIX | 1T1C | STHREAD | PDRDISC | SKIP_PATCH
 | | ...
@@ -241,6 +243,6 @@
 | | And Apply startup configuration on all VPP DUTs
 | | When SNAT is initialized in a 3-node circular topology
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | 3-node-IPv4-SNAT-1u-1p | ${min_rate} | ${max_rate}
-| | ... | ${threshold} | ${perf_pdr_loss_acceptance}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold} | ${perf_pdr_loss_acceptance}
 | | ... | ${perf_pdr_loss_acceptance_type}
diff --git a/tests/perf/10ge2p1x520-ethip4-ip4scale200k-ndrchk.robot b/tests/perf/10ge2p1x520-ethip4-ip4scale200k-ndrchk.robot
index bedf388ddf..aa70f54ed9 100644
--- a/tests/perf/10ge2p1x520-ethip4-ip4scale200k-ndrchk.robot
+++ b/tests/perf/10ge2p1x520-ethip4-ip4scale200k-ndrchk.robot
@@ -46,6 +46,8 @@
 
 *** Variables ***
 | ${rts_per_flow}= | ${100000}
+# Traffic profile:
+| ${traffic_profile} | trex-sl-3n-ethip4-ip4dst${rts_per_flow}
 
 *** Test Cases ***
 | tc01-64B-1t1c-ethip4-ip4scale200k-ndrchk
@@ -63,7 +65,7 @@
 | | And Scale IPv4 forwarding initialized in a 3-node circular topology
 | | ... | ${rts_per_flow}
 | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv4-dst-${rts_per_flow}
+| | ... | ${framesize} | ${traffic_profile}
 
 | tc02-1518B-1t1c-ethip4-ip4scale200k-ndrchk
 | | [Documentation]
@@ -80,7 +82,7 @@
 | | And Scale IPv4 forwarding initialized in a 3-node circular topology
 | | ... | ${rts_per_flow}
 | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv4-dst-${rts_per_flow}
+| | ... | ${framesize} | ${traffic_profile}
 
 | tc03-9000B-1t1c-ethip4-ip4scale200k-ndrchk
 | | [Documentation]
@@ -96,7 +98,7 @@
 | | And Scale IPv4 forwarding initialized in a 3-node circular topology
 | | ... | ${rts_per_flow}
 | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv4-dst-${rts_per_flow}
+| | ... | ${framesize} | ${traffic_profile}
 
 | tc04-64B-2t2c-ethip4-ip4scale200k-ndrchk
 | | [Documentation]
@@ -113,7 +115,7 @@
 | | And Scale IPv4 forwarding initialized in a 3-node circular topology
 | | ... | ${rts_per_flow}
 | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv4-dst-${rts_per_flow}
+| | ... | ${framesize} | ${traffic_profile}
 
 | tc05-1518B-2t2c-ethip4-ip4scale200k-ndrchk
 | | [Documentation]
@@ -130,7 +132,7 @@
 | | And Scale IPv4 forwarding initialized in a 3-node circular topology
 | | ... | ${rts_per_flow}
 | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv4-dst-${rts_per_flow}
+| | ... | ${framesize} | ${traffic_profile}
 
 | tc06-9000B-2t2c-ethip4-ip4scale200k-ndrchk
 | | [Documentation]
@@ -146,7 +148,7 @@
 | | And Scale IPv4 forwarding initialized in a 3-node circular topology
 | | ... | ${rts_per_flow}
 | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv4-dst-${rts_per_flow}
+| | ... | ${framesize} | ${traffic_profile}
 
 | tc07-64B-4t4c-ethip4-ip4scale200k-ndrchk
 | | [Documentation]
@@ -163,7 +165,7 @@
 | | And Scale IPv4 forwarding initialized in a 3-node circular topology
 | | ... | ${rts_per_flow}
 | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv4-dst-${rts_per_flow}
+| | ... | ${framesize} | ${traffic_profile}
 
 | tc08-1518B-4t4c-ethip4-ip4scale200k-ndrchk
 | | [Documentation]
@@ -180,7 +182,7 @@
 | | And Scale IPv4 forwarding initialized in a 3-node circular topology
 | | ... | ${rts_per_flow}
 | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv4-dst-${rts_per_flow}
+| | ... | ${framesize} | ${traffic_profile}
 
 | tc09-9000B-4t4c-ethip4-ip4scale200k-ndrchk
 | | [Documentation]
@@ -196,4 +198,4 @@
 | | And Scale IPv4 forwarding initialized in a 3-node circular topology
 | | ... | ${rts_per_flow}
 | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv4-dst-${rts_per_flow}
+| | ... | ${framesize} | ${traffic_profile}
diff --git a/tests/perf/10ge2p1x520-ethip4-ip4scale200k-ndrpdrdisc.robot b/tests/perf/10ge2p1x520-ethip4-ip4scale200k-ndrpdrdisc.robot
index 31aabe46bf..e133ad65c6 100644
--- a/tests/perf/10ge2p1x520-ethip4-ip4scale200k-ndrpdrdisc.robot
+++ b/tests/perf/10ge2p1x520-ethip4-ip4scale200k-ndrpdrdisc.robot
@@ -23,7 +23,7 @@
 | ...
 | Test Setup | Performance test setup
 | Test Teardown | Performance test teardown | ${min_rate}pps | ${framesize}
-| ... | 3-node-IPv4-dst-${rts_per_flow}
+| ... | ${traffic_profile}
 | ...
 | Documentation | *RFC2544: Pkt throughput IPv4 routing test cases*
 | ...
@@ -52,6 +52,8 @@
 # X520-DA2 bandwidth limit
 | ${s_limit} | ${10000000000}
 | ${rts_per_flow}= | 100000
+# Traffic profile:
+| ${traffic_profile} | trex-sl-3n-ethip4-ip4dst${rts_per_flow}
 
 *** Test Cases ***
 | tc01-64B-1t1c-ethip4-ip4scale200k-ndrdisc
@@ -67,16 +69,14 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | And   Scale IPv4 forwarding initialized in a 3-node circular topology
-| | ...   | ${rts_per_flow}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | And Scale IPv4 forwarding initialized in a 3-node circular topology
+| | ... | ${rts_per_flow}
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max}
-| | ...                                       | 3-node-IPv4-dst-${rts_per_flow}
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc02-64B-1t1c-ethip4-ip4scale200k-pdrdisc
 | | [Documentation]
@@ -91,18 +91,15 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | And   Scale IPv4 forwarding initialized in a 3-node circular topology
-| | ...   | ${rts_per_flow}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | And Scale IPv4 forwarding initialized in a 3-node circular topology
+| | ... | ${rts_per_flow}
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max}
-| | ...                                       | 3-node-IPv4-dst-${rts_per_flow}
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
-| | ...                                       | ${perf_pdr_loss_acceptance}
-| | ...                                       | ${perf_pdr_loss_acceptance_type}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
+| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
 
 | tc03-1518B-1t1c-ethip4-ip4scale200k-ndrdisc
 | | [Documentation]
@@ -117,16 +114,14 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | And   Scale IPv4 forwarding initialized in a 3-node circular topology
-| | ...   | ${rts_per_flow}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | And Scale IPv4 forwarding initialized in a 3-node circular topology
+| | ... | ${rts_per_flow}
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max}
-| | ...                                       | 3-node-IPv4-dst-${rts_per_flow}
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc04-1518B-1t1c-ethip4-ip4scale200k-pdrdisc
 | | [Documentation]
@@ -141,18 +136,15 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | And   Scale IPv4 forwarding initialized in a 3-node circular topology
-| | ...   | ${rts_per_flow}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | And Scale IPv4 forwarding initialized in a 3-node circular topology
+| | ... | ${rts_per_flow}
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max}
-| | ...                                       | 3-node-IPv4-dst-${rts_per_flow}
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
-| | ...                                       | ${perf_pdr_loss_acceptance}
-| | ...                                       | ${perf_pdr_loss_acceptance_type}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
+| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
 
 | tc05-9000B-1t1c-ethip4-ip4scale200k-ndrdisc
 | | [Documentation]
@@ -167,15 +159,13 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Apply startup configuration on all VPP DUTs
-| | And   Scale IPv4 forwarding initialized in a 3-node circular topology
-| | ...   | ${rts_per_flow}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Apply startup configuration on all VPP DUTs
+| | And Scale IPv4 forwarding initialized in a 3-node circular topology
+| | ... | ${rts_per_flow}
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max}
-| | ...                                       | 3-node-IPv4-dst-${rts_per_flow}
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc06-9000B-1t1c-ethip4-ip4scale200k-pdrdisc
 | | [Documentation]
@@ -190,17 +180,14 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Apply startup configuration on all VPP DUTs
-| | And   Scale IPv4 forwarding initialized in a 3-node circular topology
-| | ...   | ${rts_per_flow}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Apply startup configuration on all VPP DUTs
+| | And Scale IPv4 forwarding initialized in a 3-node circular topology
+| | ... | ${rts_per_flow}
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max}
-| | ...                                       | 3-node-IPv4-dst-${rts_per_flow}
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
-| | ...                                       | ${perf_pdr_loss_acceptance}
-| | ...                                       | ${perf_pdr_loss_acceptance_type}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
+| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
 
 | tc07-64B-2t2c-ethip4-ip4scale200k-ndrdisc
 | | [Documentation]
@@ -215,16 +202,14 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | And   Scale IPv4 forwarding initialized in a 3-node circular topology
-| | ...   | ${rts_per_flow}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | And Scale IPv4 forwarding initialized in a 3-node circular topology
+| | ... | ${rts_per_flow}
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max}
-| | ...                                       | 3-node-IPv4-dst-${rts_per_flow}
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc08-64B-2t2c-ethip4-ip4scale200k-pdrdisc
 | | [Documentation]
@@ -239,18 +224,15 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | And   Scale IPv4 forwarding initialized in a 3-node circular topology
-| | ...   | ${rts_per_flow}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | And Scale IPv4 forwarding initialized in a 3-node circular topology
+| | ... | ${rts_per_flow}
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max}
-| | ...                                       | 3-node-IPv4-dst-${rts_per_flow}
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
-| | ...                                       | ${perf_pdr_loss_acceptance}
-| | ...                                       | ${perf_pdr_loss_acceptance_type}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
+| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
 
 | tc09-1518B-2t2c-ethip4-ip4scale200k-ndrdisc
 | | [Documentation]
@@ -265,16 +247,14 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | And   Scale IPv4 forwarding initialized in a 3-node circular topology
-| | ...   | ${rts_per_flow}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | And Scale IPv4 forwarding initialized in a 3-node circular topology
+| | ... | ${rts_per_flow}
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max}
-| | ...                                       | 3-node-IPv4-dst-${rts_per_flow}
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc10-1518B-2t2c-ethip4-ip4scale200k-pdrdisc
 | | [Documentation]
@@ -289,18 +269,15 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | And   Scale IPv4 forwarding initialized in a 3-node circular topology
-| | ...   | ${rts_per_flow}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | And Scale IPv4 forwarding initialized in a 3-node circular topology
+| | ... | ${rts_per_flow}
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max}
-| | ...                                       | 3-node-IPv4-dst-${rts_per_flow}
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
-| | ...                                       | ${perf_pdr_loss_acceptance}
-| | ...                                       | ${perf_pdr_loss_acceptance_type}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
+| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
 
 | tc11-9000B-2t2c-ethip4-ip4scale200k-ndrdisc
 | | [Documentation]
@@ -315,15 +292,13 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Apply startup configuration on all VPP DUTs
-| | And   Scale IPv4 forwarding initialized in a 3-node circular topology
-| | ...   | ${rts_per_flow}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Apply startup configuration on all VPP DUTs
+| | And Scale IPv4 forwarding initialized in a 3-node circular topology
+| | ... | ${rts_per_flow}
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max}
-| | ...                                       | 3-node-IPv4-dst-${rts_per_flow}
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc12-9000B-2t2c-ethip4-ip4scale200k-pdrdisc
 | | [Documentation]
@@ -338,17 +313,14 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Apply startup configuration on all VPP DUTs
-| | And   Scale IPv4 forwarding initialized in a 3-node circular topology
-| | ...   | ${rts_per_flow}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Apply startup configuration on all VPP DUTs
+| | And Scale IPv4 forwarding initialized in a 3-node circular topology
+| | ... | ${rts_per_flow}
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max}
-| | ...                                       | 3-node-IPv4-dst-${rts_per_flow}
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
-| | ...                                       | ${perf_pdr_loss_acceptance}
-| | ...                                       | ${perf_pdr_loss_acceptance_type}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
+| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
 
 | tc13-64B-4t4c-ethip4-ip4scale200k-ndrdisc
 | | [Documentation]
@@ -363,16 +335,14 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | And   Scale IPv4 forwarding initialized in a 3-node circular topology
-| | ...   | ${rts_per_flow}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | And Scale IPv4 forwarding initialized in a 3-node circular topology
+| | ... | ${rts_per_flow}
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max}
-| | ...                                       | 3-node-IPv4-dst-${rts_per_flow}
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc14-64B-4t4c-ethip4-ip4scale200k-pdrdisc
 | | [Documentation]
@@ -387,18 +357,15 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | And   Scale IPv4 forwarding initialized in a 3-node circular topology
-| | ...   | ${rts_per_flow}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | And Scale IPv4 forwarding initialized in a 3-node circular topology
+| | ... | ${rts_per_flow}
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max}
-| | ...                                       | 3-node-IPv4-dst-${rts_per_flow}
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
-| | ...                                       | ${perf_pdr_loss_acceptance}
-| | ...                                       | ${perf_pdr_loss_acceptance_type}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
+| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
 
 | tc15-1518B-4t4c-ethip4-ip4scale200k-ndrdisc
 | | [Documentation]
@@ -413,16 +380,14 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | And   Scale IPv4 forwarding initialized in a 3-node circular topology
-| | ...   | ${rts_per_flow}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | And Scale IPv4 forwarding initialized in a 3-node circular topology
+| | ... | ${rts_per_flow}
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max}
-| | ...                                       | 3-node-IPv4-dst-${rts_per_flow}
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc16-1518B-4t4c-ethip4-ip4scale200k-pdrdisc
 | | [Documentation]
@@ -437,18 +402,15 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | And   Scale IPv4 forwarding initialized in a 3-node circular topology
-| | ...   | ${rts_per_flow}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | And Scale IPv4 forwarding initialized in a 3-node circular topology
+| | ... | ${rts_per_flow}
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max}
-| | ...                                       | 3-node-IPv4-dst-${rts_per_flow}
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
-| | ...                                       | ${perf_pdr_loss_acceptance}
-| | ...                                       | ${perf_pdr_loss_acceptance_type}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
+| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
 
 | tc17-9000B-4t4c-ethip4-ip4scale200k-ndrdisc
 | | [Documentation]
@@ -463,15 +425,13 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Apply startup configuration on all VPP DUTs
-| | And   Scale IPv4 forwarding initialized in a 3-node circular topology
-| | ...   | ${rts_per_flow}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Apply startup configuration on all VPP DUTs
+| | And Scale IPv4 forwarding initialized in a 3-node circular topology
+| | ... | ${rts_per_flow}
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max}
-| | ...                                       | 3-node-IPv4-dst-${rts_per_flow}
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc18-9000B-4t4c-ethip4-ip4scale200k-pdrdisc
 | | [Documentation]
@@ -486,14 +446,11 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Apply startup configuration on all VPP DUTs
-| | And   Scale IPv4 forwarding initialized in a 3-node circular topology
-| | ...   | ${rts_per_flow}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Apply startup configuration on all VPP DUTs
+| | And Scale IPv4 forwarding initialized in a 3-node circular topology
+| | ... | ${rts_per_flow}
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max}
-| | ...                                       | 3-node-IPv4-dst-${rts_per_flow}
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
-| | ...                                       | ${perf_pdr_loss_acceptance}
-| | ...                                       | ${perf_pdr_loss_acceptance_type}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
+| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
diff --git a/tests/perf/10ge2p1x520-ethip4-ip4scale20k-ndrchk.robot b/tests/perf/10ge2p1x520-ethip4-ip4scale20k-ndrchk.robot
index ac08032689..ac8db11afb 100644
--- a/tests/perf/10ge2p1x520-ethip4-ip4scale20k-ndrchk.robot
+++ b/tests/perf/10ge2p1x520-ethip4-ip4scale20k-ndrchk.robot
@@ -46,6 +46,8 @@
 
 *** Variables ***
 | ${rts_per_flow}= | ${10000}
+# Traffic profile:
+| ${traffic_profile} | trex-sl-3n-ethip4-ip4dst${rts_per_flow}
 
 *** Test Cases ***
 | tc01-64B-1t1c-ethip4-ip4scale20k-ndrchk
@@ -63,7 +65,8 @@
 | | And Scale IPv4 forwarding initialized in a 3-node circular topology
 | | ... | ${rts_per_flow}
 | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv4-dst-${rts_per_flow}
+| | ... | ${framesize}
+| | ... | ${traffic_profile}
 
 | tc02-1518B-1t1c-ethip4-ip4scale20k-ndrchk
 | | [Documentation]
@@ -80,7 +83,8 @@
 | | And Scale IPv4 forwarding initialized in a 3-node circular topology
 | | ... | ${rts_per_flow}
 | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv4-dst-${rts_per_flow}
+| | ... | ${framesize}
+| | ... | ${traffic_profile}
 
 | tc03-9000B-1t1c-ethip4-ip4scale20k-ndrchk
 | | [Documentation]
@@ -96,7 +100,8 @@
 | | And Scale IPv4 forwarding initialized in a 3-node circular topology
 | | ... | ${rts_per_flow}
 | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv4-dst-${rts_per_flow}
+| | ... | ${framesize}
+| | ... | ${traffic_profile}
 
 | tc04-64B-2t2c-ethip4-ip4scale20k-ndrchk
 | | [Documentation]
@@ -113,7 +118,8 @@
 | | And Scale IPv4 forwarding initialized in a 3-node circular topology
 | | ... | ${rts_per_flow}
 | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv4-dst-${rts_per_flow}
+| | ... | ${framesize}
+| | ... | ${traffic_profile}
 
 | tc05-1518B-2t2c-ethip4-ip4scale20k-ndrchk
 | | [Documentation]
@@ -130,7 +136,8 @@
 | | And Scale IPv4 forwarding initialized in a 3-node circular topology
 | | ... | ${rts_per_flow}
 | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv4-dst-${rts_per_flow}
+| | ... | ${framesize}
+| | ... | ${traffic_profile}
 
 | tc06-9000B-2t2c-ethip4-ip4scale20k-ndrchk
 | | [Documentation]
@@ -146,7 +153,8 @@
 | | And Scale IPv4 forwarding initialized in a 3-node circular topology
 | | ... | ${rts_per_flow}
 | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv4-dst-${rts_per_flow}
+| | ... | ${framesize}
+| | ... | ${traffic_profile}
 
 | tc07-64B-4t4c-ethip4-ip4scale20k-ndrchk
 | | [Documentation]
@@ -163,7 +171,8 @@
 | | And Scale IPv4 forwarding initialized in a 3-node circular topology
 | | ... | ${rts_per_flow}
 | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv4-dst-${rts_per_flow}
+| | ... | ${framesize}
+| | ... | ${traffic_profile}
 
 | tc08-1518B-4t4c-ethip4-ip4scale20k-ndrchk
 | | [Documentation]
@@ -180,7 +189,8 @@
 | | And Scale IPv4 forwarding initialized in a 3-node circular topology
 | | ... | ${rts_per_flow}
 | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv4-dst-${rts_per_flow}
+| | ... | ${framesize}
+| | ... | ${traffic_profile}
 
 | tc09-9000B-4t4c-ethip4-ip4scale20k-ndrchk
 | | [Documentation]
@@ -196,4 +206,5 @@
 | | And Scale IPv4 forwarding initialized in a 3-node circular topology
 | | ... | ${rts_per_flow}
 | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv4-dst-${rts_per_flow}
+| | ... | ${framesize}
+| | ... | ${traffic_profile}
diff --git a/tests/perf/10ge2p1x520-ethip4-ip4scale20k-ndrpdrdisc.robot b/tests/perf/10ge2p1x520-ethip4-ip4scale20k-ndrpdrdisc.robot
index 2b907c25e6..1b68b96b15 100644
--- a/tests/perf/10ge2p1x520-ethip4-ip4scale20k-ndrpdrdisc.robot
+++ b/tests/perf/10ge2p1x520-ethip4-ip4scale20k-ndrpdrdisc.robot
@@ -23,7 +23,7 @@
 | ...
 | Test Setup | Performance test setup
 | Test Teardown | Performance test teardown | ${min_rate}pps | ${framesize}
-| ... | 3-node-IPv4-dst-${rts_per_flow}
+| ... | ${traffic_profile}
 | ...
 | Documentation | *RFC2544: Pkt throughput IPv4 routing test cases*
 | ...
@@ -52,6 +52,8 @@
 # X520-DA2 bandwidth limit
 | ${s_limit} | ${10000000000}
 | ${rts_per_flow}= | ${10000}
+# Traffic profile:
+| ${traffic_profile} | trex-sl-3n-ethip4-ip4dst${rts_per_flow}
 
 *** Test Cases ***
 | tc01-64B-1t1c-ethip4-ip4scale20k-ndrdisc
@@ -67,16 +69,14 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | And   Scale IPv4 forwarding initialized in a 3-node circular topology
-| | ...   | ${rts_per_flow}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | And Scale IPv4 forwarding initialized in a 3-node circular topology
+| | ... | ${rts_per_flow}
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max}
-| | ...                                       | 3-node-IPv4-dst-${rts_per_flow}
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc02-64B-1t1c-ethip4-ip4scale20k-pdrdisc
 | | [Documentation]
@@ -91,18 +91,15 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | And   Scale IPv4 forwarding initialized in a 3-node circular topology
-| | ...   | ${rts_per_flow}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | And Scale IPv4 forwarding initialized in a 3-node circular topology
+| | ... | ${rts_per_flow}
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max}
-| | ...                                       | 3-node-IPv4-dst-${rts_per_flow}
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
-| | ...                                       | ${perf_pdr_loss_acceptance}
-| | ...                                       | ${perf_pdr_loss_acceptance_type}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
+| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
 
 | tc03-1518B-1t1c-ethip4-ip4scale20k-ndrdisc
 | | [Documentation]
@@ -117,16 +114,14 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | And   Scale IPv4 forwarding initialized in a 3-node circular topology
-| | ...   | ${rts_per_flow}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | And Scale IPv4 forwarding initialized in a 3-node circular topology
+| | ... | ${rts_per_flow}
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max}
-| | ...                                       | 3-node-IPv4-dst-${rts_per_flow}
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc04-1518B-1t1c-ethip4-ip4scale20k-pdrdisc
 | | [Documentation]
@@ -141,18 +136,15 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | And   Scale IPv4 forwarding initialized in a 3-node circular topology
-| | ...   | ${rts_per_flow}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | And Scale IPv4 forwarding initialized in a 3-node circular topology
+| | ... | ${rts_per_flow}
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max}
-| | ...                                       | 3-node-IPv4-dst-${rts_per_flow}
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
-| | ...                                       | ${perf_pdr_loss_acceptance}
-| | ...                                       | ${perf_pdr_loss_acceptance_type}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
+| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
 
 | tc05-9000B-1t1c-ethip4-ip4scale20k-ndrdisc
 | | [Documentation]
@@ -167,15 +159,13 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Apply startup configuration on all VPP DUTs
-| | And   Scale IPv4 forwarding initialized in a 3-node circular topology
-| | ...   | ${rts_per_flow}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Apply startup configuration on all VPP DUTs
+| | And Scale IPv4 forwarding initialized in a 3-node circular topology
+| | ... | ${rts_per_flow}
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max}
-| | ...                                       | 3-node-IPv4-dst-${rts_per_flow}
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc06-9000B-1t1c-ethip4-ip4scale20k-pdrdisc
 | | [Documentation]
@@ -190,17 +180,14 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Apply startup configuration on all VPP DUTs
-| | And   Scale IPv4 forwarding initialized in a 3-node circular topology
-| | ...   | ${rts_per_flow}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Apply startup configuration on all VPP DUTs
+| | And Scale IPv4 forwarding initialized in a 3-node circular topology
+| | ... | ${rts_per_flow}
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max}
-| | ...                                       | 3-node-IPv4-dst-${rts_per_flow}
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
-| | ...                                       | ${perf_pdr_loss_acceptance}
-| | ...                                       | ${perf_pdr_loss_acceptance_type}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
+| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
 
 | tc07-64B-2t2c-ethip4-ip4scale20k-ndrdisc
 | | [Documentation]
@@ -215,16 +202,14 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | And   Scale IPv4 forwarding initialized in a 3-node circular topology
-| | ...   | ${rts_per_flow}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | And Scale IPv4 forwarding initialized in a 3-node circular topology
+| | ... | ${rts_per_flow}
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max}
-| | ...                                       | 3-node-IPv4-dst-${rts_per_flow}
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc08-64B-2t2c-ethip4-ip4scale20k-pdrdisc
 | | [Documentation]
@@ -239,18 +224,15 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | And   Scale IPv4 forwarding initialized in a 3-node circular topology
-| | ...   | ${rts_per_flow}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | And Scale IPv4 forwarding initialized in a 3-node circular topology
+| | ... | ${rts_per_flow}
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max}
-| | ...                                       | 3-node-IPv4-dst-${rts_per_flow}
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
-| | ...                                       | ${perf_pdr_loss_acceptance}
-| | ...                                       | ${perf_pdr_loss_acceptance_type}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
+| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
 
 | tc09-1518B-2t2c-ethip4-ip4scale20k-ndrdisc
 | | [Documentation]
@@ -265,16 +247,14 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | And   Scale IPv4 forwarding initialized in a 3-node circular topology
-| | ...   | ${rts_per_flow}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | And Scale IPv4 forwarding initialized in a 3-node circular topology
+| | ... | ${rts_per_flow}
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max}
-| | ...                                       | 3-node-IPv4-dst-${rts_per_flow}
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc10-1518B-2t2c-ethip4-ip4scale20k-pdrdisc
 | | [Documentation]
@@ -289,18 +269,15 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | And   Scale IPv4 forwarding initialized in a 3-node circular topology
-| | ...   | ${rts_per_flow}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | And Scale IPv4 forwarding initialized in a 3-node circular topology
+| | ... | ${rts_per_flow}
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max}
-| | ...                                       | 3-node-IPv4-dst-${rts_per_flow}
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
-| | ...                                       | ${perf_pdr_loss_acceptance}
-| | ...                                       | ${perf_pdr_loss_acceptance_type}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
+| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
 
 | tc11-9000B-2t2c-ethip4-ip4scale20k-ndrdisc
 | | [Documentation]
@@ -315,15 +292,13 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Apply startup configuration on all VPP DUTs
-| | And   Scale IPv4 forwarding initialized in a 3-node circular topology
-| | ...   | ${rts_per_flow}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Apply startup configuration on all VPP DUTs
+| | And Scale IPv4 forwarding initialized in a 3-node circular topology
+| | ... | ${rts_per_flow}
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max}
-| | ...                                       | 3-node-IPv4-dst-${rts_per_flow}
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc12-9000B-2t2c-ethip4-ip4scale20k-pdrdisc
 | | [Documentation]
@@ -338,17 +313,14 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Apply startup configuration on all VPP DUTs
-| | And   Scale IPv4 forwarding initialized in a 3-node circular topology
-| | ...   | ${rts_per_flow}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Apply startup configuration on all VPP DUTs
+| | And Scale IPv4 forwarding initialized in a 3-node circular topology
+| | ... | ${rts_per_flow}
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max}
-| | ...                                       | 3-node-IPv4-dst-${rts_per_flow}
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
-| | ...                                       | ${perf_pdr_loss_acceptance}
-| | ...                                       | ${perf_pdr_loss_acceptance_type}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
+| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
 
 | tc13-64B-4t4c-ethip4-ip4scale20k-ndrdisc
 | | [Documentation]
@@ -363,16 +335,14 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | And   Scale IPv4 forwarding initialized in a 3-node circular topology
-| | ...   | ${rts_per_flow}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | And Scale IPv4 forwarding initialized in a 3-node circular topology
+| | ... | ${rts_per_flow}
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max}
-| | ...                                       | 3-node-IPv4-dst-${rts_per_flow}
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc14-64B-4t4c-ethip4-ip4scale20k-pdrdisc
 | | [Documentation]
@@ -387,18 +357,15 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | And   Scale IPv4 forwarding initialized in a 3-node circular topology
-| | ...   | ${rts_per_flow}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | And Scale IPv4 forwarding initialized in a 3-node circular topology
+| | ... | ${rts_per_flow}
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max}
-| | ...                                       | 3-node-IPv4-dst-${rts_per_flow}
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
-| | ...                                       | ${perf_pdr_loss_acceptance}
-| | ...                                       | ${perf_pdr_loss_acceptance_type}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
+| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
 
 | tc15-1518B-4t4c-ethip4-ip4scale20k-ndrdisc
 | | [Documentation]
@@ -413,16 +380,14 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | And   Scale IPv4 forwarding initialized in a 3-node circular topology
-| | ...   | ${rts_per_flow}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | And Scale IPv4 forwarding initialized in a 3-node circular topology
+| | ... | ${rts_per_flow}
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max}
-| | ...                                       | 3-node-IPv4-dst-${rts_per_flow}
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc16-1518B-4t4c-ethip4-ip4scale20k-pdrdisc
 | | [Documentation]
@@ -437,18 +402,15 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | And   Scale IPv4 forwarding initialized in a 3-node circular topology
-| | ...   | ${rts_per_flow}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | And Scale IPv4 forwarding initialized in a 3-node circular topology
+| | ... | ${rts_per_flow}
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max}
-| | ...                                       | 3-node-IPv4-dst-${rts_per_flow}
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
-| | ...                                       | ${perf_pdr_loss_acceptance}
-| | ...                                       | ${perf_pdr_loss_acceptance_type}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
+| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
 
 | tc17-9000B-4t4c-ethip4-ip4scale20k-ndrdisc
 | | [Documentation]
@@ -463,15 +425,13 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Apply startup configuration on all VPP DUTs
-| | And   Scale IPv4 forwarding initialized in a 3-node circular topology
-| | ...   | ${rts_per_flow}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Apply startup configuration on all VPP DUTs
+| | And Scale IPv4 forwarding initialized in a 3-node circular topology
+| | ... | ${rts_per_flow}
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max}
-| | ...                                       | 3-node-IPv4-dst-${rts_per_flow}
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc18-9000B-4t4c-ethip4-ip4scale20k-pdrdisc
 | | [Documentation]
@@ -486,14 +446,11 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Apply startup configuration on all VPP DUTs
-| | And   Scale IPv4 forwarding initialized in a 3-node circular topology
-| | ...   | ${rts_per_flow}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Apply startup configuration on all VPP DUTs
+| | And Scale IPv4 forwarding initialized in a 3-node circular topology
+| | ... | ${rts_per_flow}
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max}
-| | ...                                       | 3-node-IPv4-dst-${rts_per_flow}
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
-| | ...                                       | ${perf_pdr_loss_acceptance}
-| | ...                                       | ${perf_pdr_loss_acceptance_type}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
+| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
diff --git a/tests/perf/10ge2p1x520-ethip4-ip4scale2m-ndrchk.robot b/tests/perf/10ge2p1x520-ethip4-ip4scale2m-ndrchk.robot
index 3a913e58ca..282f0f17c3 100644
--- a/tests/perf/10ge2p1x520-ethip4-ip4scale2m-ndrchk.robot
+++ b/tests/perf/10ge2p1x520-ethip4-ip4scale2m-ndrchk.robot
@@ -46,6 +46,8 @@
 
 *** Variables ***
 | ${rts_per_flow}= | ${1000000}
+# Traffic profile:
+| ${traffic_profile} | trex-sl-3n-ethip4-ip4dst${rts_per_flow}
 
 *** Test Cases ***
 | tc01-64B-1t1c-ethip4-ip4scale2m-ndrchk
@@ -64,7 +66,8 @@
 | | And Scale IPv4 forwarding initialized in a 3-node circular topology
 | | ... | ${rts_per_flow}
 | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv4-dst-${rts_per_flow}
+| | ... | ${framesize}
+| | ... | ${traffic_profile}
 
 | tc02-1518B-1t1c-ethip4-ip4scale2m-ndrchk
 | | [Documentation]
@@ -82,7 +85,8 @@
 | | And Scale IPv4 forwarding initialized in a 3-node circular topology
 | | ... | ${rts_per_flow}
 | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv4-dst-${rts_per_flow}
+| | ... | ${framesize}
+| | ... | ${traffic_profile}
 
 | tc03-9000B-1t1c-ethip4-ip4scale2m-ndrchk
 | | [Documentation]
@@ -99,7 +103,8 @@
 | | And Scale IPv4 forwarding initialized in a 3-node circular topology
 | | ... | ${rts_per_flow}
 | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv4-dst-${rts_per_flow}
+| | ... | ${framesize}
+| | ... | ${traffic_profile}
 
 | tc04-64B-2t2c-ethip4-ip4scale2m-ndrchk
 | | [Documentation]
@@ -117,7 +122,8 @@
 | | And Scale IPv4 forwarding initialized in a 3-node circular topology
 | | ... | ${rts_per_flow}
 | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv4-dst-${rts_per_flow}
+| | ... | ${framesize}
+| | ... | ${traffic_profile}
 
 | tc05-1518B-2t2c-ethip4-ip4scale2m-ndrchk
 | | [Documentation]
@@ -135,7 +141,8 @@
 | | And Scale IPv4 forwarding initialized in a 3-node circular topology
 | | ... | ${rts_per_flow}
 | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv4-dst-${rts_per_flow}
+| | ... | ${framesize}
+| | ... | ${traffic_profile}
 
 | tc06-9000B-2t2c-ethip4-ip4scale2m-ndrchk
 | | [Documentation]
@@ -152,7 +159,8 @@
 | | And Scale IPv4 forwarding initialized in a 3-node circular topology
 | | ... | ${rts_per_flow}
 | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv4-dst-${rts_per_flow}
+| | ... | ${framesize}
+| | ... | ${traffic_profile}
 
 | tc07-64B-4t4c-ethip4-ip4scale2m-ndrchk
 | | [Documentation]
@@ -170,7 +178,8 @@
 | | And Scale IPv4 forwarding initialized in a 3-node circular topology
 | | ... | ${rts_per_flow}
 | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv4-dst-${rts_per_flow}
+| | ... | ${framesize}
+| | ... | ${traffic_profile}
 
 | tc08-1518B-4t4c-ethip4-ip4scale2m-ndrchk
 | | [Documentation]
@@ -188,7 +197,8 @@
 | | And Scale IPv4 forwarding initialized in a 3-node circular topology
 | | ... | ${rts_per_flow}
 | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv4-dst-${rts_per_flow}
+| | ... | ${framesize}
+| | ... | ${traffic_profile}
 
 | tc09-9000B-4t4c-ethip4-ip4scale2m-ndrchk
 | | [Documentation]
@@ -205,4 +215,5 @@
 | | And Scale IPv4 forwarding initialized in a 3-node circular topology
 | | ... | ${rts_per_flow}
 | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv4-dst-${rts_per_flow}
+| | ... | ${framesize}
+| | ... | ${traffic_profile}
diff --git a/tests/perf/10ge2p1x520-ethip4-ip4scale2m-ndrpdrdisc.robot b/tests/perf/10ge2p1x520-ethip4-ip4scale2m-ndrpdrdisc.robot
index 839b335c33..c179ee4cba 100644
--- a/tests/perf/10ge2p1x520-ethip4-ip4scale2m-ndrpdrdisc.robot
+++ b/tests/perf/10ge2p1x520-ethip4-ip4scale2m-ndrpdrdisc.robot
@@ -23,7 +23,7 @@
 | ...
 | Test Setup | Performance test setup
 | Test Teardown | Performance test teardown | ${min_rate}pps | ${framesize}
-| ... | 3-node-IPv4-dst-${rts_per_flow}
+| ... | ${traffic_profile}
 | ...
 | Documentation | *RFC2544: Pkt throughput IPv4 routing test cases*
 | ...
@@ -52,6 +52,8 @@
 # X520-DA2 bandwidth limit
 | ${s_limit} | ${10000000000}
 | ${rts_per_flow}= | ${1000000}
+# Traffic profile:
+| ${traffic_profile} | trex-sl-3n-ethip4-ip4dst${rts_per_flow}
 
 *** Test Cases ***
 | tc01-64B-1t1c-ethip4-ip4scale2m-ndrdisc
@@ -67,17 +69,15 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Add Heapsize Config to all DUTs | 3G
-| | And   Apply startup configuration on all VPP DUTs
-| | And   Scale IPv4 forwarding initialized in a 3-node circular topology
-| | ...   | ${rts_per_flow}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Add Heapsize Config to all DUTs | 3G
+| | And Apply startup configuration on all VPP DUTs
+| | And Scale IPv4 forwarding initialized in a 3-node circular topology
+| | ... | ${rts_per_flow}
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max}
-| | ...                                       | 3-node-IPv4-dst-${rts_per_flow}
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc02-64B-1t1c-ethip4-ip4scale2m-pdrdisc
 | | [Documentation]
@@ -92,19 +92,16 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Add Heapsize Config to all DUTs | 3G
-| | And   Apply startup configuration on all VPP DUTs
-| | And   Scale IPv4 forwarding initialized in a 3-node circular topology
-| | ...   | ${rts_per_flow}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Add Heapsize Config to all DUTs | 3G
+| | And Apply startup configuration on all VPP DUTs
+| | And Scale IPv4 forwarding initialized in a 3-node circular topology
+| | ... | ${rts_per_flow}
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max}
-| | ...                                       | 3-node-IPv4-dst-${rts_per_flow}
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
-| | ...                                       | ${perf_pdr_loss_acceptance}
-| | ...                                       | ${perf_pdr_loss_acceptance_type}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
+| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
 
 | tc03-1518B-1t1c-ethip4-ip4scale2m-ndrdisc
 | | [Documentation]
@@ -119,17 +116,15 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Add Heapsize Config to all DUTs | 3G
-| | And   Apply startup configuration on all VPP DUTs
-| | And   Scale IPv4 forwarding initialized in a 3-node circular topology
-| | ...   | ${rts_per_flow}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Add Heapsize Config to all DUTs | 3G
+| | And Apply startup configuration on all VPP DUTs
+| | And Scale IPv4 forwarding initialized in a 3-node circular topology
+| | ... | ${rts_per_flow}
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max}
-| | ...                                       | 3-node-IPv4-dst-${rts_per_flow}
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc04-1518B-1t1c-ethip4-ip4scale2m-pdrdisc
 | | [Documentation]
@@ -144,19 +139,16 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Add Heapsize Config to all DUTs | 3G
-| | And   Apply startup configuration on all VPP DUTs
-| | And   Scale IPv4 forwarding initialized in a 3-node circular topology
-| | ...   | ${rts_per_flow}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Add Heapsize Config to all DUTs | 3G
+| | And Apply startup configuration on all VPP DUTs
+| | And Scale IPv4 forwarding initialized in a 3-node circular topology
+| | ... | ${rts_per_flow}
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max}
-| | ...                                       | 3-node-IPv4-dst-${rts_per_flow}
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
-| | ...                                       | ${perf_pdr_loss_acceptance}
-| | ...                                       | ${perf_pdr_loss_acceptance_type}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
+| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
 
 | tc05-9000B-1t1c-ethip4-ip4scale2m-ndrdisc
 | | [Documentation]
@@ -171,16 +163,14 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add Heapsize Config to all DUTs | 3G
-| | And   Apply startup configuration on all VPP DUTs
-| | And   Scale IPv4 forwarding initialized in a 3-node circular topology
-| | ...   | ${rts_per_flow}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add Heapsize Config to all DUTs | 3G
+| | And Apply startup configuration on all VPP DUTs
+| | And Scale IPv4 forwarding initialized in a 3-node circular topology
+| | ... | ${rts_per_flow}
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max}
-| | ...                                       | 3-node-IPv4-dst-${rts_per_flow}
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc06-9000B-1t1c-ethip4-ip4scale2m-pdrdisc
 | | [Documentation]
@@ -195,18 +185,15 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add Heapsize Config to all DUTs | 3G
-| | And   Apply startup configuration on all VPP DUTs
-| | And   Scale IPv4 forwarding initialized in a 3-node circular topology
-| | ...   | ${rts_per_flow}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add Heapsize Config to all DUTs | 3G
+| | And Apply startup configuration on all VPP DUTs
+| | And Scale IPv4 forwarding initialized in a 3-node circular topology
+| | ... | ${rts_per_flow}
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max}
-| | ...                                       | 3-node-IPv4-dst-${rts_per_flow}
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
-| | ...                                       | ${perf_pdr_loss_acceptance}
-| | ...                                       | ${perf_pdr_loss_acceptance_type}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
+| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
 
 | tc07-64B-2t2c-ethip4-ip4scale2m-ndrdisc
 | | [Documentation]
@@ -221,17 +208,15 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Add Heapsize Config to all DUTs | 3G
-| | And   Apply startup configuration on all VPP DUTs
-| | And   Scale IPv4 forwarding initialized in a 3-node circular topology
-| | ...   | ${rts_per_flow}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Add Heapsize Config to all DUTs | 3G
+| | And Apply startup configuration on all VPP DUTs
+| | And Scale IPv4 forwarding initialized in a 3-node circular topology
+| | ... | ${rts_per_flow}
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max}
-| | ...                                       | 3-node-IPv4-dst-${rts_per_flow}
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc08-64B-2t2c-ethip4-ip4scale2m-pdrdisc
 | | [Documentation]
@@ -246,19 +231,16 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Add Heapsize Config to all DUTs | 3G
-| | And   Apply startup configuration on all VPP DUTs
-| | And   Scale IPv4 forwarding initialized in a 3-node circular topology
-| | ...   | ${rts_per_flow}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Add Heapsize Config to all DUTs | 3G
+| | And Apply startup configuration on all VPP DUTs
+| | And Scale IPv4 forwarding initialized in a 3-node circular topology
+| | ... | ${rts_per_flow}
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max}
-| | ...                                       | 3-node-IPv4-dst-${rts_per_flow}
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
-| | ...                                       | ${perf_pdr_loss_acceptance}
-| | ...                                       | ${perf_pdr_loss_acceptance_type}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
+| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
 
 | tc09-1518B-2t2c-ethip4-ip4scale2m-ndrdisc
 | | [Documentation]
@@ -273,17 +255,15 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Add Heapsize Config to all DUTs | 3G
-| | And   Apply startup configuration on all VPP DUTs
-| | And   Scale IPv4 forwarding initialized in a 3-node circular topology
-| | ...   | ${rts_per_flow}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Add Heapsize Config to all DUTs | 3G
+| | And Apply startup configuration on all VPP DUTs
+| | And Scale IPv4 forwarding initialized in a 3-node circular topology
+| | ... | ${rts_per_flow}
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max}
-| | ...                                       | 3-node-IPv4-dst-${rts_per_flow}
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc10-1518B-2t2c-ethip4-ip4scale2m-pdrdisc
 | | [Documentation]
@@ -298,19 +278,16 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Add Heapsize Config to all DUTs | 3G
-| | And   Apply startup configuration on all VPP DUTs
-| | And   Scale IPv4 forwarding initialized in a 3-node circular topology
-| | ...   | ${rts_per_flow}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Add Heapsize Config to all DUTs | 3G
+| | And Apply startup configuration on all VPP DUTs
+| | And Scale IPv4 forwarding initialized in a 3-node circular topology
+| | ... | ${rts_per_flow}
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max}
-| | ...                                       | 3-node-IPv4-dst-${rts_per_flow}
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
-| | ...                                       | ${perf_pdr_loss_acceptance}
-| | ...                                       | ${perf_pdr_loss_acceptance_type}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
+| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
 
 | tc11-9000B-2t2c-ethip4-ip4scale2m-ndrdisc
 | | [Documentation]
@@ -325,16 +302,14 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add Heapsize Config to all DUTs | 3G
-| | And   Apply startup configuration on all VPP DUTs
-| | And   Scale IPv4 forwarding initialized in a 3-node circular topology
-| | ...   | ${rts_per_flow}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add Heapsize Config to all DUTs | 3G
+| | And Apply startup configuration on all VPP DUTs
+| | And Scale IPv4 forwarding initialized in a 3-node circular topology
+| | ... | ${rts_per_flow}
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max}
-| | ...                                       | 3-node-IPv4-dst-${rts_per_flow}
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc12-9000B-2t2c-ethip4-ip4scale2m-pdrdisc
 | | [Documentation]
@@ -349,18 +324,15 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add Heapsize Config to all DUTs | 3G
-| | And   Apply startup configuration on all VPP DUTs
-| | And   Scale IPv4 forwarding initialized in a 3-node circular topology
-| | ...   | ${rts_per_flow}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add Heapsize Config to all DUTs | 3G
+| | And Apply startup configuration on all VPP DUTs
+| | And Scale IPv4 forwarding initialized in a 3-node circular topology
+| | ... | ${rts_per_flow}
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max}
-| | ...                                       | 3-node-IPv4-dst-${rts_per_flow}
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
-| | ...                                       | ${perf_pdr_loss_acceptance}
-| | ...                                       | ${perf_pdr_loss_acceptance_type}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
+| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
 
 | tc13-64B-4t4c-ethip4-ip4scale2m-ndrdisc
 | | [Documentation]
@@ -375,17 +347,15 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Add Heapsize Config to all DUTs | 3G
-| | And   Apply startup configuration on all VPP DUTs
-| | And   Scale IPv4 forwarding initialized in a 3-node circular topology
-| | ...   | ${rts_per_flow}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Add Heapsize Config to all DUTs | 3G
+| | And Apply startup configuration on all VPP DUTs
+| | And Scale IPv4 forwarding initialized in a 3-node circular topology
+| | ... | ${rts_per_flow}
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max}
-| | ...                                       | 3-node-IPv4-dst-${rts_per_flow}
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc14-64B-4t4c-ethip4-ip4scale2m-pdrdisc
 | | [Documentation]
@@ -400,19 +370,16 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Add Heapsize Config to all DUTs | 3G
-| | And   Apply startup configuration on all VPP DUTs
-| | And   Scale IPv4 forwarding initialized in a 3-node circular topology
-| | ...   | ${rts_per_flow}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Add Heapsize Config to all DUTs | 3G
+| | And Apply startup configuration on all VPP DUTs
+| | And Scale IPv4 forwarding initialized in a 3-node circular topology
+| | ... | ${rts_per_flow}
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max}
-| | ...                                       | 3-node-IPv4-dst-${rts_per_flow}
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
-| | ...                                       | ${perf_pdr_loss_acceptance}
-| | ...                                       | ${perf_pdr_loss_acceptance_type}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
+| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
 
 | tc15-1518B-4t4c-ethip4-ip4scale2m-ndrdisc
 | | [Documentation]
@@ -427,17 +394,15 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Add Heapsize Config to all DUTs | 3G
-| | And   Apply startup configuration on all VPP DUTs
-| | And   Scale IPv4 forwarding initialized in a 3-node circular topology
-| | ...   | ${rts_per_flow}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Add Heapsize Config to all DUTs | 3G
+| | And Apply startup configuration on all VPP DUTs
+| | And Scale IPv4 forwarding initialized in a 3-node circular topology
+| | ... | ${rts_per_flow}
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max}
-| | ...                                       | 3-node-IPv4-dst-${rts_per_flow}
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc16-1518B-4t4c-ethip4-ip4scale2m-pdrdisc
 | | [Documentation]
@@ -452,19 +417,16 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Add Heapsize Config to all DUTs | 3G
-| | And   Apply startup configuration on all VPP DUTs
-| | And   Scale IPv4 forwarding initialized in a 3-node circular topology
-| | ...   | ${rts_per_flow}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Add Heapsize Config to all DUTs | 3G
+| | And Apply startup configuration on all VPP DUTs
+| | And Scale IPv4 forwarding initialized in a 3-node circular topology
+| | ... | ${rts_per_flow}
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max}
-| | ...                                       | 3-node-IPv4-dst-${rts_per_flow}
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
-| | ...                                       | ${perf_pdr_loss_acceptance}
-| | ...                                       | ${perf_pdr_loss_acceptance_type}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
+| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
 
 | tc17-9000B-4t4c-ethip4-ip4scale2m-ndrdisc
 | | [Documentation]
@@ -479,16 +441,14 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add Heapsize Config to all DUTs | 3G
-| | And   Apply startup configuration on all VPP DUTs
-| | And   Scale IPv4 forwarding initialized in a 3-node circular topology
-| | ...   | ${rts_per_flow}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add Heapsize Config to all DUTs | 3G
+| | And Apply startup configuration on all VPP DUTs
+| | And Scale IPv4 forwarding initialized in a 3-node circular topology
+| | ... | ${rts_per_flow}
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max}
-| | ...                                       | 3-node-IPv4-dst-${rts_per_flow}
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc18-9000B-4t4c-ethip4-ip4scale2m-pdrdisc
 | | [Documentation]
@@ -503,15 +463,12 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add Heapsize Config to all DUTs | 3G
-| | And   Apply startup configuration on all VPP DUTs
-| | And   Scale IPv4 forwarding initialized in a 3-node circular topology
-| | ...   | ${rts_per_flow}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add Heapsize Config to all DUTs | 3G
+| | And Apply startup configuration on all VPP DUTs
+| | And Scale IPv4 forwarding initialized in a 3-node circular topology
+| | ... | ${rts_per_flow}
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max}
-| | ...                                       | 3-node-IPv4-dst-${rts_per_flow}
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
-| | ...                                       | ${perf_pdr_loss_acceptance}
-| | ...                                       | ${perf_pdr_loss_acceptance_type}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
+| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
diff --git a/tests/perf/10ge2p1x520-ethip4lispip4-ip4base-ndrchk.robot b/tests/perf/10ge2p1x520-ethip4lispip4-ip4base-ndrchk.robot
index b474732bf0..db82ce01ea 100644
--- a/tests/perf/10ge2p1x520-ethip4lispip4-ip4base-ndrchk.robot
+++ b/tests/perf/10ge2p1x520-ethip4lispip4-ip4base-ndrchk.robot
@@ -47,6 +47,10 @@
 | ... | IP protocol=61 and generated payload.
 | ... | *[Ref] Applicable standard specifications:* RFC2544.
 
+*** Variables ***
+# Traffic profile:
+| ${traffic_profile} | trex-sl-3n-ethip4-ip4src253
+
 *** Test Cases ***
 | tc01-64B-1t1c-ethip4lispip4-ip4base-ndrchk
 | | [Documentation]
@@ -70,7 +74,7 @@
 | | ... | ${duts_locator_set} | ${dut1_ip4_eid} | ${dut2_ip4_eid}
 | | ... | ${dut1_ip4_static_adjacency} | ${dut2_ip4_static_adjacency}
 | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv4
+| | ... | ${framesize} | ${traffic_profile}
 
 | tc02-1480B-1t1c-ethip4lispip4-ip4base-ndrchk
 | | [Documentation]
@@ -94,7 +98,7 @@
 | | ... | ${duts_locator_set} | ${dut1_ip4_eid} | ${dut2_ip4_eid}
 | | ... | ${dut1_ip4_static_adjacency} | ${dut2_ip4_static_adjacency}
 | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv4
+| | ... | ${framesize} | ${traffic_profile}
 
 | tc03-9000B-1t1c-ethip4lispip4-ip4base-ndrchk
 | | [Documentation]
@@ -117,7 +121,7 @@
 | | ... | ${duts_locator_set} | ${dut1_ip4_eid} | ${dut2_ip4_eid}
 | | ... | ${dut1_ip4_static_adjacency} | ${dut2_ip4_static_adjacency}
 | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv4
+| | ... | ${framesize} | ${traffic_profile}
 
 | tc04-64B-2t2c-ethip4lispip4-ip4base-ndrchk
 | | [Documentation]
@@ -141,7 +145,7 @@
 | | ... | ${duts_locator_set} | ${dut1_ip4_eid} | ${dut2_ip4_eid}
 | | ... | ${dut1_ip4_static_adjacency} | ${dut2_ip4_static_adjacency}
 | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv4
+| | ... | ${framesize} | ${traffic_profile}
 
 | tc05-1480B-2t2c-ethip4lispip4-ip4base-ndrchk
 | | [Documentation]
@@ -165,7 +169,7 @@
 | | ... | ${duts_locator_set} | ${dut1_ip4_eid} | ${dut2_ip4_eid}
 | | ... | ${dut1_ip4_static_adjacency} | ${dut2_ip4_static_adjacency}
 | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv4
+| | ... | ${framesize} | ${traffic_profile}
 
 | tc06-9000B-2t2c-ethip4lispip4-ip4base-ndrchk
 | | [Documentation]
@@ -188,7 +192,7 @@
 | | ... | ${duts_locator_set} | ${dut1_ip4_eid} | ${dut2_ip4_eid}
 | | ... | ${dut1_ip4_static_adjacency} | ${dut2_ip4_static_adjacency}
 | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv4
+| | ... | ${framesize} | ${traffic_profile}
 
 | tc07-64B-4t4c-ethip4lispip4-ip4base-ndrchk
 | | [Documentation]
@@ -212,7 +216,7 @@
 | | ... | ${duts_locator_set} | ${dut1_ip4_eid} | ${dut2_ip4_eid}
 | | ... | ${dut1_ip4_static_adjacency} | ${dut2_ip4_static_adjacency}
 | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv4
+| | ... | ${framesize} | ${traffic_profile}
 
 | tc08-1480B-4t4c-ethip4lispip4-ip4base-ndrchk
 | | [Documentation]
@@ -236,7 +240,7 @@
 | | ... | ${duts_locator_set} | ${dut1_ip4_eid} | ${dut2_ip4_eid}
 | | ... | ${dut1_ip4_static_adjacency} | ${dut2_ip4_static_adjacency}
 | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv4
+| | ... | ${framesize} | ${traffic_profile}
 
 | tc09-9000B-4t4c-ethip4lispip4-ip4base-ndrchk
 | | [Documentation]
@@ -259,5 +263,4 @@
 | | ... | ${duts_locator_set} | ${dut1_ip4_eid} | ${dut2_ip4_eid}
 | | ... | ${dut1_ip4_static_adjacency} | ${dut2_ip4_static_adjacency}
 | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv4
-
+| | ... | ${framesize} | ${traffic_profile}
diff --git a/tests/perf/10ge2p1x520-ethip4lispip4-ip4base-ndrpdrdisc.robot b/tests/perf/10ge2p1x520-ethip4lispip4-ip4base-ndrpdrdisc.robot
index b2dba37202..59e291f13a 100644
--- a/tests/perf/10ge2p1x520-ethip4lispip4-ip4base-ndrpdrdisc.robot
+++ b/tests/perf/10ge2p1x520-ethip4lispip4-ip4base-ndrpdrdisc.robot
@@ -25,7 +25,7 @@
 | ...
 | Test Setup | Performance test setup
 | Test Teardown | Performance test teardown | ${min_rate}pps | ${framesize}
-| ... | 3-node-IPv4
+| ... | ${traffic_profile}
 | ...
 | Documentation | *RFC6830: Pkt throughput Lisp test cases*
 | ...
@@ -46,6 +46,8 @@
 *** Variables ***
 # X520-DA2 bandwidth limit
 | ${s_limit} | ${10000000000}
+# Traffic profile:
+| ${traffic_profile} | trex-sl-3n-ethip4-ip4src253
 
 *** Test Cases ***
 | tc01-64B-1t1c-ethip4lispip4-ip4base-ndrdisc
@@ -63,21 +65,20 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
 | | When Lisp IPv4 forwarding initialized in a 3-node circular topology
-| | ...  | ${dut1_to_dut2_ip4} | ${dut1_to_tg_ip4} | ${dut2_to_dut1_ip4}
-| | ...  | ${dut2_to_tg_ip4} | ${prefix4}
-| | And  Set up Lisp topology
-| | ...  | ${dut1} | ${dut1_if2} | ${NONE}
-| | ...  | ${dut2} | ${dut2_if1} | ${NONE}
-| | ...  | ${duts_locator_set} | ${dut1_ip4_eid} | ${dut2_ip4_eid}
-| | ...  | ${dut1_ip4_static_adjacency} | ${dut2_ip4_static_adjacency}
+| | ... | ${dut1_to_dut2_ip4} | ${dut1_to_tg_ip4} | ${dut2_to_dut1_ip4}
+| | ... | ${dut2_to_tg_ip4} | ${prefix4}
+| | And Set up Lisp topology
+| | ... | ${dut1} | ${dut1_if2} | ${NONE}
+| | ... | ${dut2} | ${dut2_if1} | ${NONE}
+| | ... | ${duts_locator_set} | ${dut1_ip4_eid} | ${dut2_ip4_eid}
+| | ... | ${dut1_ip4_static_adjacency} | ${dut2_ip4_static_adjacency}
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-IPv4
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc02-64B-1t1c-ethip4lispip4-ip4base-pdrdisc
 | | [Documentation]
@@ -94,23 +95,21 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
 | | When Lisp IPv4 forwarding initialized in a 3-node circular topology
-| | ...  | ${dut1_to_dut2_ip4} | ${dut1_to_tg_ip4} | ${dut2_to_dut1_ip4}
-| | ...  | ${dut2_to_tg_ip4} | ${prefix4}
-| | And  Set up Lisp topology
-| | ...  | ${dut1} | ${dut1_if2} | ${NONE}
-| | ...  | ${dut2} | ${dut2_if1} | ${NONE}
-| | ...  | ${duts_locator_set} | ${dut1_ip4_eid} | ${dut2_ip4_eid}
-| | ...  | ${dut1_ip4_static_adjacency} | ${dut2_ip4_static_adjacency}
+| | ... | ${dut1_to_dut2_ip4} | ${dut1_to_tg_ip4} | ${dut2_to_dut1_ip4}
+| | ... | ${dut2_to_tg_ip4} | ${prefix4}
+| | And Set up Lisp topology
+| | ... | ${dut1} | ${dut1_if2} | ${NONE}
+| | ... | ${dut2} | ${dut2_if1} | ${NONE}
+| | ... | ${duts_locator_set} | ${dut1_ip4_eid} | ${dut2_ip4_eid}
+| | ... | ${dut1_ip4_static_adjacency} | ${dut2_ip4_static_adjacency}
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-IPv4
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
-| | ...                                       | ${perf_pdr_loss_acceptance}
-| | ...                                       | ${perf_pdr_loss_acceptance_type}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
+| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
 
 | tc03-1480B-1t1c-ethip4lispip4-ip4base-ndrdisc
 | | [Documentation]
@@ -127,21 +126,20 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
 | | When Lisp IPv4 forwarding initialized in a 3-node circular topology
-| | ...  | ${dut1_to_dut2_ip4} | ${dut1_to_tg_ip4} | ${dut2_to_dut1_ip4}
-| | ...  | ${dut2_to_tg_ip4} | ${prefix4}
-| | And  Set up Lisp topology
-| | ...  | ${dut1} | ${dut1_if2} | ${NONE}
-| | ...  | ${dut2} | ${dut2_if1} | ${NONE}
-| | ...  | ${duts_locator_set} | ${dut1_ip4_eid} | ${dut2_ip4_eid}
-| | ...  | ${dut1_ip4_static_adjacency} | ${dut2_ip4_static_adjacency}
+| | ... | ${dut1_to_dut2_ip4} | ${dut1_to_tg_ip4} | ${dut2_to_dut1_ip4}
+| | ... | ${dut2_to_tg_ip4} | ${prefix4}
+| | And Set up Lisp topology
+| | ... | ${dut1} | ${dut1_if2} | ${NONE}
+| | ... | ${dut2} | ${dut2_if1} | ${NONE}
+| | ... | ${duts_locator_set} | ${dut1_ip4_eid} | ${dut2_ip4_eid}
+| | ... | ${dut1_ip4_static_adjacency} | ${dut2_ip4_static_adjacency}
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-IPv4
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc04-1480B-1t1c-ethip4lispip4-ip4base-pdrdisc
 | | [Documentation]
@@ -158,23 +156,21 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
 | | When Lisp IPv4 forwarding initialized in a 3-node circular topology
-| | ...  | ${dut1_to_dut2_ip4} | ${dut1_to_tg_ip4} | ${dut2_to_dut1_ip4}
-| | ...  | ${dut2_to_tg_ip4} | ${prefix4}
-| | And  Set up Lisp topology
-| | ...  | ${dut1} | ${dut1_if2} | ${NONE}
-| | ...  | ${dut2} | ${dut2_if1} | ${NONE}
-| | ...  | ${duts_locator_set} | ${dut1_ip4_eid} | ${dut2_ip4_eid}
-| | ...  | ${dut1_ip4_static_adjacency} | ${dut2_ip4_static_adjacency}
+| | ... | ${dut1_to_dut2_ip4} | ${dut1_to_tg_ip4} | ${dut2_to_dut1_ip4}
+| | ... | ${dut2_to_tg_ip4} | ${prefix4}
+| | And Set up Lisp topology
+| | ... | ${dut1} | ${dut1_if2} | ${NONE}
+| | ... | ${dut2} | ${dut2_if1} | ${NONE}
+| | ... | ${duts_locator_set} | ${dut1_ip4_eid} | ${dut2_ip4_eid}
+| | ... | ${dut1_ip4_static_adjacency} | ${dut2_ip4_static_adjacency}
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-IPv4
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
-| | ...                                       | ${perf_pdr_loss_acceptance}
-| | ...                                       | ${perf_pdr_loss_acceptance_type}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
+| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
 
 | tc05-9000B-1t1c-ethip4lispip4-ip4base-ndrdisc
 | | [Documentation]
@@ -191,20 +187,19 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Apply startup configuration on all VPP DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Apply startup configuration on all VPP DUTs
 | | When Lisp IPv4 forwarding initialized in a 3-node circular topology
-| | ...  | ${dut1_to_dut2_ip4} | ${dut1_to_tg_ip4} | ${dut2_to_dut1_ip4}
-| | ...  | ${dut2_to_tg_ip4} | ${prefix4}
-| | And  Set up Lisp topology
-| | ...  | ${dut1} | ${dut1_if2} | ${NONE}
-| | ...  | ${dut2} | ${dut2_if1} | ${NONE}
-| | ...  | ${duts_locator_set} | ${dut1_ip4_eid} | ${dut2_ip4_eid}
-| | ...  | ${dut1_ip4_static_adjacency} | ${dut2_ip4_static_adjacency}
+| | ... | ${dut1_to_dut2_ip4} | ${dut1_to_tg_ip4} | ${dut2_to_dut1_ip4}
+| | ... | ${dut2_to_tg_ip4} | ${prefix4}
+| | And Set up Lisp topology
+| | ... | ${dut1} | ${dut1_if2} | ${NONE}
+| | ... | ${dut2} | ${dut2_if1} | ${NONE}
+| | ... | ${duts_locator_set} | ${dut1_ip4_eid} | ${dut2_ip4_eid}
+| | ... | ${dut1_ip4_static_adjacency} | ${dut2_ip4_static_adjacency}
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-IPv4
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc06-9000B-1t1c-ethip4lispip4-ip4base-pdrdisc
 | | [Documentation]
@@ -221,22 +216,20 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Apply startup configuration on all VPP DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Apply startup configuration on all VPP DUTs
 | | When Lisp IPv4 forwarding initialized in a 3-node circular topology
-| | ...  | ${dut1_to_dut2_ip4} | ${dut1_to_tg_ip4} | ${dut2_to_dut1_ip4}
-| | ...  | ${dut2_to_tg_ip4} | ${prefix4}
-| | And  Set up Lisp topology
-| | ...  | ${dut1} | ${dut1_if2} | ${NONE}
-| | ...  | ${dut2} | ${dut2_if1} | ${NONE}
-| | ...  | ${duts_locator_set} | ${dut1_ip4_eid} | ${dut2_ip4_eid}
-| | ...  | ${dut1_ip4_static_adjacency} | ${dut2_ip4_static_adjacency}
+| | ... | ${dut1_to_dut2_ip4} | ${dut1_to_tg_ip4} | ${dut2_to_dut1_ip4}
+| | ... | ${dut2_to_tg_ip4} | ${prefix4}
+| | And Set up Lisp topology
+| | ... | ${dut1} | ${dut1_if2} | ${NONE}
+| | ... | ${dut2} | ${dut2_if1} | ${NONE}
+| | ... | ${duts_locator_set} | ${dut1_ip4_eid} | ${dut2_ip4_eid}
+| | ... | ${dut1_ip4_static_adjacency} | ${dut2_ip4_static_adjacency}
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-IPv4
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
-| | ...                                       | ${perf_pdr_loss_acceptance}
-| | ...                                       | ${perf_pdr_loss_acceptance_type}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
+| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
 
 | tc07-64B-2t2c-ethip4lispip4-ip4base-ndrdisc
 | | [Documentation]
@@ -253,21 +246,20 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
 | | When Lisp IPv4 forwarding initialized in a 3-node circular topology
-| | ...  | ${dut1_to_dut2_ip4} | ${dut1_to_tg_ip4} | ${dut2_to_dut1_ip4}
-| | ...  | ${dut2_to_tg_ip4} | ${prefix4}
-| | And  Set up Lisp topology
-| | ...  | ${dut1} | ${dut1_if2} | ${NONE}
-| | ...  | ${dut2} | ${dut2_if1} | ${NONE}
-| | ...  | ${duts_locator_set} | ${dut1_ip4_eid} | ${dut2_ip4_eid}
-| | ...  | ${dut1_ip4_static_adjacency} | ${dut2_ip4_static_adjacency}
+| | ... | ${dut1_to_dut2_ip4} | ${dut1_to_tg_ip4} | ${dut2_to_dut1_ip4}
+| | ... | ${dut2_to_tg_ip4} | ${prefix4}
+| | And Set up Lisp topology
+| | ... | ${dut1} | ${dut1_if2} | ${NONE}
+| | ... | ${dut2} | ${dut2_if1} | ${NONE}
+| | ... | ${duts_locator_set} | ${dut1_ip4_eid} | ${dut2_ip4_eid}
+| | ... | ${dut1_ip4_static_adjacency} | ${dut2_ip4_static_adjacency}
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-IPv4
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc08-64B-2t2c-ethip4lispip4-ip4base-pdrdisc
 | | [Documentation]
@@ -284,23 +276,21 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
 | | When Lisp IPv4 forwarding initialized in a 3-node circular topology
-| | ...  | ${dut1_to_dut2_ip4} | ${dut1_to_tg_ip4} | ${dut2_to_dut1_ip4}
-| | ...  | ${dut2_to_tg_ip4} | ${prefix4}
-| | And  Set up Lisp topology
-| | ...  | ${dut1} | ${dut1_if2} | ${NONE}
-| | ...  | ${dut2} | ${dut2_if1} | ${NONE}
-| | ...  | ${duts_locator_set} | ${dut1_ip4_eid} | ${dut2_ip4_eid}
-| | ...  | ${dut1_ip4_static_adjacency} | ${dut2_ip4_static_adjacency}
+| | ... | ${dut1_to_dut2_ip4} | ${dut1_to_tg_ip4} | ${dut2_to_dut1_ip4}
+| | ... | ${dut2_to_tg_ip4} | ${prefix4}
+| | And Set up Lisp topology
+| | ... | ${dut1} | ${dut1_if2} | ${NONE}
+| | ... | ${dut2} | ${dut2_if1} | ${NONE}
+| | ... | ${duts_locator_set} | ${dut1_ip4_eid} | ${dut2_ip4_eid}
+| | ... | ${dut1_ip4_static_adjacency} | ${dut2_ip4_static_adjacency}
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-IPv4
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
-| | ...                                       | ${perf_pdr_loss_acceptance}
-| | ...                                       | ${perf_pdr_loss_acceptance_type}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
+| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
 
 | tc09-1480B-2t2c-ethip4lispip4-ip4base-ndrdisc
 | | [Documentation]
@@ -317,21 +307,20 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
 | | When Lisp IPv4 forwarding initialized in a 3-node circular topology
-| | ...  | ${dut1_to_dut2_ip4} | ${dut1_to_tg_ip4} | ${dut2_to_dut1_ip4}
-| | ...  | ${dut2_to_tg_ip4} | ${prefix4}
-| | And  Set up Lisp topology
-| | ...  | ${dut1} | ${dut1_if2} | ${NONE}
-| | ...  | ${dut2} | ${dut2_if1} | ${NONE}
-| | ...  | ${duts_locator_set} | ${dut1_ip4_eid} | ${dut2_ip4_eid}
-| | ...  | ${dut1_ip4_static_adjacency} | ${dut2_ip4_static_adjacency}
+| | ... | ${dut1_to_dut2_ip4} | ${dut1_to_tg_ip4} | ${dut2_to_dut1_ip4}
+| | ... | ${dut2_to_tg_ip4} | ${prefix4}
+| | And Set up Lisp topology
+| | ... | ${dut1} | ${dut1_if2} | ${NONE}
+| | ... | ${dut2} | ${dut2_if1} | ${NONE}
+| | ... | ${duts_locator_set} | ${dut1_ip4_eid} | ${dut2_ip4_eid}
+| | ... | ${dut1_ip4_static_adjacency} | ${dut2_ip4_static_adjacency}
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-IPv4
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc10-1480B-2t2c-ethip4lispip4-ip4base-pdrdisc
 | | [Documentation]
@@ -348,23 +337,21 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
 | | When Lisp IPv4 forwarding initialized in a 3-node circular topology
-| | ...  | ${dut1_to_dut2_ip4} | ${dut1_to_tg_ip4} | ${dut2_to_dut1_ip4}
-| | ...  | ${dut2_to_tg_ip4} | ${prefix4}
-| | And  Set up Lisp topology
-| | ...  | ${dut1} | ${dut1_if2} | ${NONE}
-| | ...  | ${dut2} | ${dut2_if1} | ${NONE}
-| | ...  | ${duts_locator_set} | ${dut1_ip4_eid} | ${dut2_ip4_eid}
-| | ...  | ${dut1_ip4_static_adjacency} | ${dut2_ip4_static_adjacency}
+| | ... | ${dut1_to_dut2_ip4} | ${dut1_to_tg_ip4} | ${dut2_to_dut1_ip4}
+| | ... | ${dut2_to_tg_ip4} | ${prefix4}
+| | And Set up Lisp topology
+| | ... | ${dut1} | ${dut1_if2} | ${NONE}
+| | ... | ${dut2} | ${dut2_if1} | ${NONE}
+| | ... | ${duts_locator_set} | ${dut1_ip4_eid} | ${dut2_ip4_eid}
+| | ... | ${dut1_ip4_static_adjacency} | ${dut2_ip4_static_adjacency}
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-IPv4
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
-| | ...                                       | ${perf_pdr_loss_acceptance}
-| | ...                                       | ${perf_pdr_loss_acceptance_type}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
+| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
 
 | tc11-9000B-2t2c-ethip4lispip4-ip4base-ndrdisc
 | | [Documentation]
@@ -381,20 +368,19 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Apply startup configuration on all VPP DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Apply startup configuration on all VPP DUTs
 | | When Lisp IPv4 forwarding initialized in a 3-node circular topology
-| | ...  | ${dut1_to_dut2_ip4} | ${dut1_to_tg_ip4} | ${dut2_to_dut1_ip4}
-| | ...  | ${dut2_to_tg_ip4} | ${prefix4}
-| | And  Set up Lisp topology
-| | ...  | ${dut1} | ${dut1_if2} | ${NONE}
-| | ...  | ${dut2} | ${dut2_if1} | ${NONE}
-| | ...  | ${duts_locator_set} | ${dut1_ip4_eid} | ${dut2_ip4_eid}
-| | ...  | ${dut1_ip4_static_adjacency} | ${dut2_ip4_static_adjacency}
+| | ... | ${dut1_to_dut2_ip4} | ${dut1_to_tg_ip4} | ${dut2_to_dut1_ip4}
+| | ... | ${dut2_to_tg_ip4} | ${prefix4}
+| | And Set up Lisp topology
+| | ... | ${dut1} | ${dut1_if2} | ${NONE}
+| | ... | ${dut2} | ${dut2_if1} | ${NONE}
+| | ... | ${duts_locator_set} | ${dut1_ip4_eid} | ${dut2_ip4_eid}
+| | ... | ${dut1_ip4_static_adjacency} | ${dut2_ip4_static_adjacency}
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-IPv4
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc12-9000B-2t2c-ethip4lispip4-ip4base-pdrdisc
 | | [Documentation]
@@ -411,22 +397,20 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Apply startup configuration on all VPP DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Apply startup configuration on all VPP DUTs
 | | When Lisp IPv4 forwarding initialized in a 3-node circular topology
-| | ...  | ${dut1_to_dut2_ip4} | ${dut1_to_tg_ip4} | ${dut2_to_dut1_ip4}
-| | ...  | ${dut2_to_tg_ip4} | ${prefix4}
-| | And  Set up Lisp topology
-| | ...  | ${dut1} | ${dut1_if2} | ${NONE}
-| | ...  | ${dut2} | ${dut2_if1} | ${NONE}
-| | ...  | ${duts_locator_set} | ${dut1_ip4_eid} | ${dut2_ip4_eid}
-| | ...  | ${dut1_ip4_static_adjacency} | ${dut2_ip4_static_adjacency}
+| | ... | ${dut1_to_dut2_ip4} | ${dut1_to_tg_ip4} | ${dut2_to_dut1_ip4}
+| | ... | ${dut2_to_tg_ip4} | ${prefix4}
+| | And Set up Lisp topology
+| | ... | ${dut1} | ${dut1_if2} | ${NONE}
+| | ... | ${dut2} | ${dut2_if1} | ${NONE}
+| | ... | ${duts_locator_set} | ${dut1_ip4_eid} | ${dut2_ip4_eid}
+| | ... | ${dut1_ip4_static_adjacency} | ${dut2_ip4_static_adjacency}
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-IPv4
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
-| | ...                                       | ${perf_pdr_loss_acceptance}
-| | ...                                       | ${perf_pdr_loss_acceptance_type}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
+| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
 
 | tc13-64B-4t4c-ethip4lispip4-ip4base-ndrdisc
 | | [Documentation]
@@ -443,21 +427,20 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
 | | When Lisp IPv4 forwarding initialized in a 3-node circular topology
-| | ...  | ${dut1_to_dut2_ip4} | ${dut1_to_tg_ip4} | ${dut2_to_dut1_ip4}
-| | ...  | ${dut2_to_tg_ip4} | ${prefix4}
-| | And  Set up Lisp topology
-| | ...  | ${dut1} | ${dut1_if2} | ${NONE}
-| | ...  | ${dut2} | ${dut2_if1} | ${NONE}
-| | ...  | ${duts_locator_set} | ${dut1_ip4_eid} | ${dut2_ip4_eid}
-| | ...  | ${dut1_ip4_static_adjacency} | ${dut2_ip4_static_adjacency}
+| | ... | ${dut1_to_dut2_ip4} | ${dut1_to_tg_ip4} | ${dut2_to_dut1_ip4}
+| | ... | ${dut2_to_tg_ip4} | ${prefix4}
+| | And Set up Lisp topology
+| | ... | ${dut1} | ${dut1_if2} | ${NONE}
+| | ... | ${dut2} | ${dut2_if1} | ${NONE}
+| | ... | ${duts_locator_set} | ${dut1_ip4_eid} | ${dut2_ip4_eid}
+| | ... | ${dut1_ip4_static_adjacency} | ${dut2_ip4_static_adjacency}
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-IPv4
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc14-64B-4t4c-ethip4lispip4-ip4base-pdrdisc
 | | [Documentation]
@@ -474,23 +457,21 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
 | | When Lisp IPv4 forwarding initialized in a 3-node circular topology
-| | ...  | ${dut1_to_dut2_ip4} | ${dut1_to_tg_ip4} | ${dut2_to_dut1_ip4}
-| | ...  | ${dut2_to_tg_ip4} | ${prefix4}
-| | And  Set up Lisp topology
-| | ...  | ${dut1} | ${dut1_if2} | ${NONE}
-| | ...  | ${dut2} | ${dut2_if1} | ${NONE}
-| | ...  | ${duts_locator_set} | ${dut1_ip4_eid} | ${dut2_ip4_eid}
-| | ...  | ${dut1_ip4_static_adjacency} | ${dut2_ip4_static_adjacency}
+| | ... | ${dut1_to_dut2_ip4} | ${dut1_to_tg_ip4} | ${dut2_to_dut1_ip4}
+| | ... | ${dut2_to_tg_ip4} | ${prefix4}
+| | And Set up Lisp topology
+| | ... | ${dut1} | ${dut1_if2} | ${NONE}
+| | ... | ${dut2} | ${dut2_if1} | ${NONE}
+| | ... | ${duts_locator_set} | ${dut1_ip4_eid} | ${dut2_ip4_eid}
+| | ... | ${dut1_ip4_static_adjacency} | ${dut2_ip4_static_adjacency}
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-IPv4
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
-| | ...                                       | ${perf_pdr_loss_acceptance}
-| | ...                                       | ${perf_pdr_loss_acceptance_type}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
+| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
 
 | tc15-1480B-4t4c-ethip4lispip4-ip4base-ndrdisc
 | | [Documentation]
@@ -507,21 +488,20 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
 | | When Lisp IPv4 forwarding initialized in a 3-node circular topology
-| | ...  | ${dut1_to_dut2_ip4} | ${dut1_to_tg_ip4} | ${dut2_to_dut1_ip4}
-| | ...  | ${dut2_to_tg_ip4} | ${prefix4}
-| | And  Set up Lisp topology
-| | ...  | ${dut1} | ${dut1_if2} | ${NONE}
-| | ...  | ${dut2} | ${dut2_if1} | ${NONE}
-| | ...  | ${duts_locator_set} | ${dut1_ip4_eid} | ${dut2_ip4_eid}
-| | ...  | ${dut1_ip4_static_adjacency} | ${dut2_ip4_static_adjacency}
+| | ... | ${dut1_to_dut2_ip4} | ${dut1_to_tg_ip4} | ${dut2_to_dut1_ip4}
+| | ... | ${dut2_to_tg_ip4} | ${prefix4}
+| | And Set up Lisp topology
+| | ... | ${dut1} | ${dut1_if2} | ${NONE}
+| | ... | ${dut2} | ${dut2_if1} | ${NONE}
+| | ... | ${duts_locator_set} | ${dut1_ip4_eid} | ${dut2_ip4_eid}
+| | ... | ${dut1_ip4_static_adjacency} | ${dut2_ip4_static_adjacency}
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-IPv4
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc16-1480B-4t4c-ethip4lispip4-ip4base-pdrdisc
 | | [Documentation]
@@ -538,23 +518,21 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
 | | When Lisp IPv4 forwarding initialized in a 3-node circular topology
-| | ...  | ${dut1_to_dut2_ip4} | ${dut1_to_tg_ip4} | ${dut2_to_dut1_ip4}
-| | ...  | ${dut2_to_tg_ip4} | ${prefix4}
-| | And  Set up Lisp topology
-| | ...  | ${dut1} | ${dut1_if2} | ${NONE}
-| | ...  | ${dut2} | ${dut2_if1} | ${NONE}
-| | ...  | ${duts_locator_set} | ${dut1_ip4_eid} | ${dut2_ip4_eid}
-| | ...  | ${dut1_ip4_static_adjacency} | ${dut2_ip4_static_adjacency}
+| | ... | ${dut1_to_dut2_ip4} | ${dut1_to_tg_ip4} | ${dut2_to_dut1_ip4}
+| | ... | ${dut2_to_tg_ip4} | ${prefix4}
+| | And Set up Lisp topology
+| | ... | ${dut1} | ${dut1_if2} | ${NONE}
+| | ... | ${dut2} | ${dut2_if1} | ${NONE}
+| | ... | ${duts_locator_set} | ${dut1_ip4_eid} | ${dut2_ip4_eid}
+| | ... | ${dut1_ip4_static_adjacency} | ${dut2_ip4_static_adjacency}
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-IPv4
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
-| | ...                                       | ${perf_pdr_loss_acceptance}
-| | ...                                       | ${perf_pdr_loss_acceptance_type}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
+| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
 
 | tc17-9000B-4t4c-ethip4lispip4-ip4base-ndrdisc
 | | [Documentation]
@@ -571,20 +549,19 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Apply startup configuration on all VPP DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Apply startup configuration on all VPP DUTs
 | | When Lisp IPv4 forwarding initialized in a 3-node circular topology
-| | ...  | ${dut1_to_dut2_ip4} | ${dut1_to_tg_ip4} | ${dut2_to_dut1_ip4}
-| | ...  | ${dut2_to_tg_ip4} | ${prefix4}
-| | And  Set up Lisp topology
-| | ...  | ${dut1} | ${dut1_if2} | ${NONE}
-| | ...  | ${dut2} | ${dut2_if1} | ${NONE}
-| | ...  | ${duts_locator_set} | ${dut1_ip4_eid} | ${dut2_ip4_eid}
-| | ...  | ${dut1_ip4_static_adjacency} | ${dut2_ip4_static_adjacency}
+| | ... | ${dut1_to_dut2_ip4} | ${dut1_to_tg_ip4} | ${dut2_to_dut1_ip4}
+| | ... | ${dut2_to_tg_ip4} | ${prefix4}
+| | And Set up Lisp topology
+| | ... | ${dut1} | ${dut1_if2} | ${NONE}
+| | ... | ${dut2} | ${dut2_if1} | ${NONE}
+| | ... | ${duts_locator_set} | ${dut1_ip4_eid} | ${dut2_ip4_eid}
+| | ... | ${dut1_ip4_static_adjacency} | ${dut2_ip4_static_adjacency}
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-IPv4
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc18-9000B-4t4c-ethip4lispip4-ip4base-pdrdisc
 | | [Documentation]
@@ -601,19 +578,17 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Apply startup configuration on all VPP DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Apply startup configuration on all VPP DUTs
 | | When Lisp IPv4 forwarding initialized in a 3-node circular topology
-| | ...  | ${dut1_to_dut2_ip4} | ${dut1_to_tg_ip4} | ${dut2_to_dut1_ip4}
-| | ...  | ${dut2_to_tg_ip4} | ${prefix4}
-| | And  Set up Lisp topology
-| | ...  | ${dut1} | ${dut1_if2} | ${NONE}
-| | ...  | ${dut2} | ${dut2_if1} | ${NONE}
-| | ...  | ${duts_locator_set} | ${dut1_ip4_eid} | ${dut2_ip4_eid}
-| | ...  | ${dut1_ip4_static_adjacency} | ${dut2_ip4_static_adjacency}
+| | ... | ${dut1_to_dut2_ip4} | ${dut1_to_tg_ip4} | ${dut2_to_dut1_ip4}
+| | ... | ${dut2_to_tg_ip4} | ${prefix4}
+| | And Set up Lisp topology
+| | ... | ${dut1} | ${dut1_if2} | ${NONE}
+| | ... | ${dut2} | ${dut2_if1} | ${NONE}
+| | ... | ${duts_locator_set} | ${dut1_ip4_eid} | ${dut2_ip4_eid}
+| | ... | ${dut1_ip4_static_adjacency} | ${dut2_ip4_static_adjacency}
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-IPv4
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
-| | ...                                       | ${perf_pdr_loss_acceptance}
-| | ...                                       | ${perf_pdr_loss_acceptance_type}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
+| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
diff --git a/tests/perf/10ge2p1x520-ethip4lispip6-ip4base-ndrchk.robot b/tests/perf/10ge2p1x520-ethip4lispip6-ip4base-ndrchk.robot
index e8fa759233..27c74a165b 100644
--- a/tests/perf/10ge2p1x520-ethip4lispip6-ip4base-ndrchk.robot
+++ b/tests/perf/10ge2p1x520-ethip4lispip6-ip4base-ndrchk.robot
@@ -47,6 +47,10 @@
 | ... | IP protocol=61 and generated payload.
 | ... | *[Ref] Applicable standard specifications:* RFC2544.
 
+*** Variables ***
+# Traffic profile:
+| ${traffic_profile} | trex-sl-3n-ethip4-ip4src253
+
 *** Test Cases ***
 | tc01-64B-1t1c-ethip4lispip6-ip4base-ndrchk
 | | [Documentation]
@@ -70,7 +74,7 @@
 | | ... | ${duts_locator_set} | ${dut1_ip4o6_eid} | ${dut2_ip4o6_eid}
 | | ... | ${dut1_ip4o6_static_adjacency} | ${dut2_ip4o6_static_adjacency}
 | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv4
+| | ... | ${framesize} | ${traffic_profile}
 
 | tc02-1460B-1t1c-ethip4lispip6-ip4base-ndrchk
 | | [Documentation]
@@ -94,7 +98,7 @@
 | | ... | ${duts_locator_set} | ${dut1_ip4o6_eid} | ${dut2_ip4o6_eid}
 | | ... | ${dut1_ip4o6_static_adjacency} | ${dut2_ip4o6_static_adjacency}
 | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv4
+| | ... | ${framesize} | ${traffic_profile}
 
 | tc03-9000B-1t1c-ethip4lispip6-ip4base-ndrchk
 | | [Documentation]
@@ -117,7 +121,7 @@
 | | ... | ${duts_locator_set} | ${dut1_ip4o6_eid} | ${dut2_ip4o6_eid}
 | | ... | ${dut1_ip4o6_static_adjacency} | ${dut2_ip4o6_static_adjacency}
 | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv4
+| | ... | ${framesize} | ${traffic_profile}
 
 | tc04-64B-2t2c-ethip4lispip6-ip4base-ndrchk
 | | [Documentation]
@@ -141,7 +145,7 @@
 | | ... | ${duts_locator_set} | ${dut1_ip4o6_eid} | ${dut2_ip4o6_eid}
 | | ... | ${dut1_ip4o6_static_adjacency} | ${dut2_ip4o6_static_adjacency}
 | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv4
+| | ... | ${framesize} | ${traffic_profile}
 
 | tc05-1460B-2t2c-ethip4lispip6-ip4base-ndrchk
 | | [Documentation]
@@ -165,7 +169,7 @@
 | | ... | ${duts_locator_set} | ${dut1_ip4o6_eid} | ${dut2_ip4o6_eid}
 | | ... | ${dut1_ip4o6_static_adjacency} | ${dut2_ip4o6_static_adjacency}
 | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv4
+| | ... | ${framesize} | ${traffic_profile}
 
 | tc06-9000B-2t2c-ethip4lispip6-ip4base-ndrchk
 | | [Documentation]
@@ -188,7 +192,7 @@
 | | ... | ${duts_locator_set} | ${dut1_ip4o6_eid} | ${dut2_ip4o6_eid}
 | | ... | ${dut1_ip4o6_static_adjacency} | ${dut2_ip4o6_static_adjacency}
 | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv4
+| | ... | ${framesize} | ${traffic_profile}
 
 | tc07-64B-4t4c-ethip4lispip6-ip4base-ndrchk
 | | [Documentation]
@@ -212,7 +216,7 @@
 | | ... | ${duts_locator_set} | ${dut1_ip4o6_eid} | ${dut2_ip4o6_eid}
 | | ... | ${dut1_ip4o6_static_adjacency} | ${dut2_ip4o6_static_adjacency}
 | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv4
+| | ... | ${framesize} | ${traffic_profile}
 
 | tc08-1460B-4t4c-ethip4lispip6-ip4base-ndrchk
 | | [Documentation]
@@ -236,7 +240,7 @@
 | | ... | ${duts_locator_set} | ${dut1_ip4o6_eid} | ${dut2_ip4o6_eid}
 | | ... | ${dut1_ip4o6_static_adjacency} | ${dut2_ip4o6_static_adjacency}
 | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv4
+| | ... | ${framesize} | ${traffic_profile}
 
 | tc09-9000B-4t4c-ethip4lispip6-ip4base-ndrchk
 | | [Documentation]
@@ -259,4 +263,4 @@
 | | ... | ${duts_locator_set} | ${dut1_ip4o6_eid} | ${dut2_ip4o6_eid}
 | | ... | ${dut1_ip4o6_static_adjacency} | ${dut2_ip4o6_static_adjacency}
 | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv4
+| | ... | ${framesize} | ${traffic_profile}
diff --git a/tests/perf/10ge2p1x520-ethip4lispip6-ip4base-ndrpdrdisc.robot b/tests/perf/10ge2p1x520-ethip4lispip6-ip4base-ndrpdrdisc.robot
index 4bdb7f469f..97d618ce49 100644
--- a/tests/perf/10ge2p1x520-ethip4lispip6-ip4base-ndrpdrdisc.robot
+++ b/tests/perf/10ge2p1x520-ethip4lispip6-ip4base-ndrpdrdisc.robot
@@ -25,7 +25,7 @@
 | ...
 | Test Setup | Performance test setup
 | Test Teardown | Performance test teardown | ${min_rate}pps | ${framesize}
-| ... | 3-node-IPv4
+| ... | ${traffic_profile}
 | ...
 | Documentation | *RFC6830: Pkt throughput Lisp test cases*
 | ...
@@ -47,6 +47,8 @@
 *** Variables ***
 # X520-DA2 bandwidth limit
 | ${s_limit} | ${10000000000}
+# Traffic profile:
+| ${traffic_profile} | trex-sl-3n-ethip4-ip4src253
 
 *** Test Cases ***
 | tc01-64B-1t1c-ethip4lispip6-ip4base-ndrdisc
@@ -64,21 +66,20 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
 | | When Lisp IPv4 over IPv6 forwarding initialized in a 3-node circular topology
-| | ...  | ${dut1_to_dut2_ip4o6} | ${dut1_to_tg_ip4o6} | ${dut2_to_dut1_ip4o6}
-| | ...  | ${dut2_to_tg_ip4o6} | ${tg_prefix4o6} | ${dut_prefix4o6}
-| | And  Set up Lisp topology
-| | ...  | ${dut1} | ${dut1_if2} | ${NONE}
-| | ...  | ${dut2} | ${dut2_if1} | ${NONE}
-| | ...  | ${duts_locator_set} | ${dut1_ip4o6_eid} | ${dut2_ip4o6_eid}
-| | ...  | ${dut1_ip4o6_static_adjacency} | ${dut2_ip4o6_static_adjacency}
+| | ... | ${dut1_to_dut2_ip4o6} | ${dut1_to_tg_ip4o6} | ${dut2_to_dut1_ip4o6}
+| | ... | ${dut2_to_tg_ip4o6} | ${tg_prefix4o6} | ${dut_prefix4o6}
+| | And Set up Lisp topology
+| | ... | ${dut1} | ${dut1_if2} | ${NONE}
+| | ... | ${dut2} | ${dut2_if1} | ${NONE}
+| | ... | ${duts_locator_set} | ${dut1_ip4o6_eid} | ${dut2_ip4o6_eid}
+| | ... | ${dut1_ip4o6_static_adjacency} | ${dut2_ip4o6_static_adjacency}
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-IPv4
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc02-64B-1t1c-ethip4lispip6-ip4base-pdrdisc
 | | [Documentation]
@@ -95,23 +96,21 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
 | | When Lisp IPv4 over IPv6 forwarding initialized in a 3-node circular topology
-| | ...  | ${dut1_to_dut2_ip4o6} | ${dut1_to_tg_ip4o6} | ${dut2_to_dut1_ip4o6}
-| | ...  | ${dut2_to_tg_ip4o6} | ${tg_prefix4o6} | ${dut_prefix4o6}
-| | And  Set up Lisp topology
-| | ...  | ${dut1} | ${dut1_if2} | ${NONE}
-| | ...  | ${dut2} | ${dut2_if1} | ${NONE}
-| | ...  | ${duts_locator_set} | ${dut1_ip4o6_eid} | ${dut2_ip4o6_eid}
-| | ...  | ${dut1_ip4o6_static_adjacency} | ${dut2_ip4o6_static_adjacency}
+| | ... | ${dut1_to_dut2_ip4o6} | ${dut1_to_tg_ip4o6} | ${dut2_to_dut1_ip4o6}
+| | ... | ${dut2_to_tg_ip4o6} | ${tg_prefix4o6} | ${dut_prefix4o6}
+| | And Set up Lisp topology
+| | ... | ${dut1} | ${dut1_if2} | ${NONE}
+| | ... | ${dut2} | ${dut2_if1} | ${NONE}
+| | ... | ${duts_locator_set} | ${dut1_ip4o6_eid} | ${dut2_ip4o6_eid}
+| | ... | ${dut1_ip4o6_static_adjacency} | ${dut2_ip4o6_static_adjacency}
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-IPv4
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
-| | ...                                       | ${perf_pdr_loss_acceptance}
-| | ...                                       | ${perf_pdr_loss_acceptance_type}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
+| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
 
 | tc03-1460B-1t1c-ethip4lispip6-ip4base-ndrdisc
 | | [Documentation]
@@ -128,21 +127,20 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
 | | When Lisp IPv4 over IPv6 forwarding initialized in a 3-node circular topology
-| | ...  | ${dut1_to_dut2_ip4o6} | ${dut1_to_tg_ip4o6} | ${dut2_to_dut1_ip4o6}
-| | ...  | ${dut2_to_tg_ip4o6} | ${tg_prefix4o6} | ${dut_prefix4o6}
-| | And  Set up Lisp topology
-| | ...  | ${dut1} | ${dut1_if2} | ${NONE}
-| | ...  | ${dut2} | ${dut2_if1} | ${NONE}
-| | ...  | ${duts_locator_set} | ${dut1_ip4o6_eid} | ${dut2_ip4o6_eid}
-| | ...  | ${dut1_ip4o6_static_adjacency} | ${dut2_ip4o6_static_adjacency}
+| | ... | ${dut1_to_dut2_ip4o6} | ${dut1_to_tg_ip4o6} | ${dut2_to_dut1_ip4o6}
+| | ... | ${dut2_to_tg_ip4o6} | ${tg_prefix4o6} | ${dut_prefix4o6}
+| | And Set up Lisp topology
+| | ... | ${dut1} | ${dut1_if2} | ${NONE}
+| | ... | ${dut2} | ${dut2_if1} | ${NONE}
+| | ... | ${duts_locator_set} | ${dut1_ip4o6_eid} | ${dut2_ip4o6_eid}
+| | ... | ${dut1_ip4o6_static_adjacency} | ${dut2_ip4o6_static_adjacency}
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-IPv4
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc04-1460B-1t1c-ethip4lispip6-ip4base-pdrdisc
 | | [Documentation]
@@ -159,23 +157,21 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
 | | When Lisp IPv4 over IPv6 forwarding initialized in a 3-node circular topology
-| | ...  | ${dut1_to_dut2_ip4o6} | ${dut1_to_tg_ip4o6} | ${dut2_to_dut1_ip4o6}
-| | ...  | ${dut2_to_tg_ip4o6} | ${tg_prefix4o6} | ${dut_prefix4o6}
-| | And  Set up Lisp topology
-| | ...  | ${dut1} | ${dut1_if2} | ${NONE}
-| | ...  | ${dut2} | ${dut2_if1} | ${NONE}
-| | ...  | ${duts_locator_set} | ${dut1_ip4o6_eid} | ${dut2_ip4o6_eid}
-| | ...  | ${dut1_ip4o6_static_adjacency} | ${dut2_ip4o6_static_adjacency}
+| | ... | ${dut1_to_dut2_ip4o6} | ${dut1_to_tg_ip4o6} | ${dut2_to_dut1_ip4o6}
+| | ... | ${dut2_to_tg_ip4o6} | ${tg_prefix4o6} | ${dut_prefix4o6}
+| | And Set up Lisp topology
+| | ... | ${dut1} | ${dut1_if2} | ${NONE}
+| | ... | ${dut2} | ${dut2_if1} | ${NONE}
+| | ... | ${duts_locator_set} | ${dut1_ip4o6_eid} | ${dut2_ip4o6_eid}
+| | ... | ${dut1_ip4o6_static_adjacency} | ${dut2_ip4o6_static_adjacency}
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-IPv4
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
-| | ...                                       | ${perf_pdr_loss_acceptance}
-| | ...                                       | ${perf_pdr_loss_acceptance_type}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
+| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
 
 | tc05-9000B-1t1c-ethip4lispip6-ip4base-ndrdisc
 | | [Documentation]
@@ -192,20 +188,19 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Apply startup configuration on all VPP DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Apply startup configuration on all VPP DUTs
 | | When Lisp IPv4 over IPv6 forwarding initialized in a 3-node circular topology
-| | ...  | ${dut1_to_dut2_ip4o6} | ${dut1_to_tg_ip4o6} | ${dut2_to_dut1_ip4o6}
-| | ...  | ${dut2_to_tg_ip4o6} | ${tg_prefix4o6} | ${dut_prefix4o6}
-| | And  Set up Lisp topology
-| | ...  | ${dut1} | ${dut1_if2} | ${NONE}
-| | ...  | ${dut2} | ${dut2_if1} | ${NONE}
-| | ...  | ${duts_locator_set} | ${dut1_ip4o6_eid} | ${dut2_ip4o6_eid}
-| | ...  | ${dut1_ip4o6_static_adjacency} | ${dut2_ip4o6_static_adjacency}
+| | ... | ${dut1_to_dut2_ip4o6} | ${dut1_to_tg_ip4o6} | ${dut2_to_dut1_ip4o6}
+| | ... | ${dut2_to_tg_ip4o6} | ${tg_prefix4o6} | ${dut_prefix4o6}
+| | And Set up Lisp topology
+| | ... | ${dut1} | ${dut1_if2} | ${NONE}
+| | ... | ${dut2} | ${dut2_if1} | ${NONE}
+| | ... | ${duts_locator_set} | ${dut1_ip4o6_eid} | ${dut2_ip4o6_eid}
+| | ... | ${dut1_ip4o6_static_adjacency} | ${dut2_ip4o6_static_adjacency}
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-IPv4
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc06-9000B-1t1c-ethip4lispip6-ip4base-pdrdisc
 | | [Documentation]
@@ -222,22 +217,20 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Apply startup configuration on all VPP DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Apply startup configuration on all VPP DUTs
 | | When Lisp IPv4 over IPv6 forwarding initialized in a 3-node circular topology
-| | ...  | ${dut1_to_dut2_ip4o6} | ${dut1_to_tg_ip4o6} | ${dut2_to_dut1_ip4o6}
-| | ...  | ${dut2_to_tg_ip4o6} | ${tg_prefix4o6} | ${dut_prefix4o6}
-| | And  Set up Lisp topology
-| | ...  | ${dut1} | ${dut1_if2} | ${NONE}
-| | ...  | ${dut2} | ${dut2_if1} | ${NONE}
-| | ...  | ${duts_locator_set} | ${dut1_ip4o6_eid} | ${dut2_ip4o6_eid}
-| | ...  | ${dut1_ip4o6_static_adjacency} | ${dut2_ip4o6_static_adjacency}
+| | ... | ${dut1_to_dut2_ip4o6} | ${dut1_to_tg_ip4o6} | ${dut2_to_dut1_ip4o6}
+| | ... | ${dut2_to_tg_ip4o6} | ${tg_prefix4o6} | ${dut_prefix4o6}
+| | And Set up Lisp topology
+| | ... | ${dut1} | ${dut1_if2} | ${NONE}
+| | ... | ${dut2} | ${dut2_if1} | ${NONE}
+| | ... | ${duts_locator_set} | ${dut1_ip4o6_eid} | ${dut2_ip4o6_eid}
+| | ... | ${dut1_ip4o6_static_adjacency} | ${dut2_ip4o6_static_adjacency}
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-IPv4
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
-| | ...                                       | ${perf_pdr_loss_acceptance}
-| | ...                                       | ${perf_pdr_loss_acceptance_type}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
+| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
 
 | tc07-64B-2t2c-ethip4lispip6-ip4base-ndrdisc
 | | [Documentation]
@@ -254,21 +247,20 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
 | | When Lisp IPv4 over IPv6 forwarding initialized in a 3-node circular topology
-| | ...  | ${dut1_to_dut2_ip4o6} | ${dut1_to_tg_ip4o6} | ${dut2_to_dut1_ip4o6}
-| | ...  | ${dut2_to_tg_ip4o6} | ${tg_prefix4o6} | ${dut_prefix4o6}
-| | And  Set up Lisp topology
-| | ...  | ${dut1} | ${dut1_if2} | ${NONE}
-| | ...  | ${dut2} | ${dut2_if1} | ${NONE}
-| | ...  | ${duts_locator_set} | ${dut1_ip4o6_eid} | ${dut2_ip4o6_eid}
-| | ...  | ${dut1_ip4o6_static_adjacency} | ${dut2_ip4o6_static_adjacency}
+| | ... | ${dut1_to_dut2_ip4o6} | ${dut1_to_tg_ip4o6} | ${dut2_to_dut1_ip4o6}
+| | ... | ${dut2_to_tg_ip4o6} | ${tg_prefix4o6} | ${dut_prefix4o6}
+| | And Set up Lisp topology
+| | ... | ${dut1} | ${dut1_if2} | ${NONE}
+| | ... | ${dut2} | ${dut2_if1} | ${NONE}
+| | ... | ${duts_locator_set} | ${dut1_ip4o6_eid} | ${dut2_ip4o6_eid}
+| | ... | ${dut1_ip4o6_static_adjacency} | ${dut2_ip4o6_static_adjacency}
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-IPv4
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc08-64B-2t2c-ethip4lispip6-ip4base-pdrdisc
 | | [Documentation]
@@ -285,23 +277,21 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
 | | When Lisp IPv4 over IPv6 forwarding initialized in a 3-node circular topology
-| | ...  | ${dut1_to_dut2_ip4o6} | ${dut1_to_tg_ip4o6} | ${dut2_to_dut1_ip4o6}
-| | ...  | ${dut2_to_tg_ip4o6} | ${tg_prefix4o6} | ${dut_prefix4o6}
-| | And  Set up Lisp topology
-| | ...  | ${dut1} | ${dut1_if2} | ${NONE}
-| | ...  | ${dut2} | ${dut2_if1} | ${NONE}
-| | ...  | ${duts_locator_set} | ${dut1_ip4o6_eid} | ${dut2_ip4o6_eid}
-| | ...  | ${dut1_ip4o6_static_adjacency} | ${dut2_ip4o6_static_adjacency}
+| | ... | ${dut1_to_dut2_ip4o6} | ${dut1_to_tg_ip4o6} | ${dut2_to_dut1_ip4o6}
+| | ... | ${dut2_to_tg_ip4o6} | ${tg_prefix4o6} | ${dut_prefix4o6}
+| | And Set up Lisp topology
+| | ... | ${dut1} | ${dut1_if2} | ${NONE}
+| | ... | ${dut2} | ${dut2_if1} | ${NONE}
+| | ... | ${duts_locator_set} | ${dut1_ip4o6_eid} | ${dut2_ip4o6_eid}
+| | ... | ${dut1_ip4o6_static_adjacency} | ${dut2_ip4o6_static_adjacency}
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-IPv4
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
-| | ...                                       | ${perf_pdr_loss_acceptance}
-| | ...                                       | ${perf_pdr_loss_acceptance_type}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
+| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
 
 | tc09-1460B-2t2c-ethip4lispip6-ip4base-ndrdisc
 | | [Documentation]
@@ -318,21 +308,20 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
 | | When Lisp IPv4 over IPv6 forwarding initialized in a 3-node circular topology
-| | ...  | ${dut1_to_dut2_ip4o6} | ${dut1_to_tg_ip4o6} | ${dut2_to_dut1_ip4o6}
-| | ...  | ${dut2_to_tg_ip4o6} | ${tg_prefix4o6} | ${dut_prefix4o6}
-| | And  Set up Lisp topology
-| | ...  | ${dut1} | ${dut1_if2} | ${NONE}
-| | ...  | ${dut2} | ${dut2_if1} | ${NONE}
-| | ...  | ${duts_locator_set} | ${dut1_ip4o6_eid} | ${dut2_ip4o6_eid}
-| | ...  | ${dut1_ip4o6_static_adjacency} | ${dut2_ip4o6_static_adjacency}
+| | ... | ${dut1_to_dut2_ip4o6} | ${dut1_to_tg_ip4o6} | ${dut2_to_dut1_ip4o6}
+| | ... | ${dut2_to_tg_ip4o6} | ${tg_prefix4o6} | ${dut_prefix4o6}
+| | And Set up Lisp topology
+| | ... | ${dut1} | ${dut1_if2} | ${NONE}
+| | ... | ${dut2} | ${dut2_if1} | ${NONE}
+| | ... | ${duts_locator_set} | ${dut1_ip4o6_eid} | ${dut2_ip4o6_eid}
+| | ... | ${dut1_ip4o6_static_adjacency} | ${dut2_ip4o6_static_adjacency}
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-IPv4
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc10-1460B-2t2c-ethip4lispip6-ip4base-pdrdisc
 | | [Documentation]
@@ -349,23 +338,21 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
 | | When Lisp IPv4 over IPv6 forwarding initialized in a 3-node circular topology
-| | ...  | ${dut1_to_dut2_ip4o6} | ${dut1_to_tg_ip4o6} | ${dut2_to_dut1_ip4o6}
-| | ...  | ${dut2_to_tg_ip4o6} | ${tg_prefix4o6} | ${dut_prefix4o6}
-| | And  Set up Lisp topology
-| | ...  | ${dut1} | ${dut1_if2} | ${NONE}
-| | ...  | ${dut2} | ${dut2_if1} | ${NONE}
-| | ...  | ${duts_locator_set} | ${dut1_ip4o6_eid} | ${dut2_ip4o6_eid}
-| | ...  | ${dut1_ip4o6_static_adjacency} | ${dut2_ip4o6_static_adjacency}
+| | ... | ${dut1_to_dut2_ip4o6} | ${dut1_to_tg_ip4o6} | ${dut2_to_dut1_ip4o6}
+| | ... | ${dut2_to_tg_ip4o6} | ${tg_prefix4o6} | ${dut_prefix4o6}
+| | And Set up Lisp topology
+| | ... | ${dut1} | ${dut1_if2} | ${NONE}
+| | ... | ${dut2} | ${dut2_if1} | ${NONE}
+| | ... | ${duts_locator_set} | ${dut1_ip4o6_eid} | ${dut2_ip4o6_eid}
+| | ... | ${dut1_ip4o6_static_adjacency} | ${dut2_ip4o6_static_adjacency}
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-IPv4
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
-| | ...                                       | ${perf_pdr_loss_acceptance}
-| | ...                                       | ${perf_pdr_loss_acceptance_type}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
+| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
 
 | tc11-9000B-2t2c-ethip4lispip6-ip4base-ndrdisc
 | | [Documentation]
@@ -382,20 +369,19 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Apply startup configuration on all VPP DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Apply startup configuration on all VPP DUTs
 | | When Lisp IPv4 over IPv6 forwarding initialized in a 3-node circular topology
-| | ...  | ${dut1_to_dut2_ip4o6} | ${dut1_to_tg_ip4o6} | ${dut2_to_dut1_ip4o6}
-| | ...  | ${dut2_to_tg_ip4o6} | ${tg_prefix4o6} | ${dut_prefix4o6}
-| | And  Set up Lisp topology
-| | ...  | ${dut1} | ${dut1_if2} | ${NONE}
-| | ...  | ${dut2} | ${dut2_if1} | ${NONE}
-| | ...  | ${duts_locator_set} | ${dut1_ip4o6_eid} | ${dut2_ip4o6_eid}
-| | ...  | ${dut1_ip4o6_static_adjacency} | ${dut2_ip4o6_static_adjacency}
+| | ... | ${dut1_to_dut2_ip4o6} | ${dut1_to_tg_ip4o6} | ${dut2_to_dut1_ip4o6}
+| | ... | ${dut2_to_tg_ip4o6} | ${tg_prefix4o6} | ${dut_prefix4o6}
+| | And Set up Lisp topology
+| | ... | ${dut1} | ${dut1_if2} | ${NONE}
+| | ... | ${dut2} | ${dut2_if1} | ${NONE}
+| | ... | ${duts_locator_set} | ${dut1_ip4o6_eid} | ${dut2_ip4o6_eid}
+| | ... | ${dut1_ip4o6_static_adjacency} | ${dut2_ip4o6_static_adjacency}
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-IPv4
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc12-9000B-2t2c-ethip4lispip6-ip4base-pdrdisc
 | | [Documentation]
@@ -412,22 +398,20 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Apply startup configuration on all VPP DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Apply startup configuration on all VPP DUTs
 | | When Lisp IPv4 over IPv6 forwarding initialized in a 3-node circular topology
-| | ...  | ${dut1_to_dut2_ip4o6} | ${dut1_to_tg_ip4o6} | ${dut2_to_dut1_ip4o6}
-| | ...  | ${dut2_to_tg_ip4o6} | ${tg_prefix4o6} | ${dut_prefix4o6}
-| | And  Set up Lisp topology
-| | ...  | ${dut1} | ${dut1_if2} | ${NONE}
-| | ...  | ${dut2} | ${dut2_if1} | ${NONE}
-| | ...  | ${duts_locator_set} | ${dut1_ip4o6_eid} | ${dut2_ip4o6_eid}
-| | ...  | ${dut1_ip4o6_static_adjacency} | ${dut2_ip4o6_static_adjacency}
+| | ... | ${dut1_to_dut2_ip4o6} | ${dut1_to_tg_ip4o6} | ${dut2_to_dut1_ip4o6}
+| | ... | ${dut2_to_tg_ip4o6} | ${tg_prefix4o6} | ${dut_prefix4o6}
+| | And Set up Lisp topology
+| | ... | ${dut1} | ${dut1_if2} | ${NONE}
+| | ... | ${dut2} | ${dut2_if1} | ${NONE}
+| | ... | ${duts_locator_set} | ${dut1_ip4o6_eid} | ${dut2_ip4o6_eid}
+| | ... | ${dut1_ip4o6_static_adjacency} | ${dut2_ip4o6_static_adjacency}
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-IPv4
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
-| | ...                                       | ${perf_pdr_loss_acceptance}
-| | ...                                       | ${perf_pdr_loss_acceptance_type}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
+| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
 
 | tc13-64B-4t4c-ethip4lispip6-ip4base-ndrdisc
 | | [Documentation]
@@ -444,21 +428,20 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
 | | When Lisp IPv4 over IPv6 forwarding initialized in a 3-node circular topology
-| | ...  | ${dut1_to_dut2_ip4o6} | ${dut1_to_tg_ip4o6} | ${dut2_to_dut1_ip4o6}
-| | ...  | ${dut2_to_tg_ip4o6} | ${tg_prefix4o6} | ${dut_prefix4o6}
-| | And  Set up Lisp topology
-| | ...  | ${dut1} | ${dut1_if2} | ${NONE}
-| | ...  | ${dut2} | ${dut2_if1} | ${NONE}
-| | ...  | ${duts_locator_set} | ${dut1_ip4o6_eid} | ${dut2_ip4o6_eid}
-| | ...  | ${dut1_ip4o6_static_adjacency} | ${dut2_ip4o6_static_adjacency}
+| | ... | ${dut1_to_dut2_ip4o6} | ${dut1_to_tg_ip4o6} | ${dut2_to_dut1_ip4o6}
+| | ... | ${dut2_to_tg_ip4o6} | ${tg_prefix4o6} | ${dut_prefix4o6}
+| | And Set up Lisp topology
+| | ... | ${dut1} | ${dut1_if2} | ${NONE}
+| | ... | ${dut2} | ${dut2_if1} | ${NONE}
+| | ... | ${duts_locator_set} | ${dut1_ip4o6_eid} | ${dut2_ip4o6_eid}
+| | ... | ${dut1_ip4o6_static_adjacency} | ${dut2_ip4o6_static_adjacency}
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-IPv4
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc14-64B-4t4c-ethip4lispip6-ip4base-pdrdisc
 | | [Documentation]
@@ -475,23 +458,21 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
 | | When Lisp IPv4 over IPv6 forwarding initialized in a 3-node circular topology
-| | ...  | ${dut1_to_dut2_ip4o6} | ${dut1_to_tg_ip4o6} | ${dut2_to_dut1_ip4o6}
-| | ...  | ${dut2_to_tg_ip4o6} | ${tg_prefix4o6} | ${dut_prefix4o6}
-| | And  Set up Lisp topology
-| | ...  | ${dut1} | ${dut1_if2} | ${NONE}
-| | ...  | ${dut2} | ${dut2_if1} | ${NONE}
-| | ...  | ${duts_locator_set} | ${dut1_ip4o6_eid} | ${dut2_ip4o6_eid}
-| | ...  | ${dut1_ip4o6_static_adjacency} | ${dut2_ip4o6_static_adjacency}
+| | ... | ${dut1_to_dut2_ip4o6} | ${dut1_to_tg_ip4o6} | ${dut2_to_dut1_ip4o6}
+| | ... | ${dut2_to_tg_ip4o6} | ${tg_prefix4o6} | ${dut_prefix4o6}
+| | And Set up Lisp topology
+| | ... | ${dut1} | ${dut1_if2} | ${NONE}
+| | ... | ${dut2} | ${dut2_if1} | ${NONE}
+| | ... | ${duts_locator_set} | ${dut1_ip4o6_eid} | ${dut2_ip4o6_eid}
+| | ... | ${dut1_ip4o6_static_adjacency} | ${dut2_ip4o6_static_adjacency}
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-IPv4
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
-| | ...                                       | ${perf_pdr_loss_acceptance}
-| | ...                                       | ${perf_pdr_loss_acceptance_type}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
+| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
 
 | tc15-1460B-4t4c-ethip4lispip6-ip4base-ndrdisc
 | | [Documentation]
@@ -508,21 +489,20 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
 | | When Lisp IPv4 over IPv6 forwarding initialized in a 3-node circular topology
-| | ...  | ${dut1_to_dut2_ip4o6} | ${dut1_to_tg_ip4o6} | ${dut2_to_dut1_ip4o6}
-| | ...  | ${dut2_to_tg_ip4o6} | ${tg_prefix4o6} | ${dut_prefix4o6}
-| | And  Set up Lisp topology
-| | ...  | ${dut1} | ${dut1_if2} | ${NONE}
-| | ...  | ${dut2} | ${dut2_if1} | ${NONE}
-| | ...  | ${duts_locator_set} | ${dut1_ip4o6_eid} | ${dut2_ip4o6_eid}
-| | ...  | ${dut1_ip4o6_static_adjacency} | ${dut2_ip4o6_static_adjacency}
+| | ... | ${dut1_to_dut2_ip4o6} | ${dut1_to_tg_ip4o6} | ${dut2_to_dut1_ip4o6}
+| | ... | ${dut2_to_tg_ip4o6} | ${tg_prefix4o6} | ${dut_prefix4o6}
+| | And Set up Lisp topology
+| | ... | ${dut1} | ${dut1_if2} | ${NONE}
+| | ... | ${dut2} | ${dut2_if1} | ${NONE}
+| | ... | ${duts_locator_set} | ${dut1_ip4o6_eid} | ${dut2_ip4o6_eid}
+| | ... | ${dut1_ip4o6_static_adjacency} | ${dut2_ip4o6_static_adjacency}
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-IPv4
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc16-1460B-4t4c-ethip4lispip6-ip4base-pdrdisc
 | | [Documentation]
@@ -539,23 +519,21 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
 | | When Lisp IPv4 over IPv6 forwarding initialized in a 3-node circular topology
-| | ...  | ${dut1_to_dut2_ip4o6} | ${dut1_to_tg_ip4o6} | ${dut2_to_dut1_ip4o6}
-| | ...  | ${dut2_to_tg_ip4o6} | ${tg_prefix4o6} | ${dut_prefix4o6}
-| | And  Set up Lisp topology
-| | ...  | ${dut1} | ${dut1_if2} | ${NONE}
-| | ...  | ${dut2} | ${dut2_if1} | ${NONE}
-| | ...  | ${duts_locator_set} | ${dut1_ip4o6_eid} | ${dut2_ip4o6_eid}
-| | ...  | ${dut1_ip4o6_static_adjacency} | ${dut2_ip4o6_static_adjacency}
+| | ... | ${dut1_to_dut2_ip4o6} | ${dut1_to_tg_ip4o6} | ${dut2_to_dut1_ip4o6}
+| | ... | ${dut2_to_tg_ip4o6} | ${tg_prefix4o6} | ${dut_prefix4o6}
+| | And Set up Lisp topology
+| | ... | ${dut1} | ${dut1_if2} | ${NONE}
+| | ... | ${dut2} | ${dut2_if1} | ${NONE}
+| | ... | ${duts_locator_set} | ${dut1_ip4o6_eid} | ${dut2_ip4o6_eid}
+| | ... | ${dut1_ip4o6_static_adjacency} | ${dut2_ip4o6_static_adjacency}
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-IPv4
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
-| | ...                                       | ${perf_pdr_loss_acceptance}
-| | ...                                       | ${perf_pdr_loss_acceptance_type}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
+| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
 
 | tc17-9000B-4t4c-ethip4lispip6-ip4base-ndrdisc
 | | [Documentation]
@@ -572,20 +550,19 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Apply startup configuration on all VPP DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Apply startup configuration on all VPP DUTs
 | | When Lisp IPv4 over IPv6 forwarding initialized in a 3-node circular topology
-| | ...  | ${dut1_to_dut2_ip4o6} | ${dut1_to_tg_ip4o6} | ${dut2_to_dut1_ip4o6}
-| | ...  | ${dut2_to_tg_ip4o6} | ${tg_prefix4o6} | ${dut_prefix4o6}
-| | And  Set up Lisp topology
-| | ...  | ${dut1} | ${dut1_if2} | ${NONE}
-| | ...  | ${dut2} | ${dut2_if1} | ${NONE}
-| | ...  | ${duts_locator_set} | ${dut1_ip4o6_eid} | ${dut2_ip4o6_eid}
-| | ...  | ${dut1_ip4o6_static_adjacency} | ${dut2_ip4o6_static_adjacency}
+| | ... | ${dut1_to_dut2_ip4o6} | ${dut1_to_tg_ip4o6} | ${dut2_to_dut1_ip4o6}
+| | ... | ${dut2_to_tg_ip4o6} | ${tg_prefix4o6} | ${dut_prefix4o6}
+| | And Set up Lisp topology
+| | ... | ${dut1} | ${dut1_if2} | ${NONE}
+| | ... | ${dut2} | ${dut2_if1} | ${NONE}
+| | ... | ${duts_locator_set} | ${dut1_ip4o6_eid} | ${dut2_ip4o6_eid}
+| | ... | ${dut1_ip4o6_static_adjacency} | ${dut2_ip4o6_static_adjacency}
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-IPv4
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc18-9000B-4t4c-ethip4lispip6-ip4base-pdrdisc
 | | [Documentation]
@@ -602,19 +579,17 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Apply startup configuration on all VPP DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Apply startup configuration on all VPP DUTs
 | | When Lisp IPv4 over IPv6 forwarding initialized in a 3-node circular topology
-| | ...  | ${dut1_to_dut2_ip4o6} | ${dut1_to_tg_ip4o6} | ${dut2_to_dut1_ip4o6}
-| | ...  | ${dut2_to_tg_ip4o6} | ${tg_prefix4o6} | ${dut_prefix4o6}
-| | And  Set up Lisp topology
-| | ...  | ${dut1} | ${dut1_if2} | ${NONE}
-| | ...  | ${dut2} | ${dut2_if1} | ${NONE}
-| | ...  | ${duts_locator_set} | ${dut1_ip4o6_eid} | ${dut2_ip4o6_eid}
-| | ...  | ${dut1_ip4o6_static_adjacency} | ${dut2_ip4o6_static_adjacency}
+| | ... | ${dut1_to_dut2_ip4o6} | ${dut1_to_tg_ip4o6} | ${dut2_to_dut1_ip4o6}
+| | ... | ${dut2_to_tg_ip4o6} | ${tg_prefix4o6} | ${dut_prefix4o6}
+| | And Set up Lisp topology
+| | ... | ${dut1} | ${dut1_if2} | ${NONE}
+| | ... | ${dut2} | ${dut2_if1} | ${NONE}
+| | ... | ${duts_locator_set} | ${dut1_ip4o6_eid} | ${dut2_ip4o6_eid}
+| | ... | ${dut1_ip4o6_static_adjacency} | ${dut2_ip4o6_static_adjacency}
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-IPv4
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
-| | ...                                       | ${perf_pdr_loss_acceptance}
-| | ...                                       | ${perf_pdr_loss_acceptance_type}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
+| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
diff --git a/tests/perf/10ge2p1x520-ethip4udp-ip4base-udpsrcscale15-snat-ndrpdrdisc.robot b/tests/perf/10ge2p1x520-ethip4udp-ip4base-udpsrcscale15-snat-ndrpdrdisc.robot
index f3bcac2bf5..27739e98a8 100644
--- a/tests/perf/10ge2p1x520-ethip4udp-ip4base-udpsrcscale15-snat-ndrpdrdisc.robot
+++ b/tests/perf/10ge2p1x520-ethip4udp-ip4base-udpsrcscale15-snat-ndrpdrdisc.robot
@@ -62,6 +62,8 @@
 *** Variables ***
 # X520-DA2 bandwidth limit
 | ${s_limit} | ${10000000000}
+# Traffic profile:
+| ${traffic_profile} | trex-sl-3n-ethip4udp-1u15p
 
 *** Test Cases ***
 | tc01-64B-1t1c-ethip4udp-ip4base-udpsrcscale15-snat-ndrdisc
@@ -73,7 +75,7 @@
 | | ... | linerate, step 100kpps.
 | | ...
 | | [Teardown] | Run keywords | Performance test teardown | ${min_rate}pps
-| | ... | ${framesize} | 3-node-IPv4-SNAT-1u-15p
+| | ... | ${framesize} | ${traffic_profile}
 | | ... | AND | Show SNAT verbose | ${dut1}
 | | ... | AND | Show SNAT verbose | ${dut2}
 | | ...
@@ -92,8 +94,8 @@
 | | And Apply startup configuration on all VPP DUTs
 | | When SNAT is initialized in a 3-node circular topology
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | 3-node-IPv4-SNAT-1u-15p | ${min_rate} | ${max_rate}
-| | ... | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc02-64B-1t1c-ethip4udp-ip4base-udpsrcscale15-snat-pdrdisc
 | | [Documentation]
@@ -104,7 +106,7 @@
 | | ... | linerate, step 100kpps.
 | | ...
 | | [Teardown] | Performance test teardown | ${min_rate}pps | ${framesize}
-| | ... | 3-node-IPv4-SNAT-1u-15p
+| | ... | ${traffic_profile}
 | | ...
 | | [Tags] | 64B | 1T1C | STHREAD | PDRDISC | SKIP_PATCH
 | | ...
@@ -121,8 +123,8 @@
 | | And Apply startup configuration on all VPP DUTs
 | | When SNAT is initialized in a 3-node circular topology
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | 3-node-IPv4-SNAT-1u-15p | ${min_rate} | ${max_rate}
-| | ... | ${threshold} | ${perf_pdr_loss_acceptance}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold} | ${perf_pdr_loss_acceptance}
 | | ... | ${perf_pdr_loss_acceptance_type}
 
 | tc03-1518B-1t1c-ethip4udp-ip4base-udpsrcscale15-snat-ndrdisc
@@ -134,7 +136,7 @@
 | | ... | linerate, step 100kpps.
 | | ...
 | | [Teardown] | Run keywords | Performance test teardown | ${min_rate}pps
-| | ... | ${framesize} | 3-node-IPv4-SNAT-1u-15p
+| | ... | ${framesize} | ${traffic_profile}
 | | ... | AND | Show SNAT verbose | ${dut1}
 | | ... | AND | Show SNAT verbose | ${dut2}
 | | ...
@@ -153,8 +155,8 @@
 | | And Apply startup configuration on all VPP DUTs
 | | When SNAT is initialized in a 3-node circular topology
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | 3-node-IPv4-SNAT-1u-15p | ${min_rate} | ${max_rate}
-| | ... | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc04-1518B-1t1c-ethip4udp-ip4base-udpsrcscale15-snat-pdrdisc
 | | [Documentation]
@@ -165,7 +167,7 @@
 | | ... | linerate, step 100kpps.
 | | ...
 | | [Teardown] | Performance test teardown | ${min_rate}pps | ${framesize}
-| | ... | 3-node-IPv4-SNAT-1u-15p
+| | ... | ${traffic_profile}
 | | ...
 | | [Tags] | 1518B | 1T1C | STHREAD | PDRDISC | SKIP_PATCH
 | | ...
@@ -182,24 +184,26 @@
 | | And Apply startup configuration on all VPP DUTs
 | | When SNAT is initialized in a 3-node circular topology
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | 3-node-IPv4-SNAT-1u-15p | ${min_rate} | ${max_rate}
-| | ... | ${threshold} | ${perf_pdr_loss_acceptance}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold} | ${perf_pdr_loss_acceptance}
 | | ... | ${perf_pdr_loss_acceptance_type}
 
-| tc05-1518B-1t1c-ethip4udp-ip4base-udpsrcscale15-snat-pdrdisc
+| tc05-IMIX-1t1c-ethip4udp-ip4base-udpsrcscale15-snat-ndrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv4 routing config with 1 thread, 1 phy core,\
 | | ... | 1 receive queue per NIC port. SNAT is configured between DUTs -\
 | | ... | 1 user and 15 ports (sessions) per user.
-| | ... | [Ver] Find PDR for 1518 Byte frames using binary search start at 10GE\
+| | ... | [Ver] Find NDR for IMIX frames using binary search start at 10GE\
 | | ... | linerate, step 100kpps.
 | | ...
-| | [Teardown] | Performance test teardown | ${min_rate}pps | ${framesize}
-| | ... | 3-node-IPv4-SNAT-1u-15p
+| | [Teardown] | Run keywords | Performance test teardown | ${min_rate}pps
+| | ... | ${framesize} | ${traffic_profile}
+| | ... | AND | Show SNAT verbose | ${dut1}
+| | ... | AND | Show SNAT verbose | ${dut2}
 | | ...
-| | [Tags] | 1518B | 1T1C | STHREAD | PDRDISC | SKIP_PATCH
+| | [Tags] | IMIX | 1T1C | STHREAD | NDRDISC
 | | ...
-| | ${framesize}= | Set Variable | ${1518}
+| | ${framesize}= | Set Variable | IMIX_v4_1
 | | ${min_rate}= | Set Variable | ${100000}
 | | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize}
 | | ${binary_min}= | Set Variable | ${min_rate}
@@ -211,25 +215,22 @@
 | | And Add SNAT to all DUTs
 | | And Apply startup configuration on all VPP DUTs
 | | When SNAT is initialized in a 3-node circular topology
-| | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | 3-node-IPv4-SNAT-1u-15p | ${min_rate} | ${max_rate}
-| | ... | ${threshold} | ${perf_pdr_loss_acceptance}
-| | ... | ${perf_pdr_loss_acceptance_type}
+| | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
-| tc06-IMIX-1t1c-ethip4udp-ip4base-udpsrcscale15-snat-ndrdisc
+| tc06-IMIX-1t1c-ethip4udp-ip4base-udpsrcscale15-snat-pdrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv4 routing config with 1 thread, 1 phy core,\
 | | ... | 1 receive queue per NIC port. SNAT is configured between DUTs -\
 | | ... | 1 user and 15 ports (sessions) per user.
-| | ... | [Ver] Find NDR for IMIX frames using binary search start at 10GE\
+| | ... | [Ver] Find PDR for IMIX frames using binary search start at 10GE\
 | | ... | linerate, step 100kpps.
 | | ...
-| | [Teardown] | Run keywords | Performance test teardown | ${min_rate}pps
-| | ... | ${framesize} | 3-node-IPv4-SNAT-1u-15p
-| | ... | AND | Show SNAT verbose | ${dut1}
-| | ... | AND | Show SNAT verbose | ${dut2}
+| | [Teardown] | Performance test teardown | ${min_rate}pps | ${framesize}
+| | ... | ${traffic_profile}
 | | ...
-| | [Tags] | IMIX | 1T1C | STHREAD | NDRDISC
+| | [Tags] | IMIX | 1T1C | STHREAD | PDRDISC | SKIP_PATCH
 | | ...
 | | ${framesize}= | Set Variable | IMIX_v4_1
 | | ${min_rate}= | Set Variable | ${100000}
@@ -243,6 +244,7 @@
 | | And Add SNAT to all DUTs
 | | And Apply startup configuration on all VPP DUTs
 | | When SNAT is initialized in a 3-node circular topology
-| | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | 3-node-IPv4-SNAT-1u-15p | ${min_rate} | ${max_rate}
-| | ... | ${threshold}
+| | 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
diff --git a/tests/perf/10ge2p1x520-ethip4udp-ip4scale10-udpsrcscale15-snat-ndrpdrdisc.robot b/tests/perf/10ge2p1x520-ethip4udp-ip4scale10-udpsrcscale15-snat-ndrpdrdisc.robot
index 9b44626e78..bd97fd560a 100644
--- a/tests/perf/10ge2p1x520-ethip4udp-ip4scale10-udpsrcscale15-snat-ndrpdrdisc.robot
+++ b/tests/perf/10ge2p1x520-ethip4udp-ip4scale10-udpsrcscale15-snat-ndrpdrdisc.robot
@@ -63,6 +63,8 @@
 *** Variables ***
 # X520-DA2 bandwidth limit
 | ${s_limit} | ${10000000000}
+# Traffic profile:
+| ${traffic_profile} | trex-sl-3n-ethip4udp-10u15p
 
 *** Test Cases ***
 | tc01-64B-1t1c-ethip4udp-ip4scale10-udpsrcscale15-snat-ndrdisc
@@ -74,7 +76,7 @@
 | | ... | linerate, step 100kpps.
 | | ...
 | | [Teardown] | Run keywords | Performance test teardown | ${min_rate}pps
-| | ... | ${framesize} | 3-node-IPv4-SNAT-10u-15p
+| | ... | ${framesize} | ${traffic_profile}
 | | ... | AND | Show SNAT verbose | ${dut1}
 | | ... | AND | Show SNAT verbose | ${dut2}
 | | ...
@@ -93,8 +95,8 @@
 | | And Apply startup configuration on all VPP DUTs
 | | When SNAT is initialized in a 3-node circular topology
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | 3-node-IPv4-SNAT-10u-15p | ${min_rate} | ${max_rate}
-| | ... | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc02-64B-1t1c-ethip4udp-ip4scale10-udpsrcscale15-snat-pdrdisc
 | | [Documentation]
@@ -105,7 +107,7 @@
 | | ... | linerate, step 100kpps.
 | | ...
 | | [Teardown] | Performance test teardown | ${min_rate}pps | ${framesize}
-| | ... | 3-node-IPv4-SNAT-10u-15p
+| | ... | ${traffic_profile}
 | | ...
 | | [Tags] | 64B | 1T1C | STHREAD | PDRDISC | SKIP_PATCH
 | | ...
@@ -122,8 +124,8 @@
 | | And Apply startup configuration on all VPP DUTs
 | | When SNAT is initialized in a 3-node circular topology
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | 3-node-IPv4-SNAT-10u-15p | ${min_rate} | ${max_rate}
-| | ... | ${threshold} | ${perf_pdr_loss_acceptance}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold} | ${perf_pdr_loss_acceptance}
 | | ... | ${perf_pdr_loss_acceptance_type}
 
 | tc03-1518B-1t1c-ethip4udp-ip4scale10-udpsrcscale15-snat-ndrdisc
@@ -135,7 +137,7 @@
 | | ... | linerate, step 100kpps.
 | | ...
 | | [Teardown] | Run keywords | Performance test teardown | ${min_rate}pps
-| | ... | ${framesize} | 3-node-IPv4-SNAT-10u-15p
+| | ... | ${framesize} | ${traffic_profile}
 | | ... | AND | Show SNAT verbose | ${dut1}
 | | ... | AND | Show SNAT verbose | ${dut2}
 | | ...
@@ -154,8 +156,8 @@
 | | And Apply startup configuration on all VPP DUTs
 | | When SNAT is initialized in a 3-node circular topology
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | 3-node-IPv4-SNAT-10u-15p | ${min_rate} | ${max_rate}
-| | ... | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc04-1518B-1t1c-ethip4udp-ip4scale10-udpsrcscale15-snat-pdrdisc
 | | [Documentation]
@@ -166,7 +168,7 @@
 | | ... | linerate, step 100kpps.
 | | ...
 | | [Teardown] | Performance test teardown | ${min_rate}pps | ${framesize}
-| | ... | 3-node-IPv4-SNAT-10u-15p
+| | ... | ${traffic_profile}
 | | ...
 | | [Tags] | 1518B | 1T1C | STHREAD | PDRDISC | SKIP_PATCH
 | | ...
@@ -183,8 +185,8 @@
 | | And Apply startup configuration on all VPP DUTs
 | | When SNAT is initialized in a 3-node circular topology
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | 3-node-IPv4-SNAT-10u-15p | ${min_rate} | ${max_rate}
-| | ... | ${threshold} | ${perf_pdr_loss_acceptance}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold} | ${perf_pdr_loss_acceptance}
 | | ... | ${perf_pdr_loss_acceptance_type}
 
 | tc05-IMIX-1t1c-ethip4udp-ip4scale10-udpsrcscale15-snat-ndrdisc
@@ -196,7 +198,7 @@
 | | ... | linerate, step 100kpps.
 | | ...
 | | [Teardown] | Run keywords | Performance test teardown | ${min_rate}pps
-| | ... | ${framesize} | 3-node-IPv4-SNAT-10u-15p
+| | ... | ${framesize} | ${traffic_profile}
 | | ... | AND | Show SNAT verbose | ${dut1}
 | | ... | AND | Show SNAT verbose | ${dut2}
 | | ...
@@ -215,8 +217,8 @@
 | | And Apply startup configuration on all VPP DUTs
 | | When SNAT is initialized in a 3-node circular topology
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | 3-node-IPv4-SNAT-10u-15p | ${min_rate} | ${max_rate}
-| | ... | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc06-IMIX-1t1c-ethip4udp-ip4scale10-udpsrcscale15-snat-pdrdisc
 | | [Documentation]
@@ -227,7 +229,7 @@
 | | ... | linerate, step 100kpps.
 | | ...
 | | [Teardown] | Performance test teardown | ${min_rate}pps | ${framesize}
-| | ... | 3-node-IPv4-SNAT-10u-15p
+| | ... | ${traffic_profile}
 | | ...
 | | [Tags] | IMIX | 1T1C | STHREAD | PDRDISC | SKIP_PATCH
 | | ...
@@ -244,6 +246,6 @@
 | | And Apply startup configuration on all VPP DUTs
 | | When SNAT is initialized in a 3-node circular topology
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | 3-node-IPv4-SNAT-10u-15p | ${min_rate} | ${max_rate}
-| | ... | ${threshold} | ${perf_pdr_loss_acceptance}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold} | ${perf_pdr_loss_acceptance}
 | | ... | ${perf_pdr_loss_acceptance_type}
diff --git a/tests/perf/10ge2p1x520-ethip4udp-ip4scale100-udpsrcscale15-snat-ndrpdrdisc.robot b/tests/perf/10ge2p1x520-ethip4udp-ip4scale100-udpsrcscale15-snat-ndrpdrdisc.robot
index d454092af5..4e4db964fc 100644
--- a/tests/perf/10ge2p1x520-ethip4udp-ip4scale100-udpsrcscale15-snat-ndrpdrdisc.robot
+++ b/tests/perf/10ge2p1x520-ethip4udp-ip4scale100-udpsrcscale15-snat-ndrpdrdisc.robot
@@ -63,6 +63,8 @@
 *** Variables ***
 # X520-DA2 bandwidth limit
 | ${s_limit} | ${10000000000}
+# Traffic profile:
+| ${traffic_profile} | trex-sl-3n-ethip4udp-100u15p
 
 *** Test Cases ***
 | tc01-64B-1t1c-ethip4udp-ip4scale100-udpsrcscale15-snat-ndrdisc
@@ -74,7 +76,7 @@
 | | ... | linerate, step 100kpps.
 | | ...
 | | [Teardown] | Run keywords | Performance test teardown | ${min_rate}pps
-| | ... | ${framesize} | 3-node-IPv4-SNAT-100u-15p
+| | ... | ${framesize} | ${traffic_profile}
 | | ... | AND | Show SNAT verbose | ${dut1}
 | | ... | AND | Show SNAT verbose | ${dut2}
 | | ...
@@ -93,8 +95,8 @@
 | | And Apply startup configuration on all VPP DUTs
 | | When SNAT is initialized in a 3-node circular topology
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | 3-node-IPv4-SNAT-100u-15p | ${min_rate} | ${max_rate}
-| | ... | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc02-64B-1t1c-ethip4udp-ip4scale100-udpsrcscale15-snat-pdrdisc
 | | [Documentation]
@@ -105,7 +107,7 @@
 | | ... | linerate, step 100kpps.
 | | ...
 | | [Teardown] | Performance test teardown | ${min_rate}pps | ${framesize}
-| | ... | 3-node-IPv4-SNAT-100u-15p
+| | ... | ${traffic_profile}
 | | ...
 | | [Tags] | 64B | 1T1C | STHREAD | PDRDISC | SKIP_PATCH
 | | ...
@@ -122,8 +124,8 @@
 | | And Apply startup configuration on all VPP DUTs
 | | When SNAT is initialized in a 3-node circular topology
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | 3-node-IPv4-SNAT-100u-15p | ${min_rate} | ${max_rate}
-| | ... | ${threshold} | ${perf_pdr_loss_acceptance}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold} | ${perf_pdr_loss_acceptance}
 | | ... | ${perf_pdr_loss_acceptance_type}
 
 | tc03-1518B-1t1c-ethip4udp-ip4scale100-udpsrcscale15-snat-ndrdisc
@@ -135,7 +137,7 @@
 | | ... | linerate, step 100kpps.
 | | ...
 | | [Teardown] | Run keywords | Performance test teardown | ${min_rate}pps
-| | ... | ${framesize} | 3-node-IPv4-SNAT-100u-15p
+| | ... | ${framesize} | ${traffic_profile}
 | | ... | AND | Show SNAT verbose | ${dut1}
 | | ... | AND | Show SNAT verbose | ${dut2}
 | | ...
@@ -154,8 +156,8 @@
 | | And Apply startup configuration on all VPP DUTs
 | | When SNAT is initialized in a 3-node circular topology
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | 3-node-IPv4-SNAT-100u-15p | ${min_rate} | ${max_rate}
-| | ... | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc04-1518B-1t1c-ethip4udp-ip4scale100-udpsrcscale15-snat-pdrdisc
 | | [Documentation]
@@ -166,7 +168,7 @@
 | | ... | linerate, step 100kpps.
 | | ...
 | | [Teardown] | Performance test teardown | ${min_rate}pps | ${framesize}
-| | ... | 3-node-IPv4-SNAT-100u-15p
+| | ... | ${traffic_profile}
 | | ...
 | | [Tags] | 1518B | 1T1C | STHREAD | PDRDISC | SKIP_PATCH
 | | ...
@@ -183,8 +185,8 @@
 | | And Apply startup configuration on all VPP DUTs
 | | When SNAT is initialized in a 3-node circular topology
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | 3-node-IPv4-SNAT-100u-15p | ${min_rate} | ${max_rate}
-| | ... | ${threshold} | ${perf_pdr_loss_acceptance}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold} | ${perf_pdr_loss_acceptance}
 | | ... | ${perf_pdr_loss_acceptance_type}
 
 | tc05-IMIX-1t1c-ethip4udp-ip4scale100-udpsrcscale15-snat-ndrdisc
@@ -196,7 +198,7 @@
 | | ... | linerate, step 100kpps.
 | | ...
 | | [Teardown] | Run keywords | Performance test teardown | ${min_rate}pps
-| | ... | ${framesize} | 3-node-IPv4-SNAT-100u-15p
+| | ... | ${framesize} | ${traffic_profile}
 | | ... | AND | Show SNAT verbose | ${dut1}
 | | ... | AND | Show SNAT verbose | ${dut2}
 | | ...
@@ -215,8 +217,8 @@
 | | And Apply startup configuration on all VPP DUTs
 | | When SNAT is initialized in a 3-node circular topology
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | 3-node-IPv4-SNAT-100u-15p | ${min_rate} | ${max_rate}
-| | ... | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc06-IMIX-1t1c-ethip4udp-ip4scale100-udpsrcscale15-snat-pdrdisc
 | | [Documentation]
@@ -227,7 +229,7 @@
 | | ... | linerate, step 100kpps.
 | | ...
 | | [Teardown] | Performance test teardown | ${min_rate}pps | ${framesize}
-| | ... | 3-node-IPv4-SNAT-100u-15p
+| | ... | ${traffic_profile}
 | | ...
 | | [Tags] | IMIX | 1T1C | STHREAD | PDRDISC | SKIP_PATCH
 | | ...
@@ -244,6 +246,6 @@
 | | And Apply startup configuration on all VPP DUTs
 | | When SNAT is initialized in a 3-node circular topology
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | 3-node-IPv4-SNAT-100u-15p | ${min_rate} | ${max_rate}
-| | ... | ${threshold} | ${perf_pdr_loss_acceptance}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold} | ${perf_pdr_loss_acceptance}
 | | ... | ${perf_pdr_loss_acceptance_type}
diff --git a/tests/perf/10ge2p1x520-ethip4udp-ip4scale1000-udpsrcscale15-snat-ndrpdrdisc.robot b/tests/perf/10ge2p1x520-ethip4udp-ip4scale1000-udpsrcscale15-snat-ndrpdrdisc.robot
index 12a1b81bc2..4992d5dd61 100644
--- a/tests/perf/10ge2p1x520-ethip4udp-ip4scale1000-udpsrcscale15-snat-ndrpdrdisc.robot
+++ b/tests/perf/10ge2p1x520-ethip4udp-ip4scale1000-udpsrcscale15-snat-ndrpdrdisc.robot
@@ -63,6 +63,8 @@
 *** Variables ***
 # X520-DA2 bandwidth limit
 | ${s_limit} | ${10000000000}
+# Traffic profile:
+| ${traffic_profile} | trex-sl-3n-ethip4udp-1000u15p
 
 *** Test Cases ***
 | tc01-64B-1t1c-ethip4udp-ip4scale1000-udpsrcscale15-snat-ndrdisc
@@ -74,7 +76,7 @@
 | | ... | linerate, step 100kpps.
 | | ...
 | | [Teardown] | Run keywords | Performance test teardown | ${min_rate}pps
-| | ... | ${framesize} | 3-node-IPv4-SNAT-1000u-15p
+| | ... | ${framesize} | ${traffic_profile}
 | | ... | AND | Show SNAT verbose | ${dut1}
 | | ... | AND | Show SNAT verbose | ${dut2}
 | | ...
@@ -93,8 +95,8 @@
 | | And Apply startup configuration on all VPP DUTs
 | | When SNAT is initialized in a 3-node circular topology
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | 3-node-IPv4-SNAT-1000u-15p | ${min_rate} | ${max_rate}
-| | ... | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc02-64B-1t1c-ethip4udp-ip4scale1000-udpsrcscale15-snat-pdrdisc
 | | [Documentation]
@@ -105,7 +107,7 @@
 | | ... | linerate, step 100kpps.
 | | ...
 | | [Teardown] | Performance test teardown | ${min_rate}pps | ${framesize}
-| | ... | 3-node-IPv4-SNAT-1000u-15p
+| | ... | ${traffic_profile}
 | | ...
 | | [Tags] | 64B | 1T1C | STHREAD | PDRDISC | SKIP_PATCH
 | | ...
@@ -122,8 +124,8 @@
 | | And Apply startup configuration on all VPP DUTs
 | | When SNAT is initialized in a 3-node circular topology
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | 3-node-IPv4-SNAT-1000u-15p | ${min_rate} | ${max_rate}
-| | ... | ${threshold} | ${perf_pdr_loss_acceptance}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold} | ${perf_pdr_loss_acceptance}
 | | ... | ${perf_pdr_loss_acceptance_type}
 
 | tc03-1518B-1t1c-ethip4udp-ip4scale1000-udpsrcscale15-snat-ndrdisc
@@ -135,7 +137,7 @@
 | | ... | linerate, step 100kpps.
 | | ...
 | | [Teardown] | Run keywords | Performance test teardown | ${min_rate}pps
-| | ... | ${framesize} | 3-node-IPv4-SNAT-1000u-15p
+| | ... | ${framesize} | ${traffic_profile}
 | | ... | AND | Show SNAT verbose | ${dut1}
 | | ... | AND | Show SNAT verbose | ${dut2}
 | | ...
@@ -154,8 +156,8 @@
 | | And Apply startup configuration on all VPP DUTs
 | | When SNAT is initialized in a 3-node circular topology
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | 3-node-IPv4-SNAT-1000u-15p | ${min_rate} | ${max_rate}
-| | ... | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc04-1518B-1t1c-ethip4udp-ip4scale1000-udpsrcscale15-snat-pdrdisc
 | | [Documentation]
@@ -166,7 +168,7 @@
 | | ... | linerate, step 100kpps.
 | | ...
 | | [Teardown] | Performance test teardown | ${min_rate}pps | ${framesize}
-| | ... | 3-node-IPv4-SNAT-1000u-15p
+| | ... | ${traffic_profile}
 | | ...
 | | [Tags] | 1518B | 1T1C | STHREAD | PDRDISC | SKIP_PATCH
 | | ...
@@ -183,8 +185,8 @@
 | | And Apply startup configuration on all VPP DUTs
 | | When SNAT is initialized in a 3-node circular topology
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | 3-node-IPv4-SNAT-1000u-15p | ${min_rate} | ${max_rate}
-| | ... | ${threshold} | ${perf_pdr_loss_acceptance}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold} | ${perf_pdr_loss_acceptance}
 | | ... | ${perf_pdr_loss_acceptance_type}
 
 | tc05-IMIX-1t1c-ethip4udp-ip4scale1000-udpsrcscale15-snat-ndrdisc
@@ -196,7 +198,7 @@
 | | ... | linerate, step 100kpps.
 | | ...
 | | [Teardown] | Run keywords | Performance test teardown | ${min_rate}pps
-| | ... | ${framesize} | 3-node-IPv4-SNAT-1000u-15p
+| | ... | ${framesize} | ${traffic_profile}
 | | ... | AND | Show SNAT verbose | ${dut1}
 | | ... | AND | Show SNAT verbose | ${dut2}
 | | ...
@@ -215,8 +217,8 @@
 | | And Apply startup configuration on all VPP DUTs
 | | When SNAT is initialized in a 3-node circular topology
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | 3-node-IPv4-SNAT-1000u-15p | ${min_rate} | ${max_rate}
-| | ... | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc06-IMIX-1t1c-ethip4udp-ip4scale1000-udpsrcscale15-snat-pdrdisc
 | | [Documentation]
@@ -227,7 +229,7 @@
 | | ... | linerate, step 100kpps.
 | | ...
 | | [Teardown] | Performance test teardown | ${min_rate}pps | ${framesize}
-| | ... | 3-node-IPv4-SNAT-1000u-15p
+| | ... | ${traffic_profile}
 | | ...
 | | [Tags] | IMIX | 1T1C | STHREAD | PDRDISC | SKIP_PATCH
 | | ...
@@ -244,6 +246,6 @@
 | | And Apply startup configuration on all VPP DUTs
 | | When SNAT is initialized in a 3-node circular topology
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | 3-node-IPv4-SNAT-1000u-15p | ${min_rate} | ${max_rate}
-| | ... | ${threshold} | ${perf_pdr_loss_acceptance}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold} | ${perf_pdr_loss_acceptance}
 | | ... | ${perf_pdr_loss_acceptance_type}
diff --git a/tests/perf/10ge2p1x520-ethip4udp-ip4scale2000-udpsrcscale15-snat-ndrpdrdisc.robot b/tests/perf/10ge2p1x520-ethip4udp-ip4scale2000-udpsrcscale15-snat-ndrpdrdisc.robot
index 64b9339f9e..427f4e2dd5 100644
--- a/tests/perf/10ge2p1x520-ethip4udp-ip4scale2000-udpsrcscale15-snat-ndrpdrdisc.robot
+++ b/tests/perf/10ge2p1x520-ethip4udp-ip4scale2000-udpsrcscale15-snat-ndrpdrdisc.robot
@@ -63,6 +63,8 @@
 *** Variables ***
 # X520-DA2 bandwidth limit
 | ${s_limit} | ${10000000000}
+# Traffic profile:
+| ${traffic_profile} | trex-sl-3n-ethip4udp-2000u15p
 
 *** Test Cases ***
 | tc01-64B-1t1c-ethip4udp-ip4scale2000-udpsrcscale15-snat-ndrdisc
@@ -74,7 +76,7 @@
 | | ... | linerate, step 100kpps.
 | | ...
 | | [Teardown] | Run keywords | Performance test teardown | ${min_rate}pps
-| | ... | ${framesize} | 3-node-IPv4-SNAT-2000u-15p
+| | ... | ${framesize} | ${traffic_profile}
 | | ... | AND | Show SNAT verbose | ${dut1}
 | | ... | AND | Show SNAT verbose | ${dut2}
 | | ...
@@ -93,8 +95,8 @@
 | | And Apply startup configuration on all VPP DUTs
 | | When SNAT is initialized in a 3-node circular topology
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | 3-node-IPv4-SNAT-2000u-15p | ${min_rate} | ${max_rate}
-| | ... | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc02-64B-1t1c-ethip4udp-ip4scale2000-udpsrcscale15-snat-pdrdisc
 | | [Documentation]
@@ -105,7 +107,7 @@
 | | ... | linerate, step 100kpps.
 | | ...
 | | [Teardown] | Performance test teardown | ${min_rate}pps | ${framesize}
-| | ... | 3-node-IPv4-SNAT-2000u-15p
+| | ... | ${traffic_profile}
 | | ...
 | | [Tags] | 64B | 1T1C | STHREAD | PDRDISC | SKIP_PATCH
 | | ...
@@ -122,6 +124,6 @@
 | | And Apply startup configuration on all VPP DUTs
 | | When SNAT is initialized in a 3-node circular topology
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | 3-node-IPv4-SNAT-2000u-15p | ${min_rate} | ${max_rate}
-| | ... | ${threshold} | ${perf_pdr_loss_acceptance}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold} | ${perf_pdr_loss_acceptance}
 | | ... | ${perf_pdr_loss_acceptance_type}
diff --git a/tests/perf/10ge2p1x520-ethip4udp-ip4scale4000-udpsrcscale15-snat-ndrpdrdisc.robot b/tests/perf/10ge2p1x520-ethip4udp-ip4scale4000-udpsrcscale15-snat-ndrpdrdisc.robot
index 377833ed57..6590132e74 100644
--- a/tests/perf/10ge2p1x520-ethip4udp-ip4scale4000-udpsrcscale15-snat-ndrpdrdisc.robot
+++ b/tests/perf/10ge2p1x520-ethip4udp-ip4scale4000-udpsrcscale15-snat-ndrpdrdisc.robot
@@ -63,6 +63,8 @@
 *** Variables ***
 # X520-DA2 bandwidth limit
 | ${s_limit} | ${10000000000}
+# Traffic profile:
+| ${traffic_profile} | trex-sl-3n-ethip4udp-4000u15p
 
 *** Test Cases ***
 | tc01-64B-1t1c-ethip4udp-ip4scale4000-udpsrcscale15-snat-ndrdisc
@@ -74,7 +76,7 @@
 | | ... | linerate, step 100kpps.
 | | ...
 | | [Teardown] | Run keywords | Performance test teardown | ${min_rate}pps
-| | ... | ${framesize} | 3-node-IPv4-SNAT-4000u-15p
+| | ... | ${framesize} | ${traffic_profile}
 | | ... | AND | Show SNAT verbose | ${dut1}
 | | ... | AND | Show SNAT verbose | ${dut2}
 | | ...
@@ -93,8 +95,8 @@
 | | And Apply startup configuration on all VPP DUTs
 | | When SNAT is initialized in a 3-node circular topology
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | 3-node-IPv4-SNAT-4000u-15p | ${min_rate} | ${max_rate}
-| | ... | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc02-64B-1t1c-ethip4udp-ip4scale4000-udpsrcscale15-snat-pdrdisc
 | | [Documentation]
@@ -105,7 +107,7 @@
 | | ... | linerate, step 100kpps.
 | | ...
 | | [Teardown] | Performance test teardown | ${min_rate}pps | ${framesize}
-| | ... | 3-node-IPv4-SNAT-4000u-15p
+| | ... | ${traffic_profile}
 | | ...
 | | [Tags] | 64B | 1T1C | STHREAD | PDRDISC | SKIP_PATCH
 | | ...
@@ -122,6 +124,6 @@
 | | And Apply startup configuration on all VPP DUTs
 | | When SNAT is initialized in a 3-node circular topology
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | 3-node-IPv4-SNAT-4000u-15p | ${min_rate} | ${max_rate}
-| | ... | ${threshold} | ${perf_pdr_loss_acceptance}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold} | ${perf_pdr_loss_acceptance}
 | | ... | ${perf_pdr_loss_acceptance_type}
diff --git a/tests/perf/10ge2p1x520-ethip4vxlan-l2bdbasemaclrn-eth-2vhost-1vm-ndrpdrdisc.robot b/tests/perf/10ge2p1x520-ethip4vxlan-l2bdbasemaclrn-eth-2vhost-1vm-ndrpdrdisc.robot
index f4e0f4d047..07bbfc7bf2 100644
--- a/tests/perf/10ge2p1x520-ethip4vxlan-l2bdbasemaclrn-eth-2vhost-1vm-ndrpdrdisc.robot
+++ b/tests/perf/10ge2p1x520-ethip4vxlan-l2bdbasemaclrn-eth-2vhost-1vm-ndrpdrdisc.robot
@@ -25,7 +25,7 @@
 | ...
 | Test Setup | Performance test setup
 | Test Teardown | Performance test with vhost and VM with dpdk-testpmd teardown
-| ... | ${min_rate}pps | ${framesize} | 3-node-bridge
+| ... | ${min_rate}pps | ${framesize} | ${traffic_profile}
 | ... | dut1_node=${dut1} | dut1_vm_refs=${dut1_vm_refs}
 | ... | dut2_node=${dut2} | dut2_vm_refs=${dut2_vm_refs}
 | ...
@@ -67,6 +67,8 @@
 | ${bd_id2}= | 2
 | ${sock1}= | /tmp/sock-1-${bd_id1}
 | ${sock2}= | /tmp/sock-1-${bd_id2}
+# Traffic profile:
+| ${traffic_profile} | trex-sl-3n-ethip4-ip4src254
 
 *** Test Cases ***
 | tc01-64B-1t1c-ethip4vxlan-l2bdbasemaclrn-eth-2vhost-1vm-ndrdisc
@@ -99,8 +101,8 @@
 | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
-| | ... | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc02-64B-1t1c-ethip4vxlan-l2bdbasemaclrn-eth-2vhost-1vm-pdrdisc
 | | [Documentation]
@@ -132,8 +134,8 @@
 | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
-| | ... | ${threshold} | ${perf_pdr_loss_acceptance}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold} | ${perf_pdr_loss_acceptance}
 | | ... | ${perf_pdr_loss_acceptance_type}
 
 | tc03-1518B-1t1c-ethip4vxlan-l2bdbasemaclrn-eth-2vhost-1vm-ndrdisc
@@ -165,8 +167,8 @@
 | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
-| | ... | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc04-1518B-1t1c-ethip4vxlan-l2bdbasemaclrn-eth-2vhost-1vm-pdrdisc
 | | [Documentation]
@@ -197,8 +199,8 @@
 | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
-| | ... | ${threshold} | ${perf_pdr_loss_acceptance}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold} | ${perf_pdr_loss_acceptance}
 | | ... | ${perf_pdr_loss_acceptance_type}
 
 | tc05-IMIX-1t1c-ethip4vxlan-l2bdbasemaclrn-eth-2vhost-1vm-ndrdisc
@@ -232,8 +234,8 @@
 | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
-| | ... | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc06-IMIX-1t1c-ethip4vxlan-l2bdbasemaclrn-eth-2vhost-1vm-pdrdisc
 | | [Documentation]
@@ -266,8 +268,8 @@
 | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
-| | ... | ${threshold} | ${perf_pdr_loss_acceptance}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold} | ${perf_pdr_loss_acceptance}
 | | ... | ${perf_pdr_loss_acceptance_type}
 
 | tc07-64B-2t2c-ethip4vxlan-l2bdbasemaclrn-eth-2vhost-1vm-ndrdisc
@@ -300,8 +302,8 @@
 | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
-| | ... | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc08-64B-2t2c-ethip4vxlan-l2bdbasemaclrn-eth-2vhost-1vm-pdrdisc
 | | [Documentation]
@@ -333,8 +335,8 @@
 | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
-| | ... | ${threshold} | ${perf_pdr_loss_acceptance}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold} | ${perf_pdr_loss_acceptance}
 | | ... | ${perf_pdr_loss_acceptance_type}
 
 | tc09-1518B-2t2c-ethip4vxlan-l2bdbasemaclrn-eth-2vhost-1vm-ndrdisc
@@ -366,8 +368,8 @@
 | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
-| | ... | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc10-1518B-2t2c-ethip4vxlan-l2bdbasemaclrn-eth-2vhost-1vm-pdrdisc
 | | [Documentation]
@@ -398,8 +400,8 @@
 | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
-| | ... | ${threshold} | ${perf_pdr_loss_acceptance}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold} | ${perf_pdr_loss_acceptance}
 | | ... | ${perf_pdr_loss_acceptance_type}
 
 | tc11-IMIX-2t2c-ethip4vxlan-l2bdbasemaclrn-eth-2vhost-1vm-ndrdisc
@@ -433,8 +435,8 @@
 | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
-| | ... | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc12-IMIX-2t2c-ethip4vxlan-l2bdbasemaclrn-eth-2vhost-1vm-pdrdisc
 | | [Documentation]
@@ -467,8 +469,8 @@
 | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
-| | ... | ${threshold} | ${perf_pdr_loss_acceptance}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold} | ${perf_pdr_loss_acceptance}
 | | ... | ${perf_pdr_loss_acceptance_type}
 
 | tc13-64B-4t4c-ethip4vxlan-l2bdbasemaclrn-eth-2vhost-1vm-ndrdisc
@@ -501,8 +503,8 @@
 | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
-| | ... | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc14-64B-4t4c-ethip4vxlan-l2bdbasemaclrn-eth-2vhost-1vm-pdrdisc
 | | [Documentation]
@@ -534,8 +536,8 @@
 | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
-| | ... | ${threshold} | ${perf_pdr_loss_acceptance}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold} | ${perf_pdr_loss_acceptance}
 | | ... | ${perf_pdr_loss_acceptance_type}
 
 | tc15-1518B-4t4c-ethip4vxlan-l2bdbasemaclrn-eth-2vhost-1vm-ndrdisc
@@ -567,8 +569,8 @@
 | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
-| | ... | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc16-1518B-4t4c-ethip4vxlan-l2bdbasemaclrn-eth-2vhost-1vm-pdrdisc
 | | [Documentation]
@@ -599,8 +601,8 @@
 | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
-| | ... | ${threshold} | ${perf_pdr_loss_acceptance}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold} | ${perf_pdr_loss_acceptance}
 | | ... | ${perf_pdr_loss_acceptance_type}
 
 | tc17-IMIX-4t4c-ethip4vxlan-l2bdbasemaclrn-eth-2vhost-1vm-ndrdisc
@@ -634,8 +636,8 @@
 | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
-| | ... | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc18-IMIX-4t4c-ethip4vxlan-l2bdbasemaclrn-eth-2vhost-1vm-pdrdisc
 | | [Documentation]
@@ -668,6 +670,6 @@
 | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
-| | ... | ${threshold} | ${perf_pdr_loss_acceptance}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold} | ${perf_pdr_loss_acceptance}
 | | ... | ${perf_pdr_loss_acceptance_type}
diff --git a/tests/perf/10ge2p1x520-ethip4vxlan-l2bdbasemaclrn-ndrpdrdisc.robot b/tests/perf/10ge2p1x520-ethip4vxlan-l2bdbasemaclrn-ndrpdrdisc.robot
index eeddf9f521..8887b357a4 100644
--- a/tests/perf/10ge2p1x520-ethip4vxlan-l2bdbasemaclrn-ndrpdrdisc.robot
+++ b/tests/perf/10ge2p1x520-ethip4vxlan-l2bdbasemaclrn-ndrpdrdisc.robot
@@ -23,7 +23,7 @@
 | ...
 | Test Setup | Performance test setup
 | Test Teardown | Performance test teardown | ${min_rate}pps | ${framesize}
-| ... | 3-node-bridge
+| ... | ${traffic_profile}
 | ...
 | Documentation | *RFC2544: Packet throughput L2BD with VXLANoIPv4 test cases*
 | ...
@@ -52,6 +52,8 @@
 # X520-DA2 bandwidth limit
 | ${s_limit} | ${10000000000}
 | ${vxlan_overhead} | ${50}
+# Traffic profile:
+| ${traffic_profile} | trex-sl-3n-ethip4-ip4src254
 
 *** Test Cases ***
 | tc01-64B-1t1c-ethip4vxlan-l2bdbasemaclrn-ndrdisc
@@ -75,8 +77,8 @@
 | | And Apply startup configuration on all VPP DUTs
 | | And L2 bridge domain with VXLANoIPv4 initialized in a 3-node circular topology
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
-| | ... | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc02-64B-1t1c-ethip4vxlan-l2bdbasemaclrn-pdrdisc
 | | [Documentation]
@@ -99,8 +101,8 @@
 | | And Apply startup configuration on all VPP DUTs
 | | And L2 bridge domain with VXLANoIPv4 initialized in a 3-node circular topology
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
-| | ... | ${threshold} | ${perf_pdr_loss_acceptance}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold} | ${perf_pdr_loss_acceptance}
 | | ... | ${perf_pdr_loss_acceptance_type}
 
 | tc03-1518B-1t1c-ethip4vxlan-l2bdbasemaclrn-ndrdisc
@@ -123,8 +125,8 @@
 | | And Apply startup configuration on all VPP DUTs
 | | And L2 bridge domain with VXLANoIPv4 initialized in a 3-node circular topology
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
-| | ... | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc04-1518B-1t1c-ethip4vxlan-l2bdbasemaclrn-pdrdisc
 | | [Documentation]
@@ -146,8 +148,8 @@
 | | And Apply startup configuration on all VPP DUTs
 | | And L2 bridge domain with VXLANoIPv4 initialized in a 3-node circular topology
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
-| | ... | ${threshold} | ${perf_pdr_loss_acceptance}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold} | ${perf_pdr_loss_acceptance}
 | | ... | ${perf_pdr_loss_acceptance_type}
 
 | tc05-9000B-1t1c-ethip4vxlan-l2bdbasemaclrn-ndrdisc
@@ -170,8 +172,8 @@
 | | And Apply startup configuration on all VPP DUTs
 | | And L2 bridge domain with VXLANoIPv4 initialized in a 3-node circular topology
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
-| | ... | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc06-9000B-1t1c-ethip4vxlan-l2bdbasemaclrn-pdrdisc
 | | [Documentation]
@@ -193,8 +195,8 @@
 | | And Apply startup configuration on all VPP DUTs
 | | And L2 bridge domain with VXLANoIPv4 initialized in a 3-node circular topology
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
-| | ... | ${threshold} | ${perf_pdr_loss_acceptance}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold} | ${perf_pdr_loss_acceptance}
 | | ... | ${perf_pdr_loss_acceptance_type}
 
 | tc07-64B-2t2c-ethip4vxlan-l2bdbasemaclrn-ndrdisc
@@ -218,8 +220,8 @@
 | | And Apply startup configuration on all VPP DUTs
 | | And L2 bridge domain with VXLANoIPv4 initialized in a 3-node circular topology
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
-| | ... | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc08-64B-2t2c-ethip4vxlan-l2bdbasemaclrn-pdrdisc
 | | [Documentation]
@@ -242,8 +244,8 @@
 | | And Apply startup configuration on all VPP DUTs
 | | And L2 bridge domain with VXLANoIPv4 initialized in a 3-node circular topology
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
-| | ... | ${threshold} | ${perf_pdr_loss_acceptance}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold} | ${perf_pdr_loss_acceptance}
 | | ... | ${perf_pdr_loss_acceptance_type}
 
 | tc09-1518B-2t2c-ethip4vxlan-l2bdbasemaclrn-ndrdisc
@@ -266,8 +268,8 @@
 | | And Apply startup configuration on all VPP DUTs
 | | And L2 bridge domain with VXLANoIPv4 initialized in a 3-node circular topology
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
-| | ... | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc10-1518B-2t2c-ethip4vxlan-l2bdbasemaclrn-pdrdisc
 | | [Documentation]
@@ -289,8 +291,8 @@
 | | And Apply startup configuration on all VPP DUTs
 | | And L2 bridge domain with VXLANoIPv4 initialized in a 3-node circular topology
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
-| | ... | ${threshold} | ${perf_pdr_loss_acceptance}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold} | ${perf_pdr_loss_acceptance}
 | | ... | ${perf_pdr_loss_acceptance_type}
 
 | tc11-9000B-2t2c-ethip4vxlan-l2bdbasemaclrn-ndrdisc
@@ -313,8 +315,8 @@
 | | And Apply startup configuration on all VPP DUTs
 | | And L2 bridge domain with VXLANoIPv4 initialized in a 3-node circular topology
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
-| | ... | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc12-9000B-2t2c-ethip4vxlan-l2bdbasemaclrn-pdrdisc
 | | [Documentation]
@@ -336,8 +338,8 @@
 | | And Apply startup configuration on all VPP DUTs
 | | And L2 bridge domain with VXLANoIPv4 initialized in a 3-node circular topology
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
-| | ... | ${threshold} | ${perf_pdr_loss_acceptance}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold} | ${perf_pdr_loss_acceptance}
 | | ... | ${perf_pdr_loss_acceptance_type}
 
 | tc13-64B-4t4c-ethip4vxlan-l2bdbasemaclrn-ndrdisc
@@ -361,8 +363,8 @@
 | | And Apply startup configuration on all VPP DUTs
 | | And L2 bridge domain with VXLANoIPv4 initialized in a 3-node circular topology
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
-| | ... | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc14-64B-4t4c-ethip4vxlan-l2bdbasemaclrn-pdrdisc
 | | [Documentation]
@@ -385,8 +387,8 @@
 | | And Apply startup configuration on all VPP DUTs
 | | And L2 bridge domain with VXLANoIPv4 initialized in a 3-node circular topology
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
-| | ... | ${threshold} | ${perf_pdr_loss_acceptance}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold} | ${perf_pdr_loss_acceptance}
 | | ... | ${perf_pdr_loss_acceptance_type}
 
 | tc15-1518B-4t4c-ethip4vxlan-l2bdbasemaclrn-ndrdisc
@@ -409,8 +411,8 @@
 | | And Apply startup configuration on all VPP DUTs
 | | And L2 bridge domain with VXLANoIPv4 initialized in a 3-node circular topology
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
-| | ... | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc16-1518B-4t4c-ethip4vxlan-l2bdbasemaclrn-pdrdisc
 | | [Documentation]
@@ -432,8 +434,8 @@
 | | And Apply startup configuration on all VPP DUTs
 | | And L2 bridge domain with VXLANoIPv4 initialized in a 3-node circular topology
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
-| | ... | ${threshold} | ${perf_pdr_loss_acceptance}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold} | ${perf_pdr_loss_acceptance}
 | | ... | ${perf_pdr_loss_acceptance_type}
 
 | tc17-9000B-4t4c-ethip4vxlan-l2bdbasemaclrn-ndrdisc
@@ -456,8 +458,8 @@
 | | And Apply startup configuration on all VPP DUTs
 | | And L2 bridge domain with VXLANoIPv4 initialized in a 3-node circular topology
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
-| | ... | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc18-9000B-4t4c-ethip4vxlan-l2bdbasemaclrn-pdrdisc
 | | [Documentation]
@@ -479,6 +481,6 @@
 | | And Apply startup configuration on all VPP DUTs
 | | And L2 bridge domain with VXLANoIPv4 initialized in a 3-node circular topology
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
-| | ... | ${threshold} | ${perf_pdr_loss_acceptance}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold} | ${perf_pdr_loss_acceptance}
 | | ... | ${perf_pdr_loss_acceptance_type}
diff --git a/tests/perf/10ge2p1x520-ethip4vxlan-l2xcbase-ndrchk.robot b/tests/perf/10ge2p1x520-ethip4vxlan-l2xcbase-ndrchk.robot
index 9eb33ebf7d..2cd2c26023 100644
--- a/tests/perf/10ge2p1x520-ethip4vxlan-l2xcbase-ndrchk.robot
+++ b/tests/perf/10ge2p1x520-ethip4vxlan-l2xcbase-ndrchk.robot
@@ -46,6 +46,10 @@
 | ... | TG node interfaces.
 | ... | *[Ref] Applicable standard specifications:* RFC2544, RFC7348.
 
+*** Variables ***
+# Traffic profile:
+| ${traffic_profile} | trex-sl-3n-ethip4-ip4src254
+
 *** Test Cases ***
 | tc01-64B-1t1c-ethip4vxlan-l2xcbase-ndrchk
 | | [Documentation]
@@ -61,7 +65,7 @@
 | | And Apply startup configuration on all VPP DUTs
 | | And L2 xconnect with VXLANoIPv4 initialized in a 3-node circular topology
 | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | 3-node-xconnect
+| | ... | ${framesize} | ${traffic_profile}
 
 | tc02-1518B-1t1c-ethip4vxlan-l2xcbase-ndrchk
 | | [Documentation]
@@ -76,7 +80,7 @@
 | | And Apply startup configuration on all VPP DUTs
 | | And L2 xconnect with VXLANoIPv4 initialized in a 3-node circular topology
 | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | 3-node-xconnect
+| | ... | ${framesize} | ${traffic_profile}
 
 | tc03-9000B-1t1c-ethip4vxlan-l2xcbase-ndrchk
 | | [Documentation]
@@ -91,7 +95,7 @@
 | | And Apply startup configuration on all VPP DUTs
 | | And L2 xconnect with VXLANoIPv4 initialized in a 3-node circular topology
 | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | 3-node-xconnect
+| | ... | ${framesize} | ${traffic_profile}
 
 | tc04-64B-2t2c-ethip4vxlan-l2xcbase-ndrchk
 | | [Documentation]
@@ -107,7 +111,7 @@
 | | And Apply startup configuration on all VPP DUTs
 | | And L2 xconnect with VXLANoIPv4 initialized in a 3-node circular topology
 | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | 3-node-xconnect
+| | ... | ${framesize} | ${traffic_profile}
 
 | tc05-1518B-2t2c-ethip4vxlan-l2xcbase-ndrchk
 | | [Documentation]
@@ -122,7 +126,7 @@
 | | And Apply startup configuration on all VPP DUTs
 | | And L2 xconnect with VXLANoIPv4 initialized in a 3-node circular topology
 | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | 3-node-xconnect
+| | ... | ${framesize} | ${traffic_profile}
 
 | tc06-9000B-2t2c-ethip4vxlan-l2xcbase-ndrchk
 | | [Documentation]
@@ -137,7 +141,7 @@
 | | And Apply startup configuration on all VPP DUTs
 | | And L2 xconnect with VXLANoIPv4 initialized in a 3-node circular topology
 | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | 3-node-xconnect
+| | ... | ${framesize} | ${traffic_profile}
 
 | tc07-64B-4t4c-ethip4vxlan-l2xcbase-ndrchk
 | | [Documentation]
@@ -153,7 +157,7 @@
 | | And Apply startup configuration on all VPP DUTs
 | | And L2 xconnect with VXLANoIPv4 initialized in a 3-node circular topology
 | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | 3-node-xconnect
+| | ... | ${framesize} | ${traffic_profile}
 
 | tc08-1518B-4t4c-ethip4vxlan-l2xcbase-ndrchk
 | | [Documentation]
@@ -168,7 +172,7 @@
 | | And Apply startup configuration on all VPP DUTs
 | | And L2 xconnect with VXLANoIPv4 initialized in a 3-node circular topology
 | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | 3-node-xconnect
+| | ... | ${framesize} | ${traffic_profile}
 
 | tc09-9000B-4t4c-ethip4vxlan-l2xcbase-ndrchk
 | | [Documentation]
@@ -183,4 +187,4 @@
 | | And Apply startup configuration on all VPP DUTs
 | | And L2 xconnect with VXLANoIPv4 initialized in a 3-node circular topology
 | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | 3-node-xconnect
+| | ... | ${framesize} | ${traffic_profile}
diff --git a/tests/perf/10ge2p1x520-ethip4vxlan-l2xcbase-ndrpdrdisc.robot b/tests/perf/10ge2p1x520-ethip4vxlan-l2xcbase-ndrpdrdisc.robot
index 9a8b76974f..73696d2a0f 100644
--- a/tests/perf/10ge2p1x520-ethip4vxlan-l2xcbase-ndrpdrdisc.robot
+++ b/tests/perf/10ge2p1x520-ethip4vxlan-l2xcbase-ndrpdrdisc.robot
@@ -23,7 +23,7 @@
 | ...
 | Test Setup | Performance test setup
 | Test Teardown | Performance test teardown | ${min_rate}pps | ${framesize}
-| ... | 3-node-bridge
+| ... | ${traffic_profile}
 | ...
 | Documentation | *RFC2544: Pkt throughput L2XC with VXLANoIPv4 test cases*
 | ...
@@ -51,6 +51,8 @@
 *** Variables ***
 # X520-DA2 bandwidth limit
 | ${s_limit} | ${10000000000}
+# Traffic profile:
+| ${traffic_profile} | trex-sl-3n-ethip4-ip4src254
 
 *** Test Cases ***
 | tc01-64B-1t1c-ethip4vxlan-l2xcbase-ndrdisc
@@ -66,14 +68,13 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | And   L2 xconnect with VXLANoIPv4 initialized in a 3-node circular topology
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | And L2 xconnect with VXLANoIPv4 initialized in a 3-node circular topology
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-xconnect
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc02-64B-1t1c-ethip4vxlan-l2xcbase-pdrdisc
 | | [Documentation]
@@ -88,16 +89,14 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | And   L2 xconnect with VXLANoIPv4 initialized in a 3-node circular topology
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | And L2 xconnect with VXLANoIPv4 initialized in a 3-node circular topology
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-xconnect
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
-| | ...                                       | ${perf_pdr_loss_acceptance}
-| | ...                                       | ${perf_pdr_loss_acceptance_type}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
+| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
 
 | tc03-1518B-1t1c-ethip4vxlan-l2xcbase-ndrdisc
 | | [Documentation]
@@ -112,13 +111,12 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Apply startup configuration on all VPP DUTs
-| | And   L2 xconnect with VXLANoIPv4 initialized in a 3-node circular topology
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Apply startup configuration on all VPP DUTs
+| | And L2 xconnect with VXLANoIPv4 initialized in a 3-node circular topology
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-xconnect
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc04-1518B-1t1c-ethip4vxlan-l2xcbase-pdrdisc
 | | [Documentation]
@@ -133,15 +131,13 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Apply startup configuration on all VPP DUTs
-| | And   L2 xconnect with VXLANoIPv4 initialized in a 3-node circular topology
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Apply startup configuration on all VPP DUTs
+| | And L2 xconnect with VXLANoIPv4 initialized in a 3-node circular topology
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-xconnect
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
-| | ...                                       | ${perf_pdr_loss_acceptance}
-| | ...                                       | ${perf_pdr_loss_acceptance_type}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
+| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
 
 | tc05-9000B-1t1c-ethip4vxlan-l2xcbase-ndrdisc
 | | [Documentation]
@@ -156,13 +152,12 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Apply startup configuration on all VPP DUTs
-| | And   L2 xconnect with VXLANoIPv4 initialized in a 3-node circular topology
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Apply startup configuration on all VPP DUTs
+| | And L2 xconnect with VXLANoIPv4 initialized in a 3-node circular topology
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-xconnect
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc06-9000B-1t1c-ethip4vxlan-l2xcbase-pdrdisc
 | | [Documentation]
@@ -177,15 +172,13 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Apply startup configuration on all VPP DUTs
-| | And   L2 xconnect with VXLANoIPv4 initialized in a 3-node circular topology
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Apply startup configuration on all VPP DUTs
+| | And L2 xconnect with VXLANoIPv4 initialized in a 3-node circular topology
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-xconnect
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
-| | ...                                       | ${perf_pdr_loss_acceptance}
-| | ...                                       | ${perf_pdr_loss_acceptance_type}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
+| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
 
 | tc07-64B-2t2c-ethip4vxlan-l2xcbase-ndrdisc
 | | [Documentation]
@@ -200,14 +193,13 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | And   L2 xconnect with VXLANoIPv4 initialized in a 3-node circular topology
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | And L2 xconnect with VXLANoIPv4 initialized in a 3-node circular topology
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-xconnect
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc08-64B-2t2c-ethip4vxlan-l2xcbase-pdrdisc
 | | [Documentation]
@@ -222,16 +214,14 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | And   L2 xconnect with VXLANoIPv4 initialized in a 3-node circular topology
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | And L2 xconnect with VXLANoIPv4 initialized in a 3-node circular topology
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-xconnect
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
-| | ...                                       | ${perf_pdr_loss_acceptance}
-| | ...                                       | ${perf_pdr_loss_acceptance_type}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
+| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
 
 | tc09-1518B-2t2c-ethip4vxlan-l2xcbase-ndrdisc
 | | [Documentation]
@@ -246,13 +236,12 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Apply startup configuration on all VPP DUTs
-| | And   L2 xconnect with VXLANoIPv4 initialized in a 3-node circular topology
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Apply startup configuration on all VPP DUTs
+| | And L2 xconnect with VXLANoIPv4 initialized in a 3-node circular topology
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-xconnect
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc10-1518B-2t2c-ethip4vxlan-l2xcbase-pdrdisc
 | | [Documentation]
@@ -267,15 +256,13 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Apply startup configuration on all VPP DUTs
-| | And   L2 xconnect with VXLANoIPv4 initialized in a 3-node circular topology
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Apply startup configuration on all VPP DUTs
+| | And L2 xconnect with VXLANoIPv4 initialized in a 3-node circular topology
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-xconnect
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
-| | ...                                       | ${perf_pdr_loss_acceptance}
-| | ...                                       | ${perf_pdr_loss_acceptance_type}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
+| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
 
 | tc11-9000B-2t2c-ethip4vxlan-l2xcbase-ndrdisc
 | | [Documentation]
@@ -290,13 +277,12 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Apply startup configuration on all VPP DUTs
-| | And   L2 xconnect with VXLANoIPv4 initialized in a 3-node circular topology
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Apply startup configuration on all VPP DUTs
+| | And L2 xconnect with VXLANoIPv4 initialized in a 3-node circular topology
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-xconnect
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc12-9000B-2t2c-ethip4vxlan-l2xcbase-pdrdisc
 | | [Documentation]
@@ -311,15 +297,13 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Apply startup configuration on all VPP DUTs
-| | And   L2 xconnect with VXLANoIPv4 initialized in a 3-node circular topology
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Apply startup configuration on all VPP DUTs
+| | And L2 xconnect with VXLANoIPv4 initialized in a 3-node circular topology
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-xconnect
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
-| | ...                                       | ${perf_pdr_loss_acceptance}
-| | ...                                       | ${perf_pdr_loss_acceptance_type}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
+| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
 
 | tc13-64B-4t4c-ethip4vxlan-l2xcbase-ndrdisc
 | | [Documentation]
@@ -334,14 +318,13 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | And   L2 xconnect with VXLANoIPv4 initialized in a 3-node circular topology
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | And L2 xconnect with VXLANoIPv4 initialized in a 3-node circular topology
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-xconnect
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc14-64B-4t4c-ethip4vxlan-l2xcbase-pdrdisc
 | | [Documentation]
@@ -356,16 +339,14 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | And   L2 xconnect with VXLANoIPv4 initialized in a 3-node circular topology
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | And L2 xconnect with VXLANoIPv4 initialized in a 3-node circular topology
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-xconnect
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
-| | ...                                       | ${perf_pdr_loss_acceptance}
-| | ...                                       | ${perf_pdr_loss_acceptance_type}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
+| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
 
 | tc15-1518B-4t4c-ethip4vxlan-l2xcbase-ndrdisc
 | | [Documentation]
@@ -380,13 +361,12 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Apply startup configuration on all VPP DUTs
-| | And   L2 xconnect with VXLANoIPv4 initialized in a 3-node circular topology
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Apply startup configuration on all VPP DUTs
+| | And L2 xconnect with VXLANoIPv4 initialized in a 3-node circular topology
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-xconnect
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc16-1518B-4t4c-ethip4vxlan-l2xcbase-pdrdisc
 | | [Documentation]
@@ -401,15 +381,13 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Apply startup configuration on all VPP DUTs
-| | And   L2 xconnect with VXLANoIPv4 initialized in a 3-node circular topology
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Apply startup configuration on all VPP DUTs
+| | And L2 xconnect with VXLANoIPv4 initialized in a 3-node circular topology
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-xconnect
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
-| | ...                                       | ${perf_pdr_loss_acceptance}
-| | ...                                       | ${perf_pdr_loss_acceptance_type}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
+| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
 
 | tc17-9000B-4t4c-ethip4vxlan-l2xcbase-ndrdisc
 | | [Documentation]
@@ -424,13 +402,12 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Apply startup configuration on all VPP DUTs
-| | And   L2 xconnect with VXLANoIPv4 initialized in a 3-node circular topology
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Apply startup configuration on all VPP DUTs
+| | And L2 xconnect with VXLANoIPv4 initialized in a 3-node circular topology
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-xconnect
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc18-9000B-4t4c-ethip4vxlan-l2xcbase-pdrdisc
 | | [Documentation]
@@ -445,12 +422,10 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Apply startup configuration on all VPP DUTs
-| | And   L2 xconnect with VXLANoIPv4 initialized in a 3-node circular topology
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Apply startup configuration on all VPP DUTs
+| | And L2 xconnect with VXLANoIPv4 initialized in a 3-node circular topology
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-xconnect
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
-| | ...                                       | ${perf_pdr_loss_acceptance}
-| | ...                                       | ${perf_pdr_loss_acceptance_type}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
+| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
diff --git a/tests/perf/10ge2p1x520-ethip6-ip6base-copwhtlistbase-ndrchk.robot b/tests/perf/10ge2p1x520-ethip6-ip6base-copwhtlistbase-ndrchk.robot
index 9cf6581271..ee4b9c334f 100644
--- a/tests/perf/10ge2p1x520-ethip6-ip6base-copwhtlistbase-ndrchk.robot
+++ b/tests/perf/10ge2p1x520-ethip6-ip6base-copwhtlistbase-ndrchk.robot
@@ -46,6 +46,10 @@
 | ... | interfaces.
 | ... | *[Ref] Applicable standard specifications:* RFC2544.
 
+*** Variables ***
+# Traffic profile:
+| ${traffic_profile} | trex-sl-3n-ethip6-ip6src253
+
 *** Test Cases ***
 | tc01-78B-1t1c-ethip6-ip6base-copwhtlistbase-ndrchk
 | | [Documentation]
@@ -68,7 +72,7 @@
 | | And COP interface enable or disable | ${dut1} | ${dut1_if1} | enable
 | | And COP interface enable or disable | ${dut2} | ${dut2_if2} | enable
 | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv6
+| | ... | ${framesize} | ${traffic_profile}
 
 | tc02-1518B-1t1c-ethip6-ip6base-copwhtlistbase-ndrchk
 | | [Documentation]
@@ -91,7 +95,7 @@
 | | And COP interface enable or disable | ${dut1} | ${dut1_if1} | enable
 | | And COP interface enable or disable | ${dut2} | ${dut2_if2} | enable
 | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv6
+| | ... | ${framesize} | ${traffic_profile}
 
 | tc03-9000B-1t1c-ethip6-ip6base-copwhtlistbase-ndrchk
 | | [Documentation]
@@ -113,7 +117,7 @@
 | | And COP interface enable or disable | ${dut1} | ${dut1_if1} | enable
 | | And COP interface enable or disable | ${dut2} | ${dut2_if2} | enable
 | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv6
+| | ... | ${framesize} | ${traffic_profile}
 
 | tc04-78B-2t2c-ethip6-ip6base-copwhtlistbase-ndrchk
 | | [Documentation]
@@ -136,7 +140,7 @@
 | | And COP interface enable or disable | ${dut1} | ${dut1_if1} | enable
 | | And COP interface enable or disable | ${dut2} | ${dut2_if2} | enable
 | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv6
+| | ... | ${framesize} | ${traffic_profile}
 
 | tc05-1518B-2t2c-ethip6-ip6base-copwhtlistbase-ndrchk
 | | [Documentation]
@@ -159,7 +163,7 @@
 | | And COP interface enable or disable | ${dut1} | ${dut1_if1} | enable
 | | And COP interface enable or disable | ${dut2} | ${dut2_if2} | enable
 | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv6
+| | ... | ${framesize} | ${traffic_profile}
 
 | tc06-9000B-2t2c-ethip6-ip6base-copwhtlistbase-ndrchk
 | | [Documentation]
@@ -181,7 +185,7 @@
 | | And COP interface enable or disable | ${dut1} | ${dut1_if1} | enable
 | | And COP interface enable or disable | ${dut2} | ${dut2_if2} | enable
 | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv6
+| | ... | ${framesize} | ${traffic_profile}
 
 | tc07-78B-4t4c-ethip6-ip6base-copwhtlistbase-ndrchk
 | | [Documentation]
@@ -204,7 +208,7 @@
 | | And COP interface enable or disable | ${dut1} | ${dut1_if1} | enable
 | | And COP interface enable or disable | ${dut2} | ${dut2_if2} | enable
 | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv6
+| | ... | ${framesize} | ${traffic_profile}
 
 | tc08-1518B-4t4c-ethip6-ip6base-copwhtlistbase-ndrchk
 | | [Documentation]
@@ -227,7 +231,7 @@
 | | And COP interface enable or disable | ${dut1} | ${dut1_if1} | enable
 | | And COP interface enable or disable | ${dut2} | ${dut2_if2} | enable
 | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv6
+| | ... | ${framesize} | ${traffic_profile}
 
 | tc09-9000B-4t4c-ethip6-ip6base-copwhtlistbase-ndrchk
 | | [Documentation]
@@ -249,4 +253,4 @@
 | | And COP interface enable or disable | ${dut1} | ${dut1_if1} | enable
 | | And COP interface enable or disable | ${dut2} | ${dut2_if2} | enable
 | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv6
+| | ... | ${framesize} | ${traffic_profile}
diff --git a/tests/perf/10ge2p1x520-ethip6-ip6base-copwhtlistbase-ndrpdrdisc.robot b/tests/perf/10ge2p1x520-ethip6-ip6base-copwhtlistbase-ndrpdrdisc.robot
index bb3569f96f..8d353fd207 100644
--- a/tests/perf/10ge2p1x520-ethip6-ip6base-copwhtlistbase-ndrpdrdisc.robot
+++ b/tests/perf/10ge2p1x520-ethip6-ip6base-copwhtlistbase-ndrpdrdisc.robot
@@ -24,7 +24,7 @@
 | ...
 | Test Setup | Performance test setup
 | Test Teardown | Performance test teardown | ${min_rate}pps | ${framesize}
-| ... | 3-node-IPv6
+| ... | ${traffic_profile}
 | ...
 | Documentation | *RFC2544: Pkt throughput IPv6 whitelist test cases*
 | ...
@@ -52,6 +52,8 @@
 *** Variables ***
 # X520-DA2 bandwidth limit
 | ${s_limit} | ${10000000000}
+# Traffic profile:
+| ${traffic_profile} | trex-sl-3n-ethip6-ip6src253
 
 *** Test Cases ***
 | tc01-78B-1t1c-ethip6-ip6base-copwhtlistbase-ndrdisc
@@ -68,20 +70,19 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | When  IPv6 forwarding initialized in a 3-node circular topology
-| | And   Add fib table | ${dut1} | 2001:1:: | 64 | 1 | local
-| | And   Add fib table | ${dut2} | 2001:2:: | 64 | 1 | local
-| | And   COP Add whitelist Entry | ${dut1} | ${dut1_if1} | ip6 | 1
-| | And   COP Add whitelist Entry | ${dut2} | ${dut2_if2} | ip6 | 1
-| | And   COP interface enable or disable | ${dut1} | ${dut1_if1} | enable
-| | And   COP interface enable or disable | ${dut2} | ${dut2_if2} | enable
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | When IPv6 forwarding initialized in a 3-node circular topology
+| | And Add fib table | ${dut1} | 2001:1:: | 64 | 1 | local
+| | And Add fib table | ${dut2} | 2001:2:: | 64 | 1 | local
+| | And COP Add whitelist Entry | ${dut1} | ${dut1_if1} | ip6 | 1
+| | And COP Add whitelist Entry | ${dut2} | ${dut2_if2} | ip6 | 1
+| | And COP interface enable or disable | ${dut1} | ${dut1_if1} | enable
+| | And COP interface enable or disable | ${dut2} | ${dut2_if2} | enable
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-IPv6
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc02-78B-1t1c-ethip6-ip6base-copwhtlistbase-pdrdisc
 | | [Documentation]
@@ -97,22 +98,20 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | When  IPv6 forwarding initialized in a 3-node circular topology
-| | And   Add fib table | ${dut1} | 2001:1:: | 64 | 1 | local
-| | And   Add fib table | ${dut2} | 2001:2:: | 64 | 1 | local
-| | And   COP Add whitelist Entry | ${dut1} | ${dut1_if1} | ip6 | 1
-| | And   COP Add whitelist Entry | ${dut2} | ${dut2_if2} | ip6 | 1
-| | And   COP interface enable or disable | ${dut1} | ${dut1_if1} | enable
-| | And   COP interface enable or disable | ${dut2} | ${dut2_if2} | enable
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | When IPv6 forwarding initialized in a 3-node circular topology
+| | And Add fib table | ${dut1} | 2001:1:: | 64 | 1 | local
+| | And Add fib table | ${dut2} | 2001:2:: | 64 | 1 | local
+| | And COP Add whitelist Entry | ${dut1} | ${dut1_if1} | ip6 | 1
+| | And COP Add whitelist Entry | ${dut2} | ${dut2_if2} | ip6 | 1
+| | And COP interface enable or disable | ${dut1} | ${dut1_if1} | enable
+| | And COP interface enable or disable | ${dut2} | ${dut2_if2} | enable
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-IPv6
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
-| | ...                                       | ${perf_pdr_loss_acceptance}
-| | ...                                       | ${perf_pdr_loss_acceptance_type}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
+| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
 
 | tc03-1518B-1t1c-ethip6-ip6base-copwhtlistbase-ndrdisc
 | | [Documentation]
@@ -128,20 +127,19 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | When  IPv6 forwarding initialized in a 3-node circular topology
-| | And   Add fib table | ${dut1} | 2001:1:: | 64 | 1 | local
-| | And   Add fib table | ${dut2} | 2001:2:: | 64 | 1 | local
-| | And   COP Add whitelist Entry | ${dut1} | ${dut1_if1} | ip6 | 1
-| | And   COP Add whitelist Entry | ${dut2} | ${dut2_if2} | ip6 | 1
-| | And   COP interface enable or disable | ${dut1} | ${dut1_if1} | enable
-| | And   COP interface enable or disable | ${dut2} | ${dut2_if2} | enable
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | When IPv6 forwarding initialized in a 3-node circular topology
+| | And Add fib table | ${dut1} | 2001:1:: | 64 | 1 | local
+| | And Add fib table | ${dut2} | 2001:2:: | 64 | 1 | local
+| | And COP Add whitelist Entry | ${dut1} | ${dut1_if1} | ip6 | 1
+| | And COP Add whitelist Entry | ${dut2} | ${dut2_if2} | ip6 | 1
+| | And COP interface enable or disable | ${dut1} | ${dut1_if1} | enable
+| | And COP interface enable or disable | ${dut2} | ${dut2_if2} | enable
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-IPv6
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc04-1518B-1t1c-ethip6-ip6base-copwhtlistbase-pdrdisc
 | | [Documentation]
@@ -157,22 +155,20 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | When  IPv6 forwarding initialized in a 3-node circular topology
-| | And   Add fib table | ${dut1} | 2001:1:: | 64 | 1 | local
-| | And   Add fib table | ${dut2} | 2001:2:: | 64 | 1 | local
-| | And   COP Add whitelist Entry | ${dut1} | ${dut1_if1} | ip6 | 1
-| | And   COP Add whitelist Entry | ${dut2} | ${dut2_if2} | ip6 | 1
-| | And   COP interface enable or disable | ${dut1} | ${dut1_if1} | enable
-| | And   COP interface enable or disable | ${dut2} | ${dut2_if2} | enable
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | When IPv6 forwarding initialized in a 3-node circular topology
+| | And Add fib table | ${dut1} | 2001:1:: | 64 | 1 | local
+| | And Add fib table | ${dut2} | 2001:2:: | 64 | 1 | local
+| | And COP Add whitelist Entry | ${dut1} | ${dut1_if1} | ip6 | 1
+| | And COP Add whitelist Entry | ${dut2} | ${dut2_if2} | ip6 | 1
+| | And COP interface enable or disable | ${dut1} | ${dut1_if1} | enable
+| | And COP interface enable or disable | ${dut2} | ${dut2_if2} | enable
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-IPv6
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
-| | ...                                       | ${perf_pdr_loss_acceptance}
-| | ...                                       | ${perf_pdr_loss_acceptance_type}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
+| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
 
 | tc05-9000B-1t1c-ethip6-ip6base-copwhtlistbase-ndrdisc
 | | [Documentation]
@@ -188,19 +184,18 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Apply startup configuration on all VPP DUTs
-| | When  IPv6 forwarding initialized in a 3-node circular topology
-| | And   Add fib table | ${dut1} | 2001:1:: | 64 | 1 | local
-| | And   Add fib table | ${dut2} | 2001:2:: | 64 | 1 | local
-| | And   COP Add whitelist Entry | ${dut1} | ${dut1_if1} | ip6 | 1
-| | And   COP Add whitelist Entry | ${dut2} | ${dut2_if2} | ip6 | 1
-| | And   COP interface enable or disable | ${dut1} | ${dut1_if1} | enable
-| | And   COP interface enable or disable | ${dut2} | ${dut2_if2} | enable
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Apply startup configuration on all VPP DUTs
+| | When IPv6 forwarding initialized in a 3-node circular topology
+| | And Add fib table | ${dut1} | 2001:1:: | 64 | 1 | local
+| | And Add fib table | ${dut2} | 2001:2:: | 64 | 1 | local
+| | And COP Add whitelist Entry | ${dut1} | ${dut1_if1} | ip6 | 1
+| | And COP Add whitelist Entry | ${dut2} | ${dut2_if2} | ip6 | 1
+| | And COP interface enable or disable | ${dut1} | ${dut1_if1} | enable
+| | And COP interface enable or disable | ${dut2} | ${dut2_if2} | enable
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-IPv6
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc06-9000B-1t1c-ethip6-ip6base-copwhtlistbase-pdrdisc
 | | [Documentation]
@@ -216,21 +211,19 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Apply startup configuration on all VPP DUTs
-| | When  IPv6 forwarding initialized in a 3-node circular topology
-| | And   Add fib table | ${dut1} | 2001:1:: | 64 | 1 | local
-| | And   Add fib table | ${dut2} | 2001:2:: | 64 | 1 | local
-| | And   COP Add whitelist Entry | ${dut1} | ${dut1_if1} | ip6 | 1
-| | And   COP Add whitelist Entry | ${dut2} | ${dut2_if2} | ip6 | 1
-| | And   COP interface enable or disable | ${dut1} | ${dut1_if1} | enable
-| | And   COP interface enable or disable | ${dut2} | ${dut2_if2} | enable
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Apply startup configuration on all VPP DUTs
+| | When IPv6 forwarding initialized in a 3-node circular topology
+| | And Add fib table | ${dut1} | 2001:1:: | 64 | 1 | local
+| | And Add fib table | ${dut2} | 2001:2:: | 64 | 1 | local
+| | And COP Add whitelist Entry | ${dut1} | ${dut1_if1} | ip6 | 1
+| | And COP Add whitelist Entry | ${dut2} | ${dut2_if2} | ip6 | 1
+| | And COP interface enable or disable | ${dut1} | ${dut1_if1} | enable
+| | And COP interface enable or disable | ${dut2} | ${dut2_if2} | enable
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-IPv6
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
-| | ...                                       | ${perf_pdr_loss_acceptance}
-| | ...                                       | ${perf_pdr_loss_acceptance_type}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
+| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
 
 | tc07-78B-2t2c-ethip6-ip6base-copwhtlistbase-ndrdisc
 | | [Documentation]
@@ -246,20 +239,19 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | When  IPv6 forwarding initialized in a 3-node circular topology
-| | And   Add fib table | ${dut1} | 2001:1:: | 64 | 1 | local
-| | And   Add fib table | ${dut2} | 2001:2:: | 64 | 1 | local
-| | And   COP Add whitelist Entry | ${dut1} | ${dut1_if1} | ip6 | 1
-| | And   COP Add whitelist Entry | ${dut2} | ${dut2_if2} | ip6 | 1
-| | And   COP interface enable or disable | ${dut1} | ${dut1_if1} | enable
-| | And   COP interface enable or disable | ${dut2} | ${dut2_if2} | enable
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | When IPv6 forwarding initialized in a 3-node circular topology
+| | And Add fib table | ${dut1} | 2001:1:: | 64 | 1 | local
+| | And Add fib table | ${dut2} | 2001:2:: | 64 | 1 | local
+| | And COP Add whitelist Entry | ${dut1} | ${dut1_if1} | ip6 | 1
+| | And COP Add whitelist Entry | ${dut2} | ${dut2_if2} | ip6 | 1
+| | And COP interface enable or disable | ${dut1} | ${dut1_if1} | enable
+| | And COP interface enable or disable | ${dut2} | ${dut2_if2} | enable
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-IPv6
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc08-78B-2t2c-ethip6-ip6base-copwhtlistbase-pdrdisc
 | | [Documentation]
@@ -275,22 +267,20 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | When  IPv6 forwarding initialized in a 3-node circular topology
-| | And   Add fib table | ${dut1} | 2001:1:: | 64 | 1 | local
-| | And   Add fib table | ${dut2} | 2001:2:: | 64 | 1 | local
-| | And   COP Add whitelist Entry | ${dut1} | ${dut1_if1} | ip6 | 1
-| | And   COP Add whitelist Entry | ${dut2} | ${dut2_if2} | ip6 | 1
-| | And   COP interface enable or disable | ${dut1} | ${dut1_if1} | enable
-| | And   COP interface enable or disable | ${dut2} | ${dut2_if2} | enable
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | When IPv6 forwarding initialized in a 3-node circular topology
+| | And Add fib table | ${dut1} | 2001:1:: | 64 | 1 | local
+| | And Add fib table | ${dut2} | 2001:2:: | 64 | 1 | local
+| | And COP Add whitelist Entry | ${dut1} | ${dut1_if1} | ip6 | 1
+| | And COP Add whitelist Entry | ${dut2} | ${dut2_if2} | ip6 | 1
+| | And COP interface enable or disable | ${dut1} | ${dut1_if1} | enable
+| | And COP interface enable or disable | ${dut2} | ${dut2_if2} | enable
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-IPv6
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
-| | ...                                       | ${perf_pdr_loss_acceptance}
-| | ...                                       | ${perf_pdr_loss_acceptance_type}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
+| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
 
 | tc09-1518B-2t2c-ethip6-ip6base-copwhtlistbase-ndrdisc
 | | [Documentation]
@@ -306,20 +296,19 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | When  IPv6 forwarding initialized in a 3-node circular topology
-| | And   Add fib table | ${dut1} | 2001:1:: | 64 | 1 | local
-| | And   Add fib table | ${dut2} | 2001:2:: | 64 | 1 | local
-| | And   COP Add whitelist Entry | ${dut1} | ${dut1_if1} | ip6 | 1
-| | And   COP Add whitelist Entry | ${dut2} | ${dut2_if2} | ip6 | 1
-| | And   COP interface enable or disable | ${dut1} | ${dut1_if1} | enable
-| | And   COP interface enable or disable | ${dut2} | ${dut2_if2} | enable
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | When IPv6 forwarding initialized in a 3-node circular topology
+| | And Add fib table | ${dut1} | 2001:1:: | 64 | 1 | local
+| | And Add fib table | ${dut2} | 2001:2:: | 64 | 1 | local
+| | And COP Add whitelist Entry | ${dut1} | ${dut1_if1} | ip6 | 1
+| | And COP Add whitelist Entry | ${dut2} | ${dut2_if2} | ip6 | 1
+| | And COP interface enable or disable | ${dut1} | ${dut1_if1} | enable
+| | And COP interface enable or disable | ${dut2} | ${dut2_if2} | enable
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-IPv6
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc10-1518B-2t2c-ethip6-ip6base-copwhtlistbase-pdrdisc
 | | [Documentation]
@@ -335,22 +324,20 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | When  IPv6 forwarding initialized in a 3-node circular topology
-| | And   Add fib table | ${dut1} | 2001:1:: | 64 | 1 | local
-| | And   Add fib table | ${dut2} | 2001:2:: | 64 | 1 | local
-| | And   COP Add whitelist Entry | ${dut1} | ${dut1_if1} | ip6 | 1
-| | And   COP Add whitelist Entry | ${dut2} | ${dut2_if2} | ip6 | 1
-| | And   COP interface enable or disable | ${dut1} | ${dut1_if1} | enable
-| | And   COP interface enable or disable | ${dut2} | ${dut2_if2} | enable
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | When IPv6 forwarding initialized in a 3-node circular topology
+| | And Add fib table | ${dut1} | 2001:1:: | 64 | 1 | local
+| | And Add fib table | ${dut2} | 2001:2:: | 64 | 1 | local
+| | And COP Add whitelist Entry | ${dut1} | ${dut1_if1} | ip6 | 1
+| | And COP Add whitelist Entry | ${dut2} | ${dut2_if2} | ip6 | 1
+| | And COP interface enable or disable | ${dut1} | ${dut1_if1} | enable
+| | And COP interface enable or disable | ${dut2} | ${dut2_if2} | enable
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-IPv6
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
-| | ...                                       | ${perf_pdr_loss_acceptance}
-| | ...                                       | ${perf_pdr_loss_acceptance_type}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
+| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
 
 | tc11-9000B-2t2c-ethip6-ip6base-copwhtlistbase-ndrdisc
 | | [Documentation]
@@ -366,19 +353,18 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Apply startup configuration on all VPP DUTs
-| | When  IPv6 forwarding initialized in a 3-node circular topology
-| | And   Add fib table | ${dut1} | 2001:1:: | 64 | 1 | local
-| | And   Add fib table | ${dut2} | 2001:2:: | 64 | 1 | local
-| | And   COP Add whitelist Entry | ${dut1} | ${dut1_if1} | ip6 | 1
-| | And   COP Add whitelist Entry | ${dut2} | ${dut2_if2} | ip6 | 1
-| | And   COP interface enable or disable | ${dut1} | ${dut1_if1} | enable
-| | And   COP interface enable or disable | ${dut2} | ${dut2_if2} | enable
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Apply startup configuration on all VPP DUTs
+| | When IPv6 forwarding initialized in a 3-node circular topology
+| | And Add fib table | ${dut1} | 2001:1:: | 64 | 1 | local
+| | And Add fib table | ${dut2} | 2001:2:: | 64 | 1 | local
+| | And COP Add whitelist Entry | ${dut1} | ${dut1_if1} | ip6 | 1
+| | And COP Add whitelist Entry | ${dut2} | ${dut2_if2} | ip6 | 1
+| | And COP interface enable or disable | ${dut1} | ${dut1_if1} | enable
+| | And COP interface enable or disable | ${dut2} | ${dut2_if2} | enable
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-IPv6
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc12-9000B-2t2c-ethip6-ip6base-copwhtlistbase-pdrdisc
 | | [Documentation]
@@ -394,21 +380,19 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Apply startup configuration on all VPP DUTs
-| | When  IPv6 forwarding initialized in a 3-node circular topology
-| | And   Add fib table | ${dut1} | 2001:1:: | 64 | 1 | local
-| | And   Add fib table | ${dut2} | 2001:2:: | 64 | 1 | local
-| | And   COP Add whitelist Entry | ${dut1} | ${dut1_if1} | ip6 | 1
-| | And   COP Add whitelist Entry | ${dut2} | ${dut2_if2} | ip6 | 1
-| | And   COP interface enable or disable | ${dut1} | ${dut1_if1} | enable
-| | And   COP interface enable or disable | ${dut2} | ${dut2_if2} | enable
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Apply startup configuration on all VPP DUTs
+| | When IPv6 forwarding initialized in a 3-node circular topology
+| | And Add fib table | ${dut1} | 2001:1:: | 64 | 1 | local
+| | And Add fib table | ${dut2} | 2001:2:: | 64 | 1 | local
+| | And COP Add whitelist Entry | ${dut1} | ${dut1_if1} | ip6 | 1
+| | And COP Add whitelist Entry | ${dut2} | ${dut2_if2} | ip6 | 1
+| | And COP interface enable or disable | ${dut1} | ${dut1_if1} | enable
+| | And COP interface enable or disable | ${dut2} | ${dut2_if2} | enable
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-IPv6
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
-| | ...                                       | ${perf_pdr_loss_acceptance}
-| | ...                                       | ${perf_pdr_loss_acceptance_type}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
+| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
 
 | tc13-78B-4t4c-ethip6-ip6base-copwhtlistbase-ndrdisc
 | | [Documentation]
@@ -424,20 +408,19 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | When  IPv6 forwarding initialized in a 3-node circular topology
-| | And   Add fib table | ${dut1} | 2001:1:: | 64 | 1 | local
-| | And   Add fib table | ${dut2} | 2001:2:: | 64 | 1 | local
-| | And   COP Add whitelist Entry | ${dut1} | ${dut1_if1} | ip6 | 1
-| | And   COP Add whitelist Entry | ${dut2} | ${dut2_if2} | ip6 | 1
-| | And   COP interface enable or disable | ${dut1} | ${dut1_if1} | enable
-| | And   COP interface enable or disable | ${dut2} | ${dut2_if2} | enable
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | When IPv6 forwarding initialized in a 3-node circular topology
+| | And Add fib table | ${dut1} | 2001:1:: | 64 | 1 | local
+| | And Add fib table | ${dut2} | 2001:2:: | 64 | 1 | local
+| | And COP Add whitelist Entry | ${dut1} | ${dut1_if1} | ip6 | 1
+| | And COP Add whitelist Entry | ${dut2} | ${dut2_if2} | ip6 | 1
+| | And COP interface enable or disable | ${dut1} | ${dut1_if1} | enable
+| | And COP interface enable or disable | ${dut2} | ${dut2_if2} | enable
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-IPv6
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc14-78B-4t4c-ethip6-ip6base-copwhtlistbase-pdrdisc
 | | [Documentation]
@@ -453,22 +436,20 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | When  IPv6 forwarding initialized in a 3-node circular topology
-| | And   Add fib table | ${dut1} | 2001:1:: | 64 | 1 | local
-| | And   Add fib table | ${dut2} | 2001:2:: | 64 | 1 | local
-| | And   COP Add whitelist Entry | ${dut1} | ${dut1_if1} | ip6 | 1
-| | And   COP Add whitelist Entry | ${dut2} | ${dut2_if2} | ip6 | 1
-| | And   COP interface enable or disable | ${dut1} | ${dut1_if1} | enable
-| | And   COP interface enable or disable | ${dut2} | ${dut2_if2} | enable
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | When IPv6 forwarding initialized in a 3-node circular topology
+| | And Add fib table | ${dut1} | 2001:1:: | 64 | 1 | local
+| | And Add fib table | ${dut2} | 2001:2:: | 64 | 1 | local
+| | And COP Add whitelist Entry | ${dut1} | ${dut1_if1} | ip6 | 1
+| | And COP Add whitelist Entry | ${dut2} | ${dut2_if2} | ip6 | 1
+| | And COP interface enable or disable | ${dut1} | ${dut1_if1} | enable
+| | And COP interface enable or disable | ${dut2} | ${dut2_if2} | enable
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-IPv6
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
-| | ...                                       | ${perf_pdr_loss_acceptance}
-| | ...                                       | ${perf_pdr_loss_acceptance_type}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
+| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
 
 | tc15-1518B-4t4c-ethip6-ip6base-copwhtlistbase-ndrdisc
 | | [Documentation]
@@ -484,20 +465,19 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | When  IPv6 forwarding initialized in a 3-node circular topology
-| | And   Add fib table | ${dut1} | 2001:1:: | 64 | 1 | local
-| | And   Add fib table | ${dut2} | 2001:2:: | 64 | 1 | local
-| | And   COP Add whitelist Entry | ${dut1} | ${dut1_if1} | ip6 | 1
-| | And   COP Add whitelist Entry | ${dut2} | ${dut2_if2} | ip6 | 1
-| | And   COP interface enable or disable | ${dut1} | ${dut1_if1} | enable
-| | And   COP interface enable or disable | ${dut2} | ${dut2_if2} | enable
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | When IPv6 forwarding initialized in a 3-node circular topology
+| | And Add fib table | ${dut1} | 2001:1:: | 64 | 1 | local
+| | And Add fib table | ${dut2} | 2001:2:: | 64 | 1 | local
+| | And COP Add whitelist Entry | ${dut1} | ${dut1_if1} | ip6 | 1
+| | And COP Add whitelist Entry | ${dut2} | ${dut2_if2} | ip6 | 1
+| | And COP interface enable or disable | ${dut1} | ${dut1_if1} | enable
+| | And COP interface enable or disable | ${dut2} | ${dut2_if2} | enable
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-IPv6
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc16-1518B-4t4c-ethip6-ip6base-copwhtlistbase-pdrdisc
 | | [Documentation]
@@ -513,22 +493,20 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | When  IPv6 forwarding initialized in a 3-node circular topology
-| | And   Add fib table | ${dut1} | 2001:1:: | 64 | 1 | local
-| | And   Add fib table | ${dut2} | 2001:2:: | 64 | 1 | local
-| | And   COP Add whitelist Entry | ${dut1} | ${dut1_if1} | ip6 | 1
-| | And   COP Add whitelist Entry | ${dut2} | ${dut2_if2} | ip6 | 1
-| | And   COP interface enable or disable | ${dut1} | ${dut1_if1} | enable
-| | And   COP interface enable or disable | ${dut2} | ${dut2_if2} | enable
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | When IPv6 forwarding initialized in a 3-node circular topology
+| | And Add fib table | ${dut1} | 2001:1:: | 64 | 1 | local
+| | And Add fib table | ${dut2} | 2001:2:: | 64 | 1 | local
+| | And COP Add whitelist Entry | ${dut1} | ${dut1_if1} | ip6 | 1
+| | And COP Add whitelist Entry | ${dut2} | ${dut2_if2} | ip6 | 1
+| | And COP interface enable or disable | ${dut1} | ${dut1_if1} | enable
+| | And COP interface enable or disable | ${dut2} | ${dut2_if2} | enable
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-IPv6
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
-| | ...                                       | ${perf_pdr_loss_acceptance}
-| | ...                                       | ${perf_pdr_loss_acceptance_type}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
+| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
 
 | tc17-9000B-4t4c-ethip6-ip6base-copwhtlistbase-ndrdisc
 | | [Documentation]
@@ -544,19 +522,18 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Apply startup configuration on all VPP DUTs
-| | When  IPv6 forwarding initialized in a 3-node circular topology
-| | And   Add fib table | ${dut1} | 2001:1:: | 64 | 1 | local
-| | And   Add fib table | ${dut2} | 2001:2:: | 64 | 1 | local
-| | And   COP Add whitelist Entry | ${dut1} | ${dut1_if1} | ip6 | 1
-| | And   COP Add whitelist Entry | ${dut2} | ${dut2_if2} | ip6 | 1
-| | And   COP interface enable or disable | ${dut1} | ${dut1_if1} | enable
-| | And   COP interface enable or disable | ${dut2} | ${dut2_if2} | enable
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Apply startup configuration on all VPP DUTs
+| | When IPv6 forwarding initialized in a 3-node circular topology
+| | And Add fib table | ${dut1} | 2001:1:: | 64 | 1 | local
+| | And Add fib table | ${dut2} | 2001:2:: | 64 | 1 | local
+| | And COP Add whitelist Entry | ${dut1} | ${dut1_if1} | ip6 | 1
+| | And COP Add whitelist Entry | ${dut2} | ${dut2_if2} | ip6 | 1
+| | And COP interface enable or disable | ${dut1} | ${dut1_if1} | enable
+| | And COP interface enable or disable | ${dut2} | ${dut2_if2} | enable
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-IPv6
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc18-9000B-4t4c-ethip6-ip6base-copwhtlistbase-pdrdisc
 | | [Documentation]
@@ -572,18 +549,16 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Apply startup configuration on all VPP DUTs
-| | When  IPv6 forwarding initialized in a 3-node circular topology
-| | And   Add fib table | ${dut1} | 2001:1:: | 64 | 1 | local
-| | And   Add fib table | ${dut2} | 2001:2:: | 64 | 1 | local
-| | And   COP Add whitelist Entry | ${dut1} | ${dut1_if1} | ip6 | 1
-| | And   COP Add whitelist Entry | ${dut2} | ${dut2_if2} | ip6 | 1
-| | And   COP interface enable or disable | ${dut1} | ${dut1_if1} | enable
-| | And   COP interface enable or disable | ${dut2} | ${dut2_if2} | enable
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Apply startup configuration on all VPP DUTs
+| | When IPv6 forwarding initialized in a 3-node circular topology
+| | And Add fib table | ${dut1} | 2001:1:: | 64 | 1 | local
+| | And Add fib table | ${dut2} | 2001:2:: | 64 | 1 | local
+| | And COP Add whitelist Entry | ${dut1} | ${dut1_if1} | ip6 | 1
+| | And COP Add whitelist Entry | ${dut2} | ${dut2_if2} | ip6 | 1
+| | And COP interface enable or disable | ${dut1} | ${dut1_if1} | enable
+| | And COP interface enable or disable | ${dut2} | ${dut2_if2} | enable
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-IPv6
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
-| | ...                                       | ${perf_pdr_loss_acceptance}
-| | ...                                       | ${perf_pdr_loss_acceptance_type}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
+| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
diff --git a/tests/perf/10ge2p1x520-ethip6-ip6base-iacldstbase-ndrchk.robot b/tests/perf/10ge2p1x520-ethip6-ip6base-iacldstbase-ndrchk.robot
index e3b596afb8..75a10f6154 100644
--- a/tests/perf/10ge2p1x520-ethip6-ip6base-iacldstbase-ndrchk.robot
+++ b/tests/perf/10ge2p1x520-ethip6-ip6base-iacldstbase-ndrchk.robot
@@ -45,6 +45,10 @@
 | ... | payload.
 | ... | *[Ref] Applicable standard specifications:* RFC2544.
 
+*** Variables ***
+# Traffic profile:
+| ${traffic_profile} | trex-sl-3n-ethip6-ip6src253
+
 *** Test Cases ***
 | tc01-78B-1t1c-ethip6-ip6base-iacldstbase-ndrchk
 | | [Documentation]
@@ -62,7 +66,7 @@
 | | And IPv6 forwarding initialized in a 3-node circular topology
 | | And IPv6 iAcl whitelist initialized in a 3-node circular topology
 | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv6
+| | ... | ${framesize} | ${traffic_profile}
 
 | tc02-1518B-1t1c-ethip6-ip6base-iacldstbase-ndrchk
 | | [Documentation]
@@ -80,7 +84,7 @@
 | | And IPv6 forwarding initialized in a 3-node circular topology
 | | And IPv6 iAcl whitelist initialized in a 3-node circular topology
 | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv6
+| | ... | ${framesize} | ${traffic_profile}
 
 | tc03-9000B-1t1c-ethip6-ip6base-iacldstbase-ndrchk
 | | [Documentation]
@@ -97,7 +101,7 @@
 | | And IPv6 forwarding initialized in a 3-node circular topology
 | | And IPv6 iAcl whitelist initialized in a 3-node circular topology
 | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv6
+| | ... | ${framesize} | ${traffic_profile}
 
 | tc04-78B-2t2c-ethip6-ip6base-iacldstbase-ndrchk
 | | [Documentation]
@@ -115,7 +119,7 @@
 | | And IPv6 forwarding initialized in a 3-node circular topology
 | | And IPv6 iAcl whitelist initialized in a 3-node circular topology
 | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv6
+| | ... | ${framesize} | ${traffic_profile}
 
 | tc05-1518B-2t2c-ethip6-ip6base-iacldstbase-ndrchk
 | | [Documentation]
@@ -133,7 +137,7 @@
 | | And IPv6 forwarding initialized in a 3-node circular topology
 | | And IPv6 iAcl whitelist initialized in a 3-node circular topology
 | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv6
+| | ... | ${framesize} | ${traffic_profile}
 
 | tc06-9000B-2t2c-ethip6-ip6base-iacldstbase-ndrchk
 | | [Documentation]
@@ -150,7 +154,7 @@
 | | And IPv6 forwarding initialized in a 3-node circular topology
 | | And IPv6 iAcl whitelist initialized in a 3-node circular topology
 | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv6
+| | ... | ${framesize} | ${traffic_profile}
 
 | tc07-78B-4t4c-ethip6-ip6base-iacldstbase-ndrchk
 | | [Documentation]
@@ -168,7 +172,7 @@
 | | And IPv6 forwarding initialized in a 3-node circular topology
 | | And IPv6 iAcl whitelist initialized in a 3-node circular topology
 | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv6
+| | ... | ${framesize} | ${traffic_profile}
 
 | tc08-1518B-4t4c-ethip6-ip6base-iacldstbase-ndrchk
 | | [Documentation]
@@ -186,7 +190,7 @@
 | | And IPv6 forwarding initialized in a 3-node circular topology
 | | And IPv6 iAcl whitelist initialized in a 3-node circular topology
 | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv6
+| | ... | ${framesize} | ${traffic_profile}
 
 | tc09-9000B-4t4c-ethip6-ip6base-iacldstbase-ndrchk
 | | [Documentation]
@@ -203,4 +207,4 @@
 | | And IPv6 forwarding initialized in a 3-node circular topology
 | | And IPv6 iAcl whitelist initialized in a 3-node circular topology
 | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv6
+| | ... | ${framesize} | ${traffic_profile}
diff --git a/tests/perf/10ge2p1x520-ethip6-ip6base-iacldstbase-ndrpdrdisc.robot b/tests/perf/10ge2p1x520-ethip6-ip6base-iacldstbase-ndrpdrdisc.robot
index fc838ae61b..7984867f8f 100644
--- a/tests/perf/10ge2p1x520-ethip6-ip6base-iacldstbase-ndrpdrdisc.robot
+++ b/tests/perf/10ge2p1x520-ethip6-ip6base-iacldstbase-ndrpdrdisc.robot
@@ -24,7 +24,7 @@
 | ...
 | Test Setup | Performance test setup
 | Test Teardown | Performance test teardown | ${min_rate}pps | ${framesize}
-| ... | 3-node-IPv6
+| ... | ${traffic_profile}
 | ...
 | Documentation | *RFC2544: Pkt throughput IPv6 iAcl whitelist test cases*
 | ...
@@ -51,6 +51,8 @@
 *** Variables ***
 # X520-DA2 bandwidth limit
 | ${s_limit} | ${10000000000}
+# Traffic profile:
+| ${traffic_profile} | trex-sl-3n-ethip6-ip6src253
 
 *** Test Cases ***
 | tc01-78B-1t1c-ethip6-ip6base-iacldstbase-ndrdisc
@@ -67,15 +69,14 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | 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
-| | And   IPv6 iAcl whitelist initialized in a 3-node circular topology
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | 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
+| | And IPv6 iAcl whitelist 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}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc02-78B-1t1c-ethip6-ip6base-iacldstbase-pdrdisc
 | | [Documentation]
@@ -91,17 +92,15 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | 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
-| | And   IPv6 iAcl whitelist initialized in a 3-node circular topology
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | 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
+| | And IPv6 iAcl whitelist initialized in a 3-node circular topology
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-IPv6
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
-| | ...                                       | ${perf_pdr_loss_acceptance}
-| | ...                                       | ${perf_pdr_loss_acceptance_type}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
+| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
 
 | tc03-1518B-1t1c-ethip6-ip6base-iacldstbase-ndrdisc
 | | [Documentation]
@@ -117,15 +116,14 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | 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
-| | And   IPv6 iAcl whitelist initialized in a 3-node circular topology
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | 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
+| | And IPv6 iAcl whitelist 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}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc04-1518B-1t1c-ethip6-ip6base-iacldstbase-pdrdisc
 | | [Documentation]
@@ -141,17 +139,15 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | 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
-| | And   IPv6 iAcl whitelist initialized in a 3-node circular topology
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | 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
+| | And IPv6 iAcl whitelist initialized in a 3-node circular topology
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-IPv6
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
-| | ...                                       | ${perf_pdr_loss_acceptance}
-| | ...                                       | ${perf_pdr_loss_acceptance_type}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
+| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
 
 | tc05-9000B-1t1c-ethip6-ip6base-iacldstbase-ndrdisc
 | | [Documentation]
@@ -167,14 +163,13 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Apply startup configuration on all VPP DUTs
-| | And   IPv6 forwarding initialized in a 3-node circular topology
-| | And   IPv6 iAcl whitelist initialized in a 3-node circular topology
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Apply startup configuration on all VPP DUTs
+| | And IPv6 forwarding initialized in a 3-node circular topology
+| | And IPv6 iAcl whitelist 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}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc06-9000B-1t1c-ethip6-ip6base-iacldstbase-pdrdisc
 | | [Documentation]
@@ -190,16 +185,14 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Apply startup configuration on all VPP DUTs
-| | And   IPv6 forwarding initialized in a 3-node circular topology
-| | And   IPv6 iAcl whitelist initialized in a 3-node circular topology
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Apply startup configuration on all VPP DUTs
+| | And IPv6 forwarding initialized in a 3-node circular topology
+| | And IPv6 iAcl whitelist initialized in a 3-node circular topology
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-IPv6
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
-| | ...                                       | ${perf_pdr_loss_acceptance}
-| | ...                                       | ${perf_pdr_loss_acceptance_type}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
+| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
 
 | tc07-78B-2t2c-ethip6-ip6base-iacldstbase-ndrdisc
 | | [Documentation]
@@ -215,15 +208,14 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | 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
-| | And   IPv6 iAcl whitelist initialized in a 3-node circular topology
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | 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
+| | And IPv6 iAcl whitelist 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}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc08-78B-2t2c-ethip6-ip6base-iacldstbase-pdrdisc
 | | [Documentation]
@@ -239,17 +231,15 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | 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
-| | And   IPv6 iAcl whitelist initialized in a 3-node circular topology
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | 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
+| | And IPv6 iAcl whitelist initialized in a 3-node circular topology
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-IPv6
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
-| | ...                                       | ${perf_pdr_loss_acceptance}
-| | ...                                       | ${perf_pdr_loss_acceptance_type}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
+| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
 
 | tc09-1518B-2t2c-ethip6-ip6base-iacldstbase-ndrdisc
 | | [Documentation]
@@ -265,15 +255,14 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | 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
-| | And   IPv6 iAcl whitelist initialized in a 3-node circular topology
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | 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
+| | And IPv6 iAcl whitelist 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}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc10-1518B-2t2c-ethip6-ip6base-iacldstbase-pdrdisc
 | | [Documentation]
@@ -289,17 +278,15 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | 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
-| | And   IPv6 iAcl whitelist initialized in a 3-node circular topology
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | 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
+| | And IPv6 iAcl whitelist initialized in a 3-node circular topology
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-IPv6
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
-| | ...                                       | ${perf_pdr_loss_acceptance}
-| | ...                                       | ${perf_pdr_loss_acceptance_type}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
+| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
 
 | tc11-9000B-2t2c-ethip6-ip6base-iacldstbase-ndrdisc
 | | [Documentation]
@@ -315,14 +302,13 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Apply startup configuration on all VPP DUTs
-| | And   IPv6 forwarding initialized in a 3-node circular topology
-| | And   IPv6 iAcl whitelist initialized in a 3-node circular topology
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Apply startup configuration on all VPP DUTs
+| | And IPv6 forwarding initialized in a 3-node circular topology
+| | And IPv6 iAcl whitelist 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}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc12-9000B-2t2c-ethip6-ip6base-iacldstbase-pdrdisc
 | | [Documentation]
@@ -338,16 +324,14 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Apply startup configuration on all VPP DUTs
-| | And   IPv6 forwarding initialized in a 3-node circular topology
-| | And   IPv6 iAcl whitelist initialized in a 3-node circular topology
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Apply startup configuration on all VPP DUTs
+| | And IPv6 forwarding initialized in a 3-node circular topology
+| | And IPv6 iAcl whitelist initialized in a 3-node circular topology
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-IPv6
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
-| | ...                                       | ${perf_pdr_loss_acceptance}
-| | ...                                       | ${perf_pdr_loss_acceptance_type}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
+| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
 
 | tc13-78B-4t4c-ethip6-ip6base-iacldstbase-ndrdisc
 | | [Documentation]
@@ -363,15 +347,14 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | 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
-| | And   IPv6 iAcl whitelist initialized in a 3-node circular topology
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | 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
+| | And IPv6 iAcl whitelist 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}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc14-78B-4t4c-ethip6-ip6base-iacldstbase-pdrdisc
 | | [Documentation]
@@ -387,17 +370,15 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | 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
-| | And   IPv6 iAcl whitelist initialized in a 3-node circular topology
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | 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
+| | And IPv6 iAcl whitelist initialized in a 3-node circular topology
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-IPv6
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
-| | ...                                       | ${perf_pdr_loss_acceptance}
-| | ...                                       | ${perf_pdr_loss_acceptance_type}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
+| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
 
 | tc15-1518B-4t4c-ethip6-ip6base-iacldstbase-ndrdisc
 | | [Documentation]
@@ -413,15 +394,14 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | 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
-| | And   IPv6 iAcl whitelist initialized in a 3-node circular topology
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | 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
+| | And IPv6 iAcl whitelist 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}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc16-1518B-4t4c-ethip6-ip6base-iacldstbase-pdrdisc
 | | [Documentation]
@@ -437,17 +417,15 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | 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
-| | And   IPv6 iAcl whitelist initialized in a 3-node circular topology
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | 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
+| | And IPv6 iAcl whitelist initialized in a 3-node circular topology
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-IPv6
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
-| | ...                                       | ${perf_pdr_loss_acceptance}
-| | ...                                       | ${perf_pdr_loss_acceptance_type}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
+| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
 
 | tc17-9000B-4t4c-ethip6-ip6base-iacldstbase-ndrdisc
 | | [Documentation]
@@ -463,14 +441,13 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Apply startup configuration on all VPP DUTs
-| | And   IPv6 forwarding initialized in a 3-node circular topology
-| | And   IPv6 iAcl whitelist initialized in a 3-node circular topology
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Apply startup configuration on all VPP DUTs
+| | And IPv6 forwarding initialized in a 3-node circular topology
+| | And IPv6 iAcl whitelist 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}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc18-9000B-4t4c-ethip6-ip6base-iacldstbase-pdrdisc
 | | [Documentation]
@@ -486,13 +463,11 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Apply startup configuration on all VPP DUTs
-| | And   IPv6 forwarding initialized in a 3-node circular topology
-| | And   IPv6 iAcl whitelist initialized in a 3-node circular topology
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Apply startup configuration on all VPP DUTs
+| | And IPv6 forwarding initialized in a 3-node circular topology
+| | And IPv6 iAcl whitelist initialized in a 3-node circular topology
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-IPv6
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
-| | ...                                       | ${perf_pdr_loss_acceptance}
-| | ...                                       | ${perf_pdr_loss_acceptance_type}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
+| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
diff --git a/tests/perf/10ge2p1x520-ethip6-ip6base-ndrchk.robot b/tests/perf/10ge2p1x520-ethip6-ip6base-ndrchk.robot
index 33268f78f7..8cb125f8f5 100644
--- a/tests/perf/10ge2p1x520-ethip6-ip6base-ndrchk.robot
+++ b/tests/perf/10ge2p1x520-ethip6-ip6base-ndrchk.robot
@@ -44,6 +44,10 @@
 | ... | interfaces.
 | ... | *[Ref] Applicable standard specifications:* RFC2544.
 
+*** Variables ***
+# Traffic profile:
+| ${traffic_profile} | trex-sl-3n-ethip6-ip6src253
+
 *** Test Cases ***
 | tc01-78B-1t1c-ethip6-ip6base-ndrchk
 | | [Documentation]
@@ -59,7 +63,7 @@
 | | 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 | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv6
+| | ... | ${framesize} | ${traffic_profile}
 
 | tc02-1518B-1t1c-ethip6-ip6base-ndrchk
 | | [Documentation]
@@ -75,7 +79,7 @@
 | | 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 | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv6
+| | ... | ${framesize} | ${traffic_profile}
 
 | tc03-9000B-1t1c-ethip6-ip6base-ndrchk
 | | [Documentation]
@@ -90,7 +94,7 @@
 | | 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 | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv6
+| | ... | ${framesize} | ${traffic_profile}
 
 | tc04-78B-2t2c-ethip6-ip6base-ndrchk
 | | [Documentation]
@@ -106,7 +110,7 @@
 | | 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 | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv6
+| | ... | ${framesize} | ${traffic_profile}
 
 | tc05-1518B-2t2c-ethip6-ip6base-ndrchk
 | | [Documentation]
@@ -122,7 +126,7 @@
 | | 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 | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv6
+| | ... | ${framesize} | ${traffic_profile}
 
 | tc06-9000B-2t2c-ethip6-ip6base-ndrchk
 | | [Documentation]
@@ -137,7 +141,7 @@
 | | 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 | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv6
+| | ... | ${framesize} | ${traffic_profile}
 
 | tc07-78B-4t4c-ethip6-ip6base-ndrchk
 | | [Documentation]
@@ -153,7 +157,7 @@
 | | 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 | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv6
+| | ... | ${framesize} | ${traffic_profile}
 
 | tc08-1518B-4t4c-ethip6-ip6base-ndrchk
 | | [Documentation]
@@ -169,7 +173,7 @@
 | | 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 | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv6
+| | ... | ${framesize} | ${traffic_profile}
 
 | tc09-9000B-4t4c-ethip6-ip6base-ndrchk
 | | [Documentation]
@@ -184,4 +188,4 @@
 | | 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 | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv6
+| | ... | ${framesize} | ${traffic_profile}
diff --git a/tests/perf/10ge2p1x520-ethip6-ip6base-ndrpdrdisc.robot b/tests/perf/10ge2p1x520-ethip6-ip6base-ndrpdrdisc.robot
index f9b66ffca5..cb9de05380 100644
--- a/tests/perf/10ge2p1x520-ethip6-ip6base-ndrpdrdisc.robot
+++ b/tests/perf/10ge2p1x520-ethip6-ip6base-ndrpdrdisc.robot
@@ -23,7 +23,7 @@
 | ...
 | Test Setup | Performance test setup
 | Test Teardown | Performance test teardown | ${min_rate}pps | ${framesize}
-| ... | 3-node-IPv6
+| ... | ${traffic_profile}
 | ...
 | Documentation | *RFC2544: Pkt throughput IPv6 routing test cases*
 | ...
@@ -49,6 +49,8 @@
 *** Variables ***
 # X520-DA2 bandwidth limit
 | ${s_limit} | ${10000000000}
+# Traffic profile:
+| ${traffic_profile} | trex-sl-3n-ethip6-ip6src253
 
 *** Test Cases ***
 | tc01-78B-1t1c-ethip6-ip6base-ndrdisc
@@ -64,14 +66,13 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | 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
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | 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}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc02-78B-1t1c-ethip6-ip6base-pdrdisc
 | | [Documentation]
@@ -86,16 +87,14 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | 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
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | 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 PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-IPv6
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
-| | ...                                       | ${perf_pdr_loss_acceptance}
-| | ...                                       | ${perf_pdr_loss_acceptance_type}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
+| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
 
 | tc03-1518B-1t1c-ethip6-ip6base-ndrdisc
 | | [Documentation]
@@ -110,14 +109,13 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | 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
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | 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}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc04-1518B-1t1c-ethip6-ip6base-pdrdisc
 | | [Documentation]
@@ -132,16 +130,14 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | 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
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | 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 PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-IPv6
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
-| | ...                                       | ${perf_pdr_loss_acceptance}
-| | ...                                       | ${perf_pdr_loss_acceptance_type}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
+| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
 
 | tc05-9000B-1t1c-ethip6-ip6base-ndrdisc
 | | [Documentation]
@@ -156,13 +152,12 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Apply startup configuration on all VPP DUTs
-| | And   IPv6 forwarding initialized in a 3-node circular topology
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | 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}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc06-9000B-1t1c-ethip6-ip6base-pdrdisc
 | | [Documentation]
@@ -177,15 +172,13 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Apply startup configuration on all VPP DUTs
-| | And   IPv6 forwarding initialized in a 3-node circular topology
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Apply startup configuration on all VPP DUTs
+| | And IPv6 forwarding initialized in a 3-node circular topology
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-IPv6
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
-| | ...                                       | ${perf_pdr_loss_acceptance}
-| | ...                                       | ${perf_pdr_loss_acceptance_type}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
+| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
 
 | tc07-78B-2t2c-ethip6-ip6base-ndrdisc
 | | [Documentation]
@@ -200,14 +193,13 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | 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
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | 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}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc08-78B-2t2c-ethip6-ip6base-pdrdisc
 | | [Documentation]
@@ -222,16 +214,14 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | 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
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | 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 PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-IPv6
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
-| | ...                                       | ${perf_pdr_loss_acceptance}
-| | ...                                       | ${perf_pdr_loss_acceptance_type}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
+| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
 
 | tc09-1518B-2t2c-ethip6-ip6base-ndrdisc
 | | [Documentation]
@@ -246,14 +236,13 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | 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
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | 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}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc10-1518B-2t2c-ethip6-ip6base-pdrdisc
 | | [Documentation]
@@ -268,16 +257,14 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | 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
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | 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 PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-IPv6
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
-| | ...                                       | ${perf_pdr_loss_acceptance}
-| | ...                                       | ${perf_pdr_loss_acceptance_type}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
+| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
 
 | tc11-9000B-2t2c-ethip6-ip6base-ndrdisc
 | | [Documentation]
@@ -292,13 +279,12 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Apply startup configuration on all VPP DUTs
-| | And   IPv6 forwarding initialized in a 3-node circular topology
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | 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}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc12-9000B-2t2c-ethip6-ip6base-pdrdisc
 | | [Documentation]
@@ -313,15 +299,13 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Apply startup configuration on all VPP DUTs
-| | And   IPv6 forwarding initialized in a 3-node circular topology
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Apply startup configuration on all VPP DUTs
+| | And IPv6 forwarding initialized in a 3-node circular topology
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-IPv6
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
-| | ...                                       | ${perf_pdr_loss_acceptance}
-| | ...                                       | ${perf_pdr_loss_acceptance_type}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
+| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
 
 | tc13-78B-4t4c-ethip6-ip6base-ndrdisc
 | | [Documentation]
@@ -336,14 +320,13 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | 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
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | 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}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc14-78B-4t4c-ethip6-ip6base-pdrdisc
 | | [Documentation]
@@ -358,16 +341,14 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | 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
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | 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 PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-IPv6
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
-| | ...                                       | ${perf_pdr_loss_acceptance}
-| | ...                                       | ${perf_pdr_loss_acceptance_type}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
+| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
 
 | tc15-1518B-4t4c-ethip6-ip6base-ndrdisc
 | | [Documentation]
@@ -382,14 +363,13 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | 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
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | 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}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc16-1518B-4t4c-ethip6-ip6base-pdrdisc
 | | [Documentation]
@@ -404,16 +384,14 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | 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
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | 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 PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-IPv6
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
-| | ...                                       | ${perf_pdr_loss_acceptance}
-| | ...                                       | ${perf_pdr_loss_acceptance_type}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
+| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
 
 | tc17-9000B-4t4c-ethip6-ip6base-ndrdisc
 | | [Documentation]
@@ -428,13 +406,12 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Apply startup configuration on all VPP DUTs
-| | And   IPv6 forwarding initialized in a 3-node circular topology
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | 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}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc18-9000B-4t4c-ethip6-ip6base-pdrdisc
 | | [Documentation]
@@ -449,12 +426,10 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Apply startup configuration on all VPP DUTs
-| | And   IPv6 forwarding initialized in a 3-node circular topology
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Apply startup configuration on all VPP DUTs
+| | And IPv6 forwarding initialized in a 3-node circular topology
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-IPv6
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
-| | ...                                       | ${perf_pdr_loss_acceptance}
-| | ...                                       | ${perf_pdr_loss_acceptance_type}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
+| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
diff --git a/tests/perf/10ge2p1x520-ethip6-ip6scale200k-ndrchk.robot b/tests/perf/10ge2p1x520-ethip6-ip6scale200k-ndrchk.robot
index f196c8cbc4..ea5232ed89 100644
--- a/tests/perf/10ge2p1x520-ethip6-ip6scale200k-ndrchk.robot
+++ b/tests/perf/10ge2p1x520-ethip6-ip6scale200k-ndrchk.robot
@@ -47,6 +47,8 @@
 *** Variables ***
 | ${rts_per_flow}= | ${100000}
 
+# Traffic profile:
+| ${traffic_profile} | trex-sl-3n-ethip6-ip6dst${rts_per_flow}
 *** Test Cases ***
 | tc01-78B-1t1c-ethip6-ip6scale200k-ndrchk
 | | [Documentation]
@@ -63,7 +65,7 @@
 | | And Scale IPv6 forwarding initialized in a 3-node circular topology
 | | ... | ${rts_per_flow}
 | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv6-dst-${rts_per_flow}
+| | ... | ${framesize} | ${traffic_profile}
 
 | tc02-1518B-1t1c-ethip6-ip6scale200k-ndrchk
 | | [Documentation]
@@ -80,7 +82,7 @@
 | | And Scale IPv6 forwarding initialized in a 3-node circular topology
 | | ... | ${rts_per_flow}
 | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv6-dst-${rts_per_flow}
+| | ... | ${framesize} | ${traffic_profile}
 
 | tc03-9000B-1t1c-ethip6-ip6scale200k-ndrchk
 | | [Documentation]
@@ -96,7 +98,7 @@
 | | And Scale IPv6 forwarding initialized in a 3-node circular topology
 | | ... | ${rts_per_flow}
 | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv6-dst-${rts_per_flow}
+| | ... | ${framesize} | ${traffic_profile}
 
 | tc04-78B-2t2c-ethip6-ip6scale200k-ndrchk
 | | [Documentation]
@@ -113,7 +115,7 @@
 | | And Scale IPv6 forwarding initialized in a 3-node circular topology
 | | ... | ${rts_per_flow}
 | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv6-dst-${rts_per_flow}
+| | ... | ${framesize} | ${traffic_profile}
 
 | tc05-1518B-2t2c-ethip6-ip6scale200k-ndrchk
 | | [Documentation]
@@ -130,7 +132,7 @@
 | | And Scale IPv6 forwarding initialized in a 3-node circular topology
 | | ... | ${rts_per_flow}
 | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv6-dst-${rts_per_flow}
+| | ... | ${framesize} | ${traffic_profile}
 
 | tc06-9000B-2t2c-ethip6-ip6scale200k-ndrchk
 | | [Documentation]
@@ -146,7 +148,7 @@
 | | And Scale IPv6 forwarding initialized in a 3-node circular topology
 | | ... | ${rts_per_flow}
 | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv6-dst-${rts_per_flow}
+| | ... | ${framesize} | ${traffic_profile}
 
 | tc07-78B-4t4c-ethip6-ip6scale200k-ndrchk
 | | [Documentation]
@@ -163,7 +165,7 @@
 | | And Scale IPv6 forwarding initialized in a 3-node circular topology
 | | ... | ${rts_per_flow}
 | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv6-dst-${rts_per_flow}
+| | ... | ${framesize} | ${traffic_profile}
 
 | tc08-1518B-4t4c-ethip6-ip6scale200k-ndrchk
 | | [Documentation]
@@ -180,7 +182,7 @@
 | | And Scale IPv6 forwarding initialized in a 3-node circular topology
 | | ... | ${rts_per_flow}
 | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv6-dst-${rts_per_flow}
+| | ... | ${framesize} | ${traffic_profile}
 
 | tc09-9000B-4t4c-ethip6-ip6scale200k-ndrchk
 | | [Documentation]
@@ -196,4 +198,4 @@
 | | And Scale IPv6 forwarding initialized in a 3-node circular topology
 | | ... | ${rts_per_flow}
 | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv6-dst-${rts_per_flow}
+| | ... | ${framesize} | ${traffic_profile}
diff --git a/tests/perf/10ge2p1x520-ethip6-ip6scale200k-ndrpdrdisc.robot b/tests/perf/10ge2p1x520-ethip6-ip6scale200k-ndrpdrdisc.robot
index 9194c35903..33e42f5e11 100644
--- a/tests/perf/10ge2p1x520-ethip6-ip6scale200k-ndrpdrdisc.robot
+++ b/tests/perf/10ge2p1x520-ethip6-ip6scale200k-ndrpdrdisc.robot
@@ -23,7 +23,7 @@
 | ...
 | Test Setup | Performance test setup
 | Test Teardown | Performance test teardown | ${min_rate}pps | ${framesize}
-| ... | 3-node-IPv6-dst-${rts_per_flow}
+| ... | ${traffic_profile}
 | ...
 | Documentation | *RFC2544: Pkt throughput IPv6 routing test cases*
 | ...
@@ -52,6 +52,8 @@
 # X520-DA2 bandwidth limit
 | ${s_limit} | ${10000000000}
 | ${rts_per_flow}= | ${100000}
+# Traffic profile:
+| ${traffic_profile} | trex-sl-3n-ethip6-ip6dst${rts_per_flow}
 
 *** Test Cases ***
 | tc01-78B-1t1c-ethip6-ip6scale200k-ndrdisc
@@ -67,16 +69,14 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | And   Scale IPv6 forwarding initialized in a 3-node circular topology
-| | ...   | ${rts_per_flow}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | And Scale IPv6 forwarding initialized in a 3-node circular topology
+| | ... | ${rts_per_flow}
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max}
-| | ...                                       | 3-node-IPv6-dst-${rts_per_flow}
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc02-78B-1t1c-ethip6-ip6scale200k-pdrdisc
 | | [Documentation]
@@ -91,18 +91,15 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | And   Scale IPv6 forwarding initialized in a 3-node circular topology
-| | ...   | ${rts_per_flow}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | And Scale IPv6 forwarding initialized in a 3-node circular topology
+| | ... | ${rts_per_flow}
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max}
-| | ...                                       | 3-node-IPv6-dst-${rts_per_flow}
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
-| | ...                                       | ${perf_pdr_loss_acceptance}
-| | ...                                       | ${perf_pdr_loss_acceptance_type}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
+| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
 
 | tc03-1518B-1t1c-ethip6-ip6scale200k-ndrdisc
 | | [Documentation]
@@ -117,16 +114,14 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | And   Scale IPv6 forwarding initialized in a 3-node circular topology
-| | ...   | ${rts_per_flow}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | And Scale IPv6 forwarding initialized in a 3-node circular topology
+| | ... | ${rts_per_flow}
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max}
-| | ...                                       | 3-node-IPv6-dst-${rts_per_flow}
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc04-1518B-1t1c-ethip6-ip6scale200k-pdrdisc
 | | [Documentation]
@@ -141,18 +136,15 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | And   Scale IPv6 forwarding initialized in a 3-node circular topology
-| | ...   | ${rts_per_flow}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | And Scale IPv6 forwarding initialized in a 3-node circular topology
+| | ... | ${rts_per_flow}
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max}
-| | ...                                       | 3-node-IPv6-dst-${rts_per_flow}
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
-| | ...                                       | ${perf_pdr_loss_acceptance}
-| | ...                                       | ${perf_pdr_loss_acceptance_type}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
+| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
 
 | tc05-9000B-1t1c-ethip6-ip6scale200k-ndrdisc
 | | [Documentation]
@@ -167,15 +159,13 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Apply startup configuration on all VPP DUTs
-| | And   Scale IPv6 forwarding initialized in a 3-node circular topology
-| | ...   | ${rts_per_flow}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Apply startup configuration on all VPP DUTs
+| | And Scale IPv6 forwarding initialized in a 3-node circular topology
+| | ... | ${rts_per_flow}
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max}
-| | ...                                       | 3-node-IPv6-dst-${rts_per_flow}
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc06-9000B-1t1c-ethip6-ip6scale200k-pdrdisc
 | | [Documentation]
@@ -190,17 +180,14 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Apply startup configuration on all VPP DUTs
-| | And   Scale IPv6 forwarding initialized in a 3-node circular topology
-| | ...   | ${rts_per_flow}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Apply startup configuration on all VPP DUTs
+| | And Scale IPv6 forwarding initialized in a 3-node circular topology
+| | ... | ${rts_per_flow}
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max}
-| | ...                                       | 3-node-IPv6-dst-${rts_per_flow}
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
-| | ...                                       | ${perf_pdr_loss_acceptance}
-| | ...                                       | ${perf_pdr_loss_acceptance_type}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
+| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
 
 | tc07-78B-2t2c-ethip6-ip6scale200k-ndrdisc
 | | [Documentation]
@@ -215,16 +202,14 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | And   Scale IPv6 forwarding initialized in a 3-node circular topology
-| | ...   | ${rts_per_flow}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | And Scale IPv6 forwarding initialized in a 3-node circular topology
+| | ... | ${rts_per_flow}
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max}
-| | ...                                       | 3-node-IPv6-dst-${rts_per_flow}
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc08-78B-2t2c-ethip6-ip6scale200k-pdrdisc
 | | [Documentation]
@@ -239,18 +224,15 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | And   Scale IPv6 forwarding initialized in a 3-node circular topology
-| | ...   | ${rts_per_flow}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | And Scale IPv6 forwarding initialized in a 3-node circular topology
+| | ... | ${rts_per_flow}
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max}
-| | ...                                       | 3-node-IPv6-dst-${rts_per_flow}
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
-| | ...                                       | ${perf_pdr_loss_acceptance}
-| | ...                                       | ${perf_pdr_loss_acceptance_type}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
+| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
 
 | tc09-1518B-2t2c-ethip6-ip6scale200k-ndrdisc
 | | [Documentation]
@@ -265,16 +247,14 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | And   Scale IPv6 forwarding initialized in a 3-node circular topology
-| | ...   | ${rts_per_flow}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | And Scale IPv6 forwarding initialized in a 3-node circular topology
+| | ... | ${rts_per_flow}
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max}
-| | ...                                       | 3-node-IPv6-dst-${rts_per_flow}
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc10-1518B-2t2c-ethip6-ip6scale200k-pdrdisc
 | | [Documentation]
@@ -289,18 +269,15 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | And   Scale IPv6 forwarding initialized in a 3-node circular topology
-| | ...   | ${rts_per_flow}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | And Scale IPv6 forwarding initialized in a 3-node circular topology
+| | ... | ${rts_per_flow}
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max}
-| | ...                                       | 3-node-IPv6-dst-${rts_per_flow}
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
-| | ...                                       | ${perf_pdr_loss_acceptance}
-| | ...                                       | ${perf_pdr_loss_acceptance_type}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
+| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
 
 | tc11-9000B-2t2c-ethip6-ip6scale200k-ndrdisc
 | | [Documentation]
@@ -315,15 +292,13 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Apply startup configuration on all VPP DUTs
-| | And   Scale IPv6 forwarding initialized in a 3-node circular topology
-| | ...   | ${rts_per_flow}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Apply startup configuration on all VPP DUTs
+| | And Scale IPv6 forwarding initialized in a 3-node circular topology
+| | ... | ${rts_per_flow}
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max}
-| | ...                                       | 3-node-IPv6-dst-${rts_per_flow}
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc12-9000B-2t2c-ethip6-ip6scale200k-pdrdisc
 | | [Documentation]
@@ -338,17 +313,14 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Apply startup configuration on all VPP DUTs
-| | And   Scale IPv6 forwarding initialized in a 3-node circular topology
-| | ...   | ${rts_per_flow}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Apply startup configuration on all VPP DUTs
+| | And Scale IPv6 forwarding initialized in a 3-node circular topology
+| | ... | ${rts_per_flow}
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max}
-| | ...                                       | 3-node-IPv6-dst-${rts_per_flow}
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
-| | ...                                       | ${perf_pdr_loss_acceptance}
-| | ...                                       | ${perf_pdr_loss_acceptance_type}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
+| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
 
 | tc13-78B-4t4c-ethip6-ip6scale200k-ndrdisc
 | | [Documentation]
@@ -363,16 +335,14 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | And   Scale IPv6 forwarding initialized in a 3-node circular topology
-| | ...   | ${rts_per_flow}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | And Scale IPv6 forwarding initialized in a 3-node circular topology
+| | ... | ${rts_per_flow}
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max}
-| | ...                                       | 3-node-IPv6-dst-${rts_per_flow}
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc14-78B-4t4c-ethip6-ip6scale200k-pdrdisc
 | | [Documentation]
@@ -387,18 +357,15 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | And   Scale IPv6 forwarding initialized in a 3-node circular topology
-| | ...   | ${rts_per_flow}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | And Scale IPv6 forwarding initialized in a 3-node circular topology
+| | ... | ${rts_per_flow}
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max}
-| | ...                                       | 3-node-IPv6-dst-${rts_per_flow}
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
-| | ...                                       | ${perf_pdr_loss_acceptance}
-| | ...                                       | ${perf_pdr_loss_acceptance_type}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
+| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
 
 | tc15-1518B-4t4c-ethip6-ip6scale200k-ndrdisc
 | | [Documentation]
@@ -413,16 +380,14 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | And   Scale IPv6 forwarding initialized in a 3-node circular topology
-| | ...   | ${rts_per_flow}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | And Scale IPv6 forwarding initialized in a 3-node circular topology
+| | ... | ${rts_per_flow}
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max}
-| | ...                                       | 3-node-IPv6-dst-${rts_per_flow}
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc16-1518B-4t4c-ethip6-ip6scale200k-pdrdisc
 | | [Documentation]
@@ -437,18 +402,15 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | And   Scale IPv6 forwarding initialized in a 3-node circular topology
-| | ...   | ${rts_per_flow}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | And Scale IPv6 forwarding initialized in a 3-node circular topology
+| | ... | ${rts_per_flow}
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max}
-| | ...                                       | 3-node-IPv6-dst-${rts_per_flow}
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
-| | ...                                       | ${perf_pdr_loss_acceptance}
-| | ...                                       | ${perf_pdr_loss_acceptance_type}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
+| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
 
 | tc17-9000B-4t4c-ethip6-ip6scale200k-ndrdisc
 | | [Documentation]
@@ -463,15 +425,13 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Apply startup configuration on all VPP DUTs
-| | And   Scale IPv6 forwarding initialized in a 3-node circular topology
-| | ...   | ${rts_per_flow}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Apply startup configuration on all VPP DUTs
+| | And Scale IPv6 forwarding initialized in a 3-node circular topology
+| | ... | ${rts_per_flow}
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max}
-| | ...                                       | 3-node-IPv6-dst-${rts_per_flow}
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc18-9000B-4t4c-ethip6-ip6scale200k-pdrdisc
 | | [Documentation]
@@ -486,14 +446,11 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Apply startup configuration on all VPP DUTs
-| | And   Scale IPv6 forwarding initialized in a 3-node circular topology
-| | ...   | ${rts_per_flow}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Apply startup configuration on all VPP DUTs
+| | And Scale IPv6 forwarding initialized in a 3-node circular topology
+| | ... | ${rts_per_flow}
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max}
-| | ...                                       | 3-node-IPv6-dst-${rts_per_flow}
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
-| | ...                                       | ${perf_pdr_loss_acceptance}
-| | ...                                       | ${perf_pdr_loss_acceptance_type}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
+| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
diff --git a/tests/perf/10ge2p1x520-ethip6-ip6scale20k-ndrchk.robot b/tests/perf/10ge2p1x520-ethip6-ip6scale20k-ndrchk.robot
index 35f3902090..8a59d4bda5 100644
--- a/tests/perf/10ge2p1x520-ethip6-ip6scale20k-ndrchk.robot
+++ b/tests/perf/10ge2p1x520-ethip6-ip6scale20k-ndrchk.robot
@@ -46,6 +46,8 @@
 
 *** Variables ***
 | ${rts_per_flow}= | ${10000}
+# Traffic profile:
+| ${traffic_profile} | trex-sl-3n-ethip6-ip6dst${rts_per_flow}
 
 *** Test Cases ***
 | tc01-78B-1t1c-ethip6-ip6scale20k-ndrchk
@@ -63,7 +65,7 @@
 | | And Scale IPv6 forwarding initialized in a 3-node circular topology
 | | ... | ${rts_per_flow}
 | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv6-dst-${rts_per_flow}
+| | ... | ${framesize} | ${traffic_profile}
 
 | tc02-1518B-1t1c-ethip6-ip6scale20k-ndrchk
 | | [Documentation]
@@ -80,7 +82,7 @@
 | | And Scale IPv6 forwarding initialized in a 3-node circular topology
 | | ... | ${rts_per_flow}
 | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv6-dst-${rts_per_flow}
+| | ... | ${framesize} | ${traffic_profile}
 
 | tc03-9000B-1t1c-ethip6-ip6scale20k-ndrchk
 | | [Documentation]
@@ -96,7 +98,7 @@
 | | And Scale IPv6 forwarding initialized in a 3-node circular topology
 | | ... | ${rts_per_flow}
 | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv6-dst-${rts_per_flow}
+| | ... | ${framesize} | ${traffic_profile}
 
 | tc04-78B-2t2c-ethip6-ip6scale20k-ndrchk
 | | [Documentation]
@@ -113,7 +115,7 @@
 | | And Scale IPv6 forwarding initialized in a 3-node circular topology
 | | ... | ${rts_per_flow}
 | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv6-dst-${rts_per_flow}
+| | ... | ${framesize} | ${traffic_profile}
 
 | tc05-1518B-2t2c-ethip6-ip6scale20k-ndrchk
 | | [Documentation]
@@ -130,7 +132,7 @@
 | | And Scale IPv6 forwarding initialized in a 3-node circular topology
 | | ... | ${rts_per_flow}
 | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv6-dst-${rts_per_flow}
+| | ... | ${framesize} | ${traffic_profile}
 
 | tc06-9000B-2t2c-ethip6-ip6scale20k-ndrchk
 | | [Documentation]
@@ -146,7 +148,7 @@
 | | And Scale IPv6 forwarding initialized in a 3-node circular topology
 | | ... | ${rts_per_flow}
 | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv6-dst-${rts_per_flow}
+| | ... | ${framesize} | ${traffic_profile}
 
 | tc07-78B-4t4c-ethip6-ip6scale20k-ndrchk
 | | [Documentation]
@@ -163,7 +165,7 @@
 | | And Scale IPv6 forwarding initialized in a 3-node circular topology
 | | ... | ${rts_per_flow}
 | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv6-dst-${rts_per_flow}
+| | ... | ${framesize} | ${traffic_profile}
 
 | tc08-1518B-4t4c-ethip6-ip6scale20k-ndrchk
 | | [Documentation]
@@ -180,7 +182,7 @@
 | | And Scale IPv6 forwarding initialized in a 3-node circular topology
 | | ... | ${rts_per_flow}
 | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv6-dst-${rts_per_flow}
+| | ... | ${framesize} | ${traffic_profile}
 
 | tc09-9000B-4t4c-ethip6-ip6scale20k-ndrchk
 | | [Documentation]
@@ -196,4 +198,4 @@
 | | And Scale IPv6 forwarding initialized in a 3-node circular topology
 | | ... | ${rts_per_flow}
 | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv6-dst-${rts_per_flow}
+| | ... | ${framesize} | ${traffic_profile}
diff --git a/tests/perf/10ge2p1x520-ethip6-ip6scale20k-ndrpdrdisc.robot b/tests/perf/10ge2p1x520-ethip6-ip6scale20k-ndrpdrdisc.robot
index 4772a2d77e..bee41a66f7 100644
--- a/tests/perf/10ge2p1x520-ethip6-ip6scale20k-ndrpdrdisc.robot
+++ b/tests/perf/10ge2p1x520-ethip6-ip6scale20k-ndrpdrdisc.robot
@@ -23,7 +23,7 @@
 | ...
 | Test Setup | Performance test setup
 | Test Teardown | Performance test teardown | ${min_rate}pps | ${framesize}
-| ... | 3-node-IPv6-dst-${rts_per_flow}
+| ... | ${traffic_profile}
 | ...
 | Documentation | *RFC2544: Pkt throughput IPv6 routing test cases*
 | ...
@@ -52,6 +52,8 @@
 # X520-DA2 bandwidth limit
 | ${s_limit} | ${10000000000}
 | ${rts_per_flow}= | ${10000}
+# Traffic profile:
+| ${traffic_profile} | trex-sl-3n-ethip6-ip6dst${rts_per_flow}
 
 *** Test Cases ***
 | tc01-78B-1t1c-ethip6-ip6scale20k-ndrdisc
@@ -67,16 +69,14 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | And   Scale IPv6 forwarding initialized in a 3-node circular topology
-| | ...   | ${rts_per_flow}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | And Scale IPv6 forwarding initialized in a 3-node circular topology
+| | ... | ${rts_per_flow}
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max}
-| | ...                                       | 3-node-IPv6-dst-${rts_per_flow}
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc02-78B-1t1c-ethip6-ip6scale20k-pdrdisc
 | | [Documentation]
@@ -91,18 +91,15 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | And   Scale IPv6 forwarding initialized in a 3-node circular topology
-| | ...   | ${rts_per_flow}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | And Scale IPv6 forwarding initialized in a 3-node circular topology
+| | ... | ${rts_per_flow}
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max}
-| | ...                                       | 3-node-IPv6-dst-${rts_per_flow}
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
-| | ...                                       | ${perf_pdr_loss_acceptance}
-| | ...                                       | ${perf_pdr_loss_acceptance_type}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
+| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
 
 | tc03-1518B-1t1c-ethip6-ip6scale20k-ndrdisc
 | | [Documentation]
@@ -117,16 +114,14 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | And   Scale IPv6 forwarding initialized in a 3-node circular topology
-| | ...   | ${rts_per_flow}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | And Scale IPv6 forwarding initialized in a 3-node circular topology
+| | ... | ${rts_per_flow}
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max}
-| | ...                                       | 3-node-IPv6-dst-${rts_per_flow}
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc04-1518B-1t1c-ethip6-ip6scale20k-pdrdisc
 | | [Documentation]
@@ -141,18 +136,15 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | And   Scale IPv6 forwarding initialized in a 3-node circular topology
-| | ...   | ${rts_per_flow}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | And Scale IPv6 forwarding initialized in a 3-node circular topology
+| | ... | ${rts_per_flow}
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max}
-| | ...                                       | 3-node-IPv6-dst-${rts_per_flow}
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
-| | ...                                       | ${perf_pdr_loss_acceptance}
-| | ...                                       | ${perf_pdr_loss_acceptance_type}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
+| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
 
 | tc05-9000B-1t1c-ethip6-ip6scale20k-ndrdisc
 | | [Documentation]
@@ -167,15 +159,13 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Apply startup configuration on all VPP DUTs
-| | And   Scale IPv6 forwarding initialized in a 3-node circular topology
-| | ...   | ${rts_per_flow}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Apply startup configuration on all VPP DUTs
+| | And Scale IPv6 forwarding initialized in a 3-node circular topology
+| | ... | ${rts_per_flow}
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max}
-| | ...                                       | 3-node-IPv6-dst-${rts_per_flow}
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc06-9000B-1t1c-ethip6-ip6scale20k-pdrdisc
 | | [Documentation]
@@ -190,17 +180,14 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Apply startup configuration on all VPP DUTs
-| | And   Scale IPv6 forwarding initialized in a 3-node circular topology
-| | ...   | ${rts_per_flow}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Apply startup configuration on all VPP DUTs
+| | And Scale IPv6 forwarding initialized in a 3-node circular topology
+| | ... | ${rts_per_flow}
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max}
-| | ...                                       | 3-node-IPv6-dst-${rts_per_flow}
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
-| | ...                                       | ${perf_pdr_loss_acceptance}
-| | ...                                       | ${perf_pdr_loss_acceptance_type}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
+| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
 
 | tc07-78B-2t2c-ethip6-ip6scale20k-ndrdisc
 | | [Documentation]
@@ -215,16 +202,14 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | And   Scale IPv6 forwarding initialized in a 3-node circular topology
-| | ...   | ${rts_per_flow}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | And Scale IPv6 forwarding initialized in a 3-node circular topology
+| | ... | ${rts_per_flow}
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max}
-| | ...                                       | 3-node-IPv6-dst-${rts_per_flow}
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc08-78B-2t2c-ethip6-ip6scale20k-pdrdisc
 | | [Documentation]
@@ -239,18 +224,15 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | And   Scale IPv6 forwarding initialized in a 3-node circular topology
-| | ...   | ${rts_per_flow}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | And Scale IPv6 forwarding initialized in a 3-node circular topology
+| | ... | ${rts_per_flow}
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max}
-| | ...                                       | 3-node-IPv6-dst-${rts_per_flow}
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
-| | ...                                       | ${perf_pdr_loss_acceptance}
-| | ...                                       | ${perf_pdr_loss_acceptance_type}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
+| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
 
 | tc09-1518B-2t2c-ethip6-ip6scale20k-ndrdisc
 | | [Documentation]
@@ -265,16 +247,14 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | And   Scale IPv6 forwarding initialized in a 3-node circular topology
-| | ...   | ${rts_per_flow}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | And Scale IPv6 forwarding initialized in a 3-node circular topology
+| | ... | ${rts_per_flow}
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max}
-| | ...                                       | 3-node-IPv6-dst-${rts_per_flow}
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc10-1518B-2t2c-ethip6-ip6scale20k-pdrdisc
 | | [Documentation]
@@ -289,18 +269,15 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | And   Scale IPv6 forwarding initialized in a 3-node circular topology
-| | ...   | ${rts_per_flow}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | And Scale IPv6 forwarding initialized in a 3-node circular topology
+| | ... | ${rts_per_flow}
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max}
-| | ...                                       | 3-node-IPv6-dst-${rts_per_flow}
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
-| | ...                                       | ${perf_pdr_loss_acceptance}
-| | ...                                       | ${perf_pdr_loss_acceptance_type}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
+| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
 
 | tc11-9000B-2t2c-ethip6-ip6scale20k-ndrdisc
 | | [Documentation]
@@ -315,15 +292,13 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Apply startup configuration on all VPP DUTs
-| | And   Scale IPv6 forwarding initialized in a 3-node circular topology
-| | ...   | ${rts_per_flow}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Apply startup configuration on all VPP DUTs
+| | And Scale IPv6 forwarding initialized in a 3-node circular topology
+| | ... | ${rts_per_flow}
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max}
-| | ...                                       | 3-node-IPv6-dst-${rts_per_flow}
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc12-9000B-2t2c-ethip6-ip6scale20k-pdrdisc
 | | [Documentation]
@@ -338,17 +313,14 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Apply startup configuration on all VPP DUTs
-| | And   Scale IPv6 forwarding initialized in a 3-node circular topology
-| | ...   | ${rts_per_flow}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Apply startup configuration on all VPP DUTs
+| | And Scale IPv6 forwarding initialized in a 3-node circular topology
+| | ... | ${rts_per_flow}
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max}
-| | ...                                       | 3-node-IPv6-dst-${rts_per_flow}
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
-| | ...                                       | ${perf_pdr_loss_acceptance}
-| | ...                                       | ${perf_pdr_loss_acceptance_type}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
+| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
 
 | tc13-78B-4t4c-ethip6-ip6scale20k-ndrdisc
 | | [Documentation]
@@ -363,16 +335,14 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | And   Scale IPv6 forwarding initialized in a 3-node circular topology
-| | ...   | ${rts_per_flow}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | And Scale IPv6 forwarding initialized in a 3-node circular topology
+| | ... | ${rts_per_flow}
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max}
-| | ...                                       | 3-node-IPv6-dst-${rts_per_flow}
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc14-78B-4t4c-ethip6-ip6scale20k-pdrdisc
 | | [Documentation]
@@ -387,18 +357,15 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | And   Scale IPv6 forwarding initialized in a 3-node circular topology
-| | ...   | ${rts_per_flow}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | And Scale IPv6 forwarding initialized in a 3-node circular topology
+| | ... | ${rts_per_flow}
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max}
-| | ...                                       | 3-node-IPv6-dst-${rts_per_flow}
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
-| | ...                                       | ${perf_pdr_loss_acceptance}
-| | ...                                       | ${perf_pdr_loss_acceptance_type}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
+| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
 
 | tc15-1518B-4t4c-ethip6-ip6scale20k-ndrdisc
 | | [Documentation]
@@ -413,16 +380,14 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | And   Scale IPv6 forwarding initialized in a 3-node circular topology
-| | ...   | ${rts_per_flow}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | And Scale IPv6 forwarding initialized in a 3-node circular topology
+| | ... | ${rts_per_flow}
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max}
-| | ...                                       | 3-node-IPv6-dst-${rts_per_flow}
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc16-1518B-4t4c-ethip6-ip6scale20k-pdrdisc
 | | [Documentation]
@@ -437,18 +402,15 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | And   Scale IPv6 forwarding initialized in a 3-node circular topology
-| | ...   | ${rts_per_flow}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | And Scale IPv6 forwarding initialized in a 3-node circular topology
+| | ... | ${rts_per_flow}
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max}
-| | ...                                       | 3-node-IPv6-dst-${rts_per_flow}
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
-| | ...                                       | ${perf_pdr_loss_acceptance}
-| | ...                                       | ${perf_pdr_loss_acceptance_type}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
+| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
 
 | tc17-9000B-4t4c-ethip6-ip6scale20k-ndrdisc
 | | [Documentation]
@@ -463,15 +425,13 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Apply startup configuration on all VPP DUTs
-| | And   Scale IPv6 forwarding initialized in a 3-node circular topology
-| | ...   | ${rts_per_flow}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Apply startup configuration on all VPP DUTs
+| | And Scale IPv6 forwarding initialized in a 3-node circular topology
+| | ... | ${rts_per_flow}
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max}
-| | ...                                       | 3-node-IPv6-dst-${rts_per_flow}
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc18-9000B-4t4c-ethip6-ip6scale20k-pdrdisc
 | | [Documentation]
@@ -486,14 +446,11 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Apply startup configuration on all VPP DUTs
-| | And   Scale IPv6 forwarding initialized in a 3-node circular topology
-| | ...   | ${rts_per_flow}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Apply startup configuration on all VPP DUTs
+| | And Scale IPv6 forwarding initialized in a 3-node circular topology
+| | ... | ${rts_per_flow}
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max}
-| | ...                                       | 3-node-IPv6-dst-${rts_per_flow}
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
-| | ...                                       | ${perf_pdr_loss_acceptance}
-| | ...                                       | ${perf_pdr_loss_acceptance_type}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
+| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
diff --git a/tests/perf/10ge2p1x520-ethip6-ip6scale2m-ndrchk.robot b/tests/perf/10ge2p1x520-ethip6-ip6scale2m-ndrchk.robot
index 21bf0589bd..2f30d4202a 100644
--- a/tests/perf/10ge2p1x520-ethip6-ip6scale2m-ndrchk.robot
+++ b/tests/perf/10ge2p1x520-ethip6-ip6scale2m-ndrchk.robot
@@ -46,6 +46,8 @@
 
 *** Variables ***
 | ${rts_per_flow}= | ${1000000}
+# Traffic profile:
+| ${traffic_profile} | trex-sl-3n-ethip6-ip6dst${rts_per_flow}
 
 *** Test Cases ***
 | tc01-78B-1t1c-ethip6-ip6scale2m-ndrchk
@@ -64,7 +66,8 @@
 | | And Scale IPv6 forwarding initialized in a 3-node circular topology
 | | ... | ${rts_per_flow}
 | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv6-dst-${rts_per_flow}
+| | ... | ${framesize}
+| | ... | ${traffic_profile}
 
 | tc02-1518B-1t1c-ethip6-ip6scale2m-ndrchk
 | | [Documentation]
@@ -82,7 +85,8 @@
 | | And Scale IPv6 forwarding initialized in a 3-node circular topology
 | | ... | ${rts_per_flow}
 | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv6-dst-${rts_per_flow}
+| | ... | ${framesize}
+| | ... | ${traffic_profile}
 
 | tc03-9000B-1t1c-ethip6-ip6scale2m-ndrchk
 | | [Documentation]
@@ -99,7 +103,8 @@
 | | And Scale IPv6 forwarding initialized in a 3-node circular topology
 | | ... | ${rts_per_flow}
 | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv6-dst-${rts_per_flow}
+| | ... | ${framesize}
+| | ... | ${traffic_profile}
 
 | tc04-78B-2t2c-ethip6-ip6scale2m-ndrchk
 | | [Documentation]
@@ -117,7 +122,8 @@
 | | And Scale IPv6 forwarding initialized in a 3-node circular topology
 | | ... | ${rts_per_flow}
 | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv6-dst-${rts_per_flow}
+| | ... | ${framesize}
+| | ... | ${traffic_profile}
 
 | tc05-1518B-2t2c-ethip6-ip6scale2m-ndrchk
 | | [Documentation]
@@ -135,7 +141,8 @@
 | | And Scale IPv6 forwarding initialized in a 3-node circular topology
 | | ... | ${rts_per_flow}
 | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv6-dst-${rts_per_flow}
+| | ... | ${framesize}
+| | ... | ${traffic_profile}
 
 | tc06-9000B-2t2c-ethip6-ip6scale2m-ndrchk
 | | [Documentation]
@@ -152,7 +159,8 @@
 | | And Scale IPv6 forwarding initialized in a 3-node circular topology
 | | ... | ${rts_per_flow}
 | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv6-dst-${rts_per_flow}
+| | ... | ${framesize}
+| | ... | ${traffic_profile}
 
 | tc07-78B-4t4c-ethip6-ip6scale2m-ndrchk
 | | [Documentation]
@@ -170,7 +178,8 @@
 | | And Scale IPv6 forwarding initialized in a 3-node circular topology
 | | ... | ${rts_per_flow}
 | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv6-dst-${rts_per_flow}
+| | ... | ${framesize}
+| | ... | ${traffic_profile}
 
 | tc08-1518B-4t4c-ethip6-ip6scale2m-ndrchk
 | | [Documentation]
@@ -188,7 +197,8 @@
 | | And Scale IPv6 forwarding initialized in a 3-node circular topology
 | | ... | ${rts_per_flow}
 | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv6-dst-${rts_per_flow}
+| | ... | ${framesize}
+| | ... | ${traffic_profile}
 
 | tc09-9000B-4t4c-ethip6-ip6scale2m-ndrchk
 | | [Documentation]
@@ -205,4 +215,5 @@
 | | And Scale IPv6 forwarding initialized in a 3-node circular topology
 | | ... | ${rts_per_flow}
 | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv6-dst-${rts_per_flow}
+| | ... | ${framesize}
+| | ... | ${traffic_profile}
diff --git a/tests/perf/10ge2p1x520-ethip6-ip6scale2m-ndrpdrdisc.robot b/tests/perf/10ge2p1x520-ethip6-ip6scale2m-ndrpdrdisc.robot
index 7ca69b5acb..8fe12dc9a3 100644
--- a/tests/perf/10ge2p1x520-ethip6-ip6scale2m-ndrpdrdisc.robot
+++ b/tests/perf/10ge2p1x520-ethip6-ip6scale2m-ndrpdrdisc.robot
@@ -23,7 +23,7 @@
 | ...
 | Test Setup | Performance test setup
 | Test Teardown | Performance test teardown | ${min_rate}pps | ${framesize}
-| ... | 3-node-IPv6-dst-${rts_per_flow}
+| ... | ${traffic_profile}
 | ...
 | Documentation | *RFC2544: Pkt throughput IPv6 routing test cases*
 | ...
@@ -52,6 +52,8 @@
 # X520-DA2 bandwidth limit
 | ${s_limit} | ${10000000000}
 | ${rts_per_flow}= | ${1000000}
+# Traffic profile:
+| ${traffic_profile} | trex-sl-3n-ethip6-ip6dst${rts_per_flow}
 
 *** Test Cases ***
 | tc01-78B-1t1c-ethip6-ip6scale2m-ndrdisc
@@ -67,17 +69,15 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Add Heapsize Config to all DUTs | 3G
-| | And   Apply startup configuration on all VPP DUTs
-| | And   Scale IPv6 forwarding initialized in a 3-node circular topology
-| | ...   | ${rts_per_flow}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Add Heapsize Config to all DUTs | 3G
+| | And Apply startup configuration on all VPP DUTs
+| | And Scale IPv6 forwarding initialized in a 3-node circular topology
+| | ... | ${rts_per_flow}
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max}
-| | ...                                       | 3-node-IPv6-dst-${rts_per_flow}
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc02-78B-1t1c-ethip6-ip6scale2m-pdrdisc
 | | [Documentation]
@@ -92,19 +92,16 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Add Heapsize Config to all DUTs | 3G
-| | And   Apply startup configuration on all VPP DUTs
-| | And   Scale IPv6 forwarding initialized in a 3-node circular topology
-| | ...   | ${rts_per_flow}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Add Heapsize Config to all DUTs | 3G
+| | And Apply startup configuration on all VPP DUTs
+| | And Scale IPv6 forwarding initialized in a 3-node circular topology
+| | ... | ${rts_per_flow}
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max}
-| | ...                                       | 3-node-IPv6-dst-${rts_per_flow}
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
-| | ...                                       | ${perf_pdr_loss_acceptance}
-| | ...                                       | ${perf_pdr_loss_acceptance_type}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
+| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
 
 | tc03-1518B-1t1c-ethip6-ip6scale2m-ndrdisc
 | | [Documentation]
@@ -119,17 +116,15 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Add Heapsize Config to all DUTs | 3G
-| | And   Apply startup configuration on all VPP DUTs
-| | And   Scale IPv6 forwarding initialized in a 3-node circular topology
-| | ...   | ${rts_per_flow}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Add Heapsize Config to all DUTs | 3G
+| | And Apply startup configuration on all VPP DUTs
+| | And Scale IPv6 forwarding initialized in a 3-node circular topology
+| | ... | ${rts_per_flow}
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max}
-| | ...                                       | 3-node-IPv6-dst-${rts_per_flow}
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc04-1518B-1t1c-ethip6-ip6scale2m-pdrdisc
 | | [Documentation]
@@ -144,19 +139,16 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Add Heapsize Config to all DUTs | 3G
-| | And   Apply startup configuration on all VPP DUTs
-| | And   Scale IPv6 forwarding initialized in a 3-node circular topology
-| | ...   | ${rts_per_flow}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Add Heapsize Config to all DUTs | 3G
+| | And Apply startup configuration on all VPP DUTs
+| | And Scale IPv6 forwarding initialized in a 3-node circular topology
+| | ... | ${rts_per_flow}
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max}
-| | ...                                       | 3-node-IPv6-dst-${rts_per_flow}
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
-| | ...                                       | ${perf_pdr_loss_acceptance}
-| | ...                                       | ${perf_pdr_loss_acceptance_type}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
+| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
 
 | tc05-9000B-1t1c-ethip6-ip6scale2m-ndrdisc
 | | [Documentation]
@@ -171,16 +163,14 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add Heapsize Config to all DUTs | 3G
-| | And   Apply startup configuration on all VPP DUTs
-| | And   Scale IPv6 forwarding initialized in a 3-node circular topology
-| | ...   | ${rts_per_flow}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add Heapsize Config to all DUTs | 3G
+| | And Apply startup configuration on all VPP DUTs
+| | And Scale IPv6 forwarding initialized in a 3-node circular topology
+| | ... | ${rts_per_flow}
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max}
-| | ...                                       | 3-node-IPv6-dst-${rts_per_flow}
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc06-9000B-1t1c-ethip6-ip6scale2m-pdrdisc
 | | [Documentation]
@@ -195,18 +185,15 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add Heapsize Config to all DUTs | 3G
-| | And   Apply startup configuration on all VPP DUTs
-| | And   Scale IPv6 forwarding initialized in a 3-node circular topology
-| | ...   | ${rts_per_flow}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add Heapsize Config to all DUTs | 3G
+| | And Apply startup configuration on all VPP DUTs
+| | And Scale IPv6 forwarding initialized in a 3-node circular topology
+| | ... | ${rts_per_flow}
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max}
-| | ...                                       | 3-node-IPv6-dst-${rts_per_flow}
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
-| | ...                                       | ${perf_pdr_loss_acceptance}
-| | ...                                       | ${perf_pdr_loss_acceptance_type}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
+| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
 
 | tc07-78B-2t2c-ethip6-ip6scale2m-ndrdisc
 | | [Documentation]
@@ -221,17 +208,15 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Add Heapsize Config to all DUTs | 3G
-| | And   Apply startup configuration on all VPP DUTs
-| | And   Scale IPv6 forwarding initialized in a 3-node circular topology
-| | ...   | ${rts_per_flow}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Add Heapsize Config to all DUTs | 3G
+| | And Apply startup configuration on all VPP DUTs
+| | And Scale IPv6 forwarding initialized in a 3-node circular topology
+| | ... | ${rts_per_flow}
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max}
-| | ...                                       | 3-node-IPv6-dst-${rts_per_flow}
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc08-78B-2t2c-ethip6-ip6scale2m-pdrdisc
 | | [Documentation]
@@ -246,19 +231,16 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Add Heapsize Config to all DUTs | 3G
-| | And   Apply startup configuration on all VPP DUTs
-| | And   Scale IPv6 forwarding initialized in a 3-node circular topology
-| | ...   | ${rts_per_flow}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Add Heapsize Config to all DUTs | 3G
+| | And Apply startup configuration on all VPP DUTs
+| | And Scale IPv6 forwarding initialized in a 3-node circular topology
+| | ... | ${rts_per_flow}
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max}
-| | ...                                       | 3-node-IPv6-dst-${rts_per_flow}
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
-| | ...                                       | ${perf_pdr_loss_acceptance}
-| | ...                                       | ${perf_pdr_loss_acceptance_type}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
+| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
 
 | tc09-1518B-2t2c-ethip6-ip6scale2m-ndrdisc
 | | [Documentation]
@@ -273,17 +255,15 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Add Heapsize Config to all DUTs | 3G
-| | And   Apply startup configuration on all VPP DUTs
-| | And   Scale IPv6 forwarding initialized in a 3-node circular topology
-| | ...   | ${rts_per_flow}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Add Heapsize Config to all DUTs | 3G
+| | And Apply startup configuration on all VPP DUTs
+| | And Scale IPv6 forwarding initialized in a 3-node circular topology
+| | ... | ${rts_per_flow}
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max}
-| | ...                                       | 3-node-IPv6-dst-${rts_per_flow}
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc10-1518B-2t2c-ethip6-ip6scale2m-pdrdisc
 | | [Documentation]
@@ -298,19 +278,16 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Add Heapsize Config to all DUTs | 3G
-| | And   Apply startup configuration on all VPP DUTs
-| | And   Scale IPv6 forwarding initialized in a 3-node circular topology
-| | ...   | ${rts_per_flow}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Add Heapsize Config to all DUTs | 3G
+| | And Apply startup configuration on all VPP DUTs
+| | And Scale IPv6 forwarding initialized in a 3-node circular topology
+| | ... | ${rts_per_flow}
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max}
-| | ...                                       | 3-node-IPv6-dst-${rts_per_flow}
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
-| | ...                                       | ${perf_pdr_loss_acceptance}
-| | ...                                       | ${perf_pdr_loss_acceptance_type}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
+| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
 
 | tc11-9000B-2t2c-ethip6-ip6scale2m-ndrdisc
 | | [Documentation]
@@ -325,16 +302,14 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add Heapsize Config to all DUTs | 3G
-| | And   Apply startup configuration on all VPP DUTs
-| | And   Scale IPv6 forwarding initialized in a 3-node circular topology
-| | ...   | ${rts_per_flow}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add Heapsize Config to all DUTs | 3G
+| | And Apply startup configuration on all VPP DUTs
+| | And Scale IPv6 forwarding initialized in a 3-node circular topology
+| | ... | ${rts_per_flow}
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max}
-| | ...                                       | 3-node-IPv6-dst-${rts_per_flow}
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc12-9000B-2t2c-ethip6-ip6scale2m-pdrdisc
 | | [Documentation]
@@ -349,18 +324,15 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add Heapsize Config to all DUTs | 3G
-| | And   Apply startup configuration on all VPP DUTs
-| | And   Scale IPv6 forwarding initialized in a 3-node circular topology
-| | ...   | ${rts_per_flow}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add Heapsize Config to all DUTs | 3G
+| | And Apply startup configuration on all VPP DUTs
+| | And Scale IPv6 forwarding initialized in a 3-node circular topology
+| | ... | ${rts_per_flow}
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max}
-| | ...                                       | 3-node-IPv6-dst-${rts_per_flow}
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
-| | ...                                       | ${perf_pdr_loss_acceptance}
-| | ...                                       | ${perf_pdr_loss_acceptance_type}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
+| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
 
 | tc13-78B-4t4c-ethip6-ip6scale2m-ndrdisc
 | | [Documentation]
@@ -375,17 +347,15 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Add Heapsize Config to all DUTs | 3G
-| | And   Apply startup configuration on all VPP DUTs
-| | And   Scale IPv6 forwarding initialized in a 3-node circular topology
-| | ...   | ${rts_per_flow}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Add Heapsize Config to all DUTs | 3G
+| | And Apply startup configuration on all VPP DUTs
+| | And Scale IPv6 forwarding initialized in a 3-node circular topology
+| | ... | ${rts_per_flow}
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max}
-| | ...                                       | 3-node-IPv6-dst-${rts_per_flow}
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc14-78B-4t4c-ethip6-ip6scale2m-pdrdisc
 | | [Documentation]
@@ -400,19 +370,16 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Add Heapsize Config to all DUTs | 3G
-| | And   Apply startup configuration on all VPP DUTs
-| | And   Scale IPv6 forwarding initialized in a 3-node circular topology
-| | ...   | ${rts_per_flow}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Add Heapsize Config to all DUTs | 3G
+| | And Apply startup configuration on all VPP DUTs
+| | And Scale IPv6 forwarding initialized in a 3-node circular topology
+| | ... | ${rts_per_flow}
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max}
-| | ...                                       | 3-node-IPv6-dst-${rts_per_flow}
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
-| | ...                                       | ${perf_pdr_loss_acceptance}
-| | ...                                       | ${perf_pdr_loss_acceptance_type}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
+| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
 
 | tc15-1518B-4t4c-ethip6-ip6scale2m-ndrdisc
 | | [Documentation]
@@ -427,17 +394,15 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Add Heapsize Config to all DUTs | 3G
-| | And   Apply startup configuration on all VPP DUTs
-| | And   Scale IPv6 forwarding initialized in a 3-node circular topology
-| | ...   | ${rts_per_flow}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Add Heapsize Config to all DUTs | 3G
+| | And Apply startup configuration on all VPP DUTs
+| | And Scale IPv6 forwarding initialized in a 3-node circular topology
+| | ... | ${rts_per_flow}
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max}
-| | ...                                       | 3-node-IPv6-dst-${rts_per_flow}
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc16-1518B-4t4c-ethip6-ip6scale2m-pdrdisc
 | | [Documentation]
@@ -452,19 +417,16 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Add Heapsize Config to all DUTs | 3G
-| | And   Apply startup configuration on all VPP DUTs
-| | And   Scale IPv6 forwarding initialized in a 3-node circular topology
-| | ...   | ${rts_per_flow}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Add Heapsize Config to all DUTs | 3G
+| | And Apply startup configuration on all VPP DUTs
+| | And Scale IPv6 forwarding initialized in a 3-node circular topology
+| | ... | ${rts_per_flow}
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max}
-| | ...                                       | 3-node-IPv6-dst-${rts_per_flow}
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
-| | ...                                       | ${perf_pdr_loss_acceptance}
-| | ...                                       | ${perf_pdr_loss_acceptance_type}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
+| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
 
 | tc17-9000B-4t4c-ethip6-ip6scale2m-ndrdisc
 | | [Documentation]
@@ -479,16 +441,14 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add Heapsize Config to all DUTs | 3G
-| | And   Apply startup configuration on all VPP DUTs
-| | And   Scale IPv6 forwarding initialized in a 3-node circular topology
-| | ...   | ${rts_per_flow}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add Heapsize Config to all DUTs | 3G
+| | And Apply startup configuration on all VPP DUTs
+| | And Scale IPv6 forwarding initialized in a 3-node circular topology
+| | ... | ${rts_per_flow}
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max}
-| | ...                                       | 3-node-IPv6-dst-${rts_per_flow}
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc18-9000B-4t4c-ethip6-ip6scale2m-pdrdisc
 | | [Documentation]
@@ -503,15 +463,12 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add Heapsize Config to all DUTs | 3G
-| | And   Apply startup configuration on all VPP DUTs
-| | And   Scale IPv6 forwarding initialized in a 3-node circular topology
-| | ...   | ${rts_per_flow}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add Heapsize Config to all DUTs | 3G
+| | And Apply startup configuration on all VPP DUTs
+| | And Scale IPv6 forwarding initialized in a 3-node circular topology
+| | ... | ${rts_per_flow}
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max}
-| | ...                                       | 3-node-IPv6-dst-${rts_per_flow}
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
-| | ...                                       | ${perf_pdr_loss_acceptance}
-| | ...                                       | ${perf_pdr_loss_acceptance_type}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
+| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
diff --git a/tests/perf/10ge2p1x520-ethip6lispip4-ip6base-ndrchk.robot b/tests/perf/10ge2p1x520-ethip6lispip4-ip6base-ndrchk.robot
index 831ad3957a..68ff8e3743 100644
--- a/tests/perf/10ge2p1x520-ethip6lispip4-ip6base-ndrchk.robot
+++ b/tests/perf/10ge2p1x520-ethip6lispip4-ip6base-ndrchk.robot
@@ -47,6 +47,10 @@
 | ... | IP protocol=61 and generated payload.
 | ... | *[Ref] Applicable standard specifications:* RFC2544.
 
+*** Variables ***
+# Traffic profile:
+| ${traffic_profile} | trex-sl-3n-ethip6-ip6src253
+
 *** Test Cases ***
 | tc01-78B-1t1c-ethip6lispip4-ip6base-ndrchk
 | | [Documentation]
@@ -70,7 +74,7 @@
 | | ... | ${duts_locator_set} | ${dut1_ip6o4_eid} | ${dut2_ip6o4_eid}
 | | ... | ${dut1_ip6o4_static_adjacency} | ${dut2_ip6o4_static_adjacency}
 | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv6
+| | ... | ${framesize} | ${traffic_profile}
 
 | tc02-1460B-1t1c-ethip6lispip4-ip6base-ndrchk
 | | [Documentation]
@@ -94,7 +98,7 @@
 | | ... | ${duts_locator_set} | ${dut1_ip6o4_eid} | ${dut2_ip6o4_eid}
 | | ... | ${dut1_ip6o4_static_adjacency} | ${dut2_ip6o4_static_adjacency}
 | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv6
+| | ... | ${framesize} | ${traffic_profile}
 
 | tc03-9000B-1t1c-ethip6lispip4-ip6base-ndrchk
 | | [Documentation]
@@ -117,7 +121,7 @@
 | | ... | ${duts_locator_set} | ${dut1_ip6o4_eid} | ${dut2_ip6o4_eid}
 | | ... | ${dut1_ip6o4_static_adjacency} | ${dut2_ip6o4_static_adjacency}
 | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv6
+| | ... | ${framesize} | ${traffic_profile}
 
 | tc04-78B-2t2c-ethip6lispip4-ip6base-ndrchk
 | | [Documentation]
@@ -141,7 +145,7 @@
 | | ... | ${duts_locator_set} | ${dut1_ip6o4_eid} | ${dut2_ip6o4_eid}
 | | ... | ${dut1_ip6o4_static_adjacency} | ${dut2_ip6o4_static_adjacency}
 | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv6
+| | ... | ${framesize} | ${traffic_profile}
 
 | tc05-1460B-2t2c-ethip6lispip4-ip6base-ndrchk
 | | [Documentation]
@@ -165,7 +169,7 @@
 | | ... | ${duts_locator_set} | ${dut1_ip6o4_eid} | ${dut2_ip6o4_eid}
 | | ... | ${dut1_ip6o4_static_adjacency} | ${dut2_ip6o4_static_adjacency}
 | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv6
+| | ... | ${framesize} | ${traffic_profile}
 
 | tc06-9000B-2t2c-ethip6lispip4-ip6base-ndrchk
 | | [Documentation]
@@ -188,7 +192,7 @@
 | | ... | ${duts_locator_set} | ${dut1_ip6o4_eid} | ${dut2_ip6o4_eid}
 | | ... | ${dut1_ip6o4_static_adjacency} | ${dut2_ip6o4_static_adjacency}
 | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv6
+| | ... | ${framesize} | ${traffic_profile}
 
 | tc07-78B-4t4c-ethip6lispip4-ip6base-ndrchk
 | | [Documentation]
@@ -212,7 +216,7 @@
 | | ... | ${duts_locator_set} | ${dut1_ip6o4_eid} | ${dut2_ip6o4_eid}
 | | ... | ${dut1_ip6o4_static_adjacency} | ${dut2_ip6o4_static_adjacency}
 | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv6
+| | ... | ${framesize} | ${traffic_profile}
 
 | tc08-1460B-4t4c-ethip6lispip4-ip6base-ndrchk
 | | [Documentation]
@@ -236,7 +240,7 @@
 | | ... | ${duts_locator_set} | ${dut1_ip6o4_eid} | ${dut2_ip6o4_eid}
 | | ... | ${dut1_ip6o4_static_adjacency} | ${dut2_ip6o4_static_adjacency}
 | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv6
+| | ... | ${framesize} | ${traffic_profile}
 
 | tc09-9000B-4t4c-ethip6lispip4-ip6base-ndrchk
 | | [Documentation]
@@ -259,4 +263,4 @@
 | | ... | ${duts_locator_set} | ${dut1_ip6o4_eid} | ${dut2_ip6o4_eid}
 | | ... | ${dut1_ip6o4_static_adjacency} | ${dut2_ip6o4_static_adjacency}
 | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv6
+| | ... | ${framesize} | ${traffic_profile}
diff --git a/tests/perf/10ge2p1x520-ethip6lispip4-ip6base-ndrpdrdisc.robot b/tests/perf/10ge2p1x520-ethip6lispip4-ip6base-ndrpdrdisc.robot
index 8825c3d52a..ad13636d8f 100644
--- a/tests/perf/10ge2p1x520-ethip6lispip4-ip6base-ndrpdrdisc.robot
+++ b/tests/perf/10ge2p1x520-ethip6lispip4-ip6base-ndrpdrdisc.robot
@@ -25,7 +25,7 @@
 | ...
 | Test Setup | Performance test setup
 | Test Teardown | Performance test teardown | ${min_rate}pps | ${framesize}
-| ... | 3-node-IPv6
+| ... | ${traffic_profile}
 | ...
 | Documentation | *RFC6830: Pkt throughput Lisp test cases*
 | ...
@@ -47,6 +47,8 @@
 *** Variables ***
 # X520-DA2 bandwidth limit
 | ${s_limit} | ${10000000000}
+# Traffic profile:
+| ${traffic_profile} | trex-sl-3n-ethip6-ip6src253
 
 *** Test Cases ***
 | tc01-78B-1t1c-ethip6lispip4-ip6base-ndrdisc
@@ -64,21 +66,20 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
 | | When Lisp IPv6 over IPv4 forwarding initialized in a 3-node circular topology
-| | ...  | ${dut1_to_dut2_ip6o4} | ${dut1_to_tg_ip6o4} | ${dut2_to_dut1_ip6o4}
-| | ...  | ${dut2_to_tg_ip6o4} | ${tg_prefix6o4} | ${dut_prefix6o4}
-| | And  Set up Lisp topology
-| | ...  | ${dut1} | ${dut1_if2} | ${NONE}
-| | ...  | ${dut2} | ${dut2_if1} | ${NONE}
-| | ...  | ${duts_locator_set} | ${dut1_ip6o4_eid} | ${dut2_ip6o4_eid}
-| | ...  | ${dut1_ip6o4_static_adjacency} | ${dut2_ip6o4_static_adjacency}
+| | ... | ${dut1_to_dut2_ip6o4} | ${dut1_to_tg_ip6o4} | ${dut2_to_dut1_ip6o4}
+| | ... | ${dut2_to_tg_ip6o4} | ${tg_prefix6o4} | ${dut_prefix6o4}
+| | And Set up Lisp topology
+| | ... | ${dut1} | ${dut1_if2} | ${NONE}
+| | ... | ${dut2} | ${dut2_if1} | ${NONE}
+| | ... | ${duts_locator_set} | ${dut1_ip6o4_eid} | ${dut2_ip6o4_eid}
+| | ... | ${dut1_ip6o4_static_adjacency} | ${dut2_ip6o4_static_adjacency}
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-IPv6
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc02-78B-1t1c-ethip6lispip4-ip6base-pdrdisc
 | | [Documentation]
@@ -95,23 +96,21 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
 | | When Lisp IPv6 over IPv4 forwarding initialized in a 3-node circular topology
-| | ...  | ${dut1_to_dut2_ip6o4} | ${dut1_to_tg_ip6o4} | ${dut2_to_dut1_ip6o4}
-| | ...  | ${dut2_to_tg_ip6o4} | ${tg_prefix6o4} | ${dut_prefix6o4}
-| | And  Set up Lisp topology
-| | ...  | ${dut1} | ${dut1_if2} | ${NONE}
-| | ...  | ${dut2} | ${dut2_if1} | ${NONE}
-| | ...  | ${duts_locator_set} | ${dut1_ip6o4_eid} | ${dut2_ip6o4_eid}
-| | ...  | ${dut1_ip6o4_static_adjacency} | ${dut2_ip6o4_static_adjacency}
+| | ... | ${dut1_to_dut2_ip6o4} | ${dut1_to_tg_ip6o4} | ${dut2_to_dut1_ip6o4}
+| | ... | ${dut2_to_tg_ip6o4} | ${tg_prefix6o4} | ${dut_prefix6o4}
+| | And Set up Lisp topology
+| | ... | ${dut1} | ${dut1_if2} | ${NONE}
+| | ... | ${dut2} | ${dut2_if1} | ${NONE}
+| | ... | ${duts_locator_set} | ${dut1_ip6o4_eid} | ${dut2_ip6o4_eid}
+| | ... | ${dut1_ip6o4_static_adjacency} | ${dut2_ip6o4_static_adjacency}
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-IPv6
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
-| | ...                                       | ${perf_pdr_loss_acceptance}
-| | ...                                       | ${perf_pdr_loss_acceptance_type}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
+| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
 
 | tc03-1460B-1t1c-ethip6lispip4-ip6base-ndrdisc
 | | [Documentation]
@@ -128,21 +127,20 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
 | | When Lisp IPv6 over IPv4 forwarding initialized in a 3-node circular topology
-| | ...  | ${dut1_to_dut2_ip6o4} | ${dut1_to_tg_ip6o4} | ${dut2_to_dut1_ip6o4}
-| | ...  | ${dut2_to_tg_ip6o4} | ${tg_prefix6o4} | ${dut_prefix6o4}
-| | And  Set up Lisp topology
-| | ...  | ${dut1} | ${dut1_if2} | ${NONE}
-| | ...  | ${dut2} | ${dut2_if1} | ${NONE}
-| | ...  | ${duts_locator_set} | ${dut1_ip6o4_eid} | ${dut2_ip6o4_eid}
-| | ...  | ${dut1_ip6o4_static_adjacency} | ${dut2_ip6o4_static_adjacency}
+| | ... | ${dut1_to_dut2_ip6o4} | ${dut1_to_tg_ip6o4} | ${dut2_to_dut1_ip6o4}
+| | ... | ${dut2_to_tg_ip6o4} | ${tg_prefix6o4} | ${dut_prefix6o4}
+| | And Set up Lisp topology
+| | ... | ${dut1} | ${dut1_if2} | ${NONE}
+| | ... | ${dut2} | ${dut2_if1} | ${NONE}
+| | ... | ${duts_locator_set} | ${dut1_ip6o4_eid} | ${dut2_ip6o4_eid}
+| | ... | ${dut1_ip6o4_static_adjacency} | ${dut2_ip6o4_static_adjacency}
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-IPv6
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc04-1460B-1t1c-ethip6lispip4-ip6base-pdrdisc
 | | [Documentation]
@@ -159,23 +157,21 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
 | | When Lisp IPv6 over IPv4 forwarding initialized in a 3-node circular topology
-| | ...  | ${dut1_to_dut2_ip6o4} | ${dut1_to_tg_ip6o4} | ${dut2_to_dut1_ip6o4}
-| | ...  | ${dut2_to_tg_ip6o4} | ${tg_prefix6o4} | ${dut_prefix6o4}
-| | And  Set up Lisp topology
-| | ...  | ${dut1} | ${dut1_if2} | ${NONE}
-| | ...  | ${dut2} | ${dut2_if1} | ${NONE}
-| | ...  | ${duts_locator_set} | ${dut1_ip6o4_eid} | ${dut2_ip6o4_eid}
-| | ...  | ${dut1_ip6o4_static_adjacency} | ${dut2_ip6o4_static_adjacency}
+| | ... | ${dut1_to_dut2_ip6o4} | ${dut1_to_tg_ip6o4} | ${dut2_to_dut1_ip6o4}
+| | ... | ${dut2_to_tg_ip6o4} | ${tg_prefix6o4} | ${dut_prefix6o4}
+| | And Set up Lisp topology
+| | ... | ${dut1} | ${dut1_if2} | ${NONE}
+| | ... | ${dut2} | ${dut2_if1} | ${NONE}
+| | ... | ${duts_locator_set} | ${dut1_ip6o4_eid} | ${dut2_ip6o4_eid}
+| | ... | ${dut1_ip6o4_static_adjacency} | ${dut2_ip6o4_static_adjacency}
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-IPv6
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
-| | ...                                       | ${perf_pdr_loss_acceptance}
-| | ...                                       | ${perf_pdr_loss_acceptance_type}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
+| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
 
 | tc05-9000B-1t1c-ethip6lispip4-ip6base-ndrdisc
 | | [Documentation]
@@ -192,20 +188,19 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Apply startup configuration on all VPP DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Apply startup configuration on all VPP DUTs
 | | When Lisp IPv6 over IPv4 forwarding initialized in a 3-node circular topology
-| | ...  | ${dut1_to_dut2_ip6o4} | ${dut1_to_tg_ip6o4} | ${dut2_to_dut1_ip6o4}
-| | ...  | ${dut2_to_tg_ip6o4} | ${tg_prefix6o4} | ${dut_prefix6o4}
-| | And  Set up Lisp topology
-| | ...  | ${dut1} | ${dut1_if2} | ${NONE}
-| | ...  | ${dut2} | ${dut2_if1} | ${NONE}
-| | ...  | ${duts_locator_set} | ${dut1_ip6o4_eid} | ${dut2_ip6o4_eid}
-| | ...  | ${dut1_ip6o4_static_adjacency} | ${dut2_ip6o4_static_adjacency}
+| | ... | ${dut1_to_dut2_ip6o4} | ${dut1_to_tg_ip6o4} | ${dut2_to_dut1_ip6o4}
+| | ... | ${dut2_to_tg_ip6o4} | ${tg_prefix6o4} | ${dut_prefix6o4}
+| | And Set up Lisp topology
+| | ... | ${dut1} | ${dut1_if2} | ${NONE}
+| | ... | ${dut2} | ${dut2_if1} | ${NONE}
+| | ... | ${duts_locator_set} | ${dut1_ip6o4_eid} | ${dut2_ip6o4_eid}
+| | ... | ${dut1_ip6o4_static_adjacency} | ${dut2_ip6o4_static_adjacency}
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-IPv6
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc06-9000B-1t1c-ethip6lispip4-ip6base-pdrdisc
 | | [Documentation]
@@ -222,22 +217,20 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Apply startup configuration on all VPP DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Apply startup configuration on all VPP DUTs
 | | When Lisp IPv6 over IPv4 forwarding initialized in a 3-node circular topology
-| | ...  | ${dut1_to_dut2_ip6o4} | ${dut1_to_tg_ip6o4} | ${dut2_to_dut1_ip6o4}
-| | ...  | ${dut2_to_tg_ip6o4} | ${tg_prefix6o4} | ${dut_prefix6o4}
-| | And  Set up Lisp topology
-| | ...  | ${dut1} | ${dut1_if2} | ${NONE}
-| | ...  | ${dut2} | ${dut2_if1} | ${NONE}
-| | ...  | ${duts_locator_set} | ${dut1_ip6o4_eid} | ${dut2_ip6o4_eid}
-| | ...  | ${dut1_ip6o4_static_adjacency} | ${dut2_ip6o4_static_adjacency}
+| | ... | ${dut1_to_dut2_ip6o4} | ${dut1_to_tg_ip6o4} | ${dut2_to_dut1_ip6o4}
+| | ... | ${dut2_to_tg_ip6o4} | ${tg_prefix6o4} | ${dut_prefix6o4}
+| | And Set up Lisp topology
+| | ... | ${dut1} | ${dut1_if2} | ${NONE}
+| | ... | ${dut2} | ${dut2_if1} | ${NONE}
+| | ... | ${duts_locator_set} | ${dut1_ip6o4_eid} | ${dut2_ip6o4_eid}
+| | ... | ${dut1_ip6o4_static_adjacency} | ${dut2_ip6o4_static_adjacency}
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-IPv6
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
-| | ...                                       | ${perf_pdr_loss_acceptance}
-| | ...                                       | ${perf_pdr_loss_acceptance_type}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
+| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
 
 | tc07-78B-2t2c-ethip6lispip4-ip6base-ndrdisc
 | | [Documentation]
@@ -254,21 +247,20 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
 | | When Lisp IPv6 over IPv4 forwarding initialized in a 3-node circular topology
-| | ...  | ${dut1_to_dut2_ip6o4} | ${dut1_to_tg_ip6o4} | ${dut2_to_dut1_ip6o4}
-| | ...  | ${dut2_to_tg_ip6o4} | ${tg_prefix6o4} | ${dut_prefix6o4}
-| | And  Set up Lisp topology
-| | ...  | ${dut1} | ${dut1_if2} | ${NONE}
-| | ...  | ${dut2} | ${dut2_if1} | ${NONE}
-| | ...  | ${duts_locator_set} | ${dut1_ip6o4_eid} | ${dut2_ip6o4_eid}
-| | ...  | ${dut1_ip6o4_static_adjacency} | ${dut2_ip6o4_static_adjacency}
+| | ... | ${dut1_to_dut2_ip6o4} | ${dut1_to_tg_ip6o4} | ${dut2_to_dut1_ip6o4}
+| | ... | ${dut2_to_tg_ip6o4} | ${tg_prefix6o4} | ${dut_prefix6o4}
+| | And Set up Lisp topology
+| | ... | ${dut1} | ${dut1_if2} | ${NONE}
+| | ... | ${dut2} | ${dut2_if1} | ${NONE}
+| | ... | ${duts_locator_set} | ${dut1_ip6o4_eid} | ${dut2_ip6o4_eid}
+| | ... | ${dut1_ip6o4_static_adjacency} | ${dut2_ip6o4_static_adjacency}
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-IPv6
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc08-78B-2t2c-ethip6lispip4-ip6base-pdrdisc
 | | [Documentation]
@@ -285,23 +277,21 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
 | | When Lisp IPv6 over IPv4 forwarding initialized in a 3-node circular topology
-| | ...  | ${dut1_to_dut2_ip6o4} | ${dut1_to_tg_ip6o4} | ${dut2_to_dut1_ip6o4}
-| | ...  | ${dut2_to_tg_ip6o4} | ${tg_prefix6o4} | ${dut_prefix6o4}
-| | And  Set up Lisp topology
-| | ...  | ${dut1} | ${dut1_if2} | ${NONE}
-| | ...  | ${dut2} | ${dut2_if1} | ${NONE}
-| | ...  | ${duts_locator_set} | ${dut1_ip6o4_eid} | ${dut2_ip6o4_eid}
-| | ...  | ${dut1_ip6o4_static_adjacency} | ${dut2_ip6o4_static_adjacency}
+| | ... | ${dut1_to_dut2_ip6o4} | ${dut1_to_tg_ip6o4} | ${dut2_to_dut1_ip6o4}
+| | ... | ${dut2_to_tg_ip6o4} | ${tg_prefix6o4} | ${dut_prefix6o4}
+| | And Set up Lisp topology
+| | ... | ${dut1} | ${dut1_if2} | ${NONE}
+| | ... | ${dut2} | ${dut2_if1} | ${NONE}
+| | ... | ${duts_locator_set} | ${dut1_ip6o4_eid} | ${dut2_ip6o4_eid}
+| | ... | ${dut1_ip6o4_static_adjacency} | ${dut2_ip6o4_static_adjacency}
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-IPv6
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
-| | ...                                       | ${perf_pdr_loss_acceptance}
-| | ...                                       | ${perf_pdr_loss_acceptance_type}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
+| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
 
 | tc09-1460B-2t2c-ethip6lispip4-ip6base-ndrdisc
 | | [Documentation]
@@ -318,21 +308,20 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
 | | When Lisp IPv6 over IPv4 forwarding initialized in a 3-node circular topology
-| | ...  | ${dut1_to_dut2_ip6o4} | ${dut1_to_tg_ip6o4} | ${dut2_to_dut1_ip6o4}
-| | ...  | ${dut2_to_tg_ip6o4} | ${tg_prefix6o4} | ${dut_prefix6o4}
-| | And  Set up Lisp topology
-| | ...  | ${dut1} | ${dut1_if2} | ${NONE}
-| | ...  | ${dut2} | ${dut2_if1} | ${NONE}
-| | ...  | ${duts_locator_set} | ${dut1_ip6o4_eid} | ${dut2_ip6o4_eid}
-| | ...  | ${dut1_ip6o4_static_adjacency} | ${dut2_ip6o4_static_adjacency}
+| | ... | ${dut1_to_dut2_ip6o4} | ${dut1_to_tg_ip6o4} | ${dut2_to_dut1_ip6o4}
+| | ... | ${dut2_to_tg_ip6o4} | ${tg_prefix6o4} | ${dut_prefix6o4}
+| | And Set up Lisp topology
+| | ... | ${dut1} | ${dut1_if2} | ${NONE}
+| | ... | ${dut2} | ${dut2_if1} | ${NONE}
+| | ... | ${duts_locator_set} | ${dut1_ip6o4_eid} | ${dut2_ip6o4_eid}
+| | ... | ${dut1_ip6o4_static_adjacency} | ${dut2_ip6o4_static_adjacency}
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-IPv6
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc10-1460B-2t2c-ethip6lispip4-ip6base-pdrdisc
 | | [Documentation]
@@ -349,23 +338,21 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
 | | When Lisp IPv6 over IPv4 forwarding initialized in a 3-node circular topology
-| | ...  | ${dut1_to_dut2_ip6o4} | ${dut1_to_tg_ip6o4} | ${dut2_to_dut1_ip6o4}
-| | ...  | ${dut2_to_tg_ip6o4} | ${tg_prefix6o4} | ${dut_prefix6o4}
-| | And  Set up Lisp topology
-| | ...  | ${dut1} | ${dut1_if2} | ${NONE}
-| | ...  | ${dut2} | ${dut2_if1} | ${NONE}
-| | ...  | ${duts_locator_set} | ${dut1_ip6o4_eid} | ${dut2_ip6o4_eid}
-| | ...  | ${dut1_ip6o4_static_adjacency} | ${dut2_ip6o4_static_adjacency}
+| | ... | ${dut1_to_dut2_ip6o4} | ${dut1_to_tg_ip6o4} | ${dut2_to_dut1_ip6o4}
+| | ... | ${dut2_to_tg_ip6o4} | ${tg_prefix6o4} | ${dut_prefix6o4}
+| | And Set up Lisp topology
+| | ... | ${dut1} | ${dut1_if2} | ${NONE}
+| | ... | ${dut2} | ${dut2_if1} | ${NONE}
+| | ... | ${duts_locator_set} | ${dut1_ip6o4_eid} | ${dut2_ip6o4_eid}
+| | ... | ${dut1_ip6o4_static_adjacency} | ${dut2_ip6o4_static_adjacency}
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-IPv6
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
-| | ...                                       | ${perf_pdr_loss_acceptance}
-| | ...                                       | ${perf_pdr_loss_acceptance_type}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
+| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
 
 | tc11-9000B-2t2c-ethip6lispip4-ip6base-ndrdisc
 | | [Documentation]
@@ -382,20 +369,19 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Apply startup configuration on all VPP DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Apply startup configuration on all VPP DUTs
 | | When Lisp IPv6 over IPv4 forwarding initialized in a 3-node circular topology
-| | ...  | ${dut1_to_dut2_ip6o4} | ${dut1_to_tg_ip6o4} | ${dut2_to_dut1_ip6o4}
-| | ...  | ${dut2_to_tg_ip6o4} | ${tg_prefix6o4} | ${dut_prefix6o4}
-| | And  Set up Lisp topology
-| | ...  | ${dut1} | ${dut1_if2} | ${NONE}
-| | ...  | ${dut2} | ${dut2_if1} | ${NONE}
-| | ...  | ${duts_locator_set} | ${dut1_ip6o4_eid} | ${dut2_ip6o4_eid}
-| | ...  | ${dut1_ip6o4_static_adjacency} | ${dut2_ip6o4_static_adjacency}
+| | ... | ${dut1_to_dut2_ip6o4} | ${dut1_to_tg_ip6o4} | ${dut2_to_dut1_ip6o4}
+| | ... | ${dut2_to_tg_ip6o4} | ${tg_prefix6o4} | ${dut_prefix6o4}
+| | And Set up Lisp topology
+| | ... | ${dut1} | ${dut1_if2} | ${NONE}
+| | ... | ${dut2} | ${dut2_if1} | ${NONE}
+| | ... | ${duts_locator_set} | ${dut1_ip6o4_eid} | ${dut2_ip6o4_eid}
+| | ... | ${dut1_ip6o4_static_adjacency} | ${dut2_ip6o4_static_adjacency}
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-IPv6
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc12-9000B-2t2c-ethip6lispip4-ip6base-pdrdisc
 | | [Documentation]
@@ -412,22 +398,20 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Apply startup configuration on all VPP DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Apply startup configuration on all VPP DUTs
 | | When Lisp IPv6 over IPv4 forwarding initialized in a 3-node circular topology
-| | ...  | ${dut1_to_dut2_ip6o4} | ${dut1_to_tg_ip6o4} | ${dut2_to_dut1_ip6o4}
-| | ...  | ${dut2_to_tg_ip6o4} | ${tg_prefix6o4} | ${dut_prefix6o4}
-| | And  Set up Lisp topology
-| | ...  | ${dut1} | ${dut1_if2} | ${NONE}
-| | ...  | ${dut2} | ${dut2_if1} | ${NONE}
-| | ...  | ${duts_locator_set} | ${dut1_ip6o4_eid} | ${dut2_ip6o4_eid}
-| | ...  | ${dut1_ip6o4_static_adjacency} | ${dut2_ip6o4_static_adjacency}
+| | ... | ${dut1_to_dut2_ip6o4} | ${dut1_to_tg_ip6o4} | ${dut2_to_dut1_ip6o4}
+| | ... | ${dut2_to_tg_ip6o4} | ${tg_prefix6o4} | ${dut_prefix6o4}
+| | And Set up Lisp topology
+| | ... | ${dut1} | ${dut1_if2} | ${NONE}
+| | ... | ${dut2} | ${dut2_if1} | ${NONE}
+| | ... | ${duts_locator_set} | ${dut1_ip6o4_eid} | ${dut2_ip6o4_eid}
+| | ... | ${dut1_ip6o4_static_adjacency} | ${dut2_ip6o4_static_adjacency}
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-IPv6
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
-| | ...                                       | ${perf_pdr_loss_acceptance}
-| | ...                                       | ${perf_pdr_loss_acceptance_type}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
+| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
 
 | tc13-78B-4t4c-ethip6lispip4-ip6base-ndrdisc
 | | [Documentation]
@@ -444,21 +428,20 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
 | | When Lisp IPv6 over IPv4 forwarding initialized in a 3-node circular topology
-| | ...  | ${dut1_to_dut2_ip6o4} | ${dut1_to_tg_ip6o4} | ${dut2_to_dut1_ip6o4}
-| | ...  | ${dut2_to_tg_ip6o4} | ${tg_prefix6o4} | ${dut_prefix6o4}
-| | And  Set up Lisp topology
-| | ...  | ${dut1} | ${dut1_if2} | ${NONE}
-| | ...  | ${dut2} | ${dut2_if1} | ${NONE}
-| | ...  | ${duts_locator_set} | ${dut1_ip6o4_eid} | ${dut2_ip6o4_eid}
-| | ...  | ${dut1_ip6o4_static_adjacency} | ${dut2_ip6o4_static_adjacency}
+| | ... | ${dut1_to_dut2_ip6o4} | ${dut1_to_tg_ip6o4} | ${dut2_to_dut1_ip6o4}
+| | ... | ${dut2_to_tg_ip6o4} | ${tg_prefix6o4} | ${dut_prefix6o4}
+| | And Set up Lisp topology
+| | ... | ${dut1} | ${dut1_if2} | ${NONE}
+| | ... | ${dut2} | ${dut2_if1} | ${NONE}
+| | ... | ${duts_locator_set} | ${dut1_ip6o4_eid} | ${dut2_ip6o4_eid}
+| | ... | ${dut1_ip6o4_static_adjacency} | ${dut2_ip6o4_static_adjacency}
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-IPv6
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc14-78B-4t4c-ethip6lispip4-ip6base-pdrdisc
 | | [Documentation]
@@ -475,23 +458,21 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
 | | When Lisp IPv6 over IPv4 forwarding initialized in a 3-node circular topology
-| | ...  | ${dut1_to_dut2_ip6o4} | ${dut1_to_tg_ip6o4} | ${dut2_to_dut1_ip6o4}
-| | ...  | ${dut2_to_tg_ip6o4} | ${tg_prefix6o4} | ${dut_prefix6o4}
-| | And  Set up Lisp topology
-| | ...  | ${dut1} | ${dut1_if2} | ${NONE}
-| | ...  | ${dut2} | ${dut2_if1} | ${NONE}
-| | ...  | ${duts_locator_set} | ${dut1_ip6o4_eid} | ${dut2_ip6o4_eid}
-| | ...  | ${dut1_ip6o4_static_adjacency} | ${dut2_ip6o4_static_adjacency}
+| | ... | ${dut1_to_dut2_ip6o4} | ${dut1_to_tg_ip6o4} | ${dut2_to_dut1_ip6o4}
+| | ... | ${dut2_to_tg_ip6o4} | ${tg_prefix6o4} | ${dut_prefix6o4}
+| | And Set up Lisp topology
+| | ... | ${dut1} | ${dut1_if2} | ${NONE}
+| | ... | ${dut2} | ${dut2_if1} | ${NONE}
+| | ... | ${duts_locator_set} | ${dut1_ip6o4_eid} | ${dut2_ip6o4_eid}
+| | ... | ${dut1_ip6o4_static_adjacency} | ${dut2_ip6o4_static_adjacency}
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-IPv6
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
-| | ...                                       | ${perf_pdr_loss_acceptance}
-| | ...                                       | ${perf_pdr_loss_acceptance_type}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
+| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
 
 | tc15-1460B-4t4c-ethip6lispip4-ip6base-ndrdisc
 | | [Documentation]
@@ -508,21 +489,20 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
 | | When Lisp IPv6 over IPv4 forwarding initialized in a 3-node circular topology
-| | ...  | ${dut1_to_dut2_ip6o4} | ${dut1_to_tg_ip6o4} | ${dut2_to_dut1_ip6o4}
-| | ...  | ${dut2_to_tg_ip6o4} | ${tg_prefix6o4} | ${dut_prefix6o4}
-| | And  Set up Lisp topology
-| | ...  | ${dut1} | ${dut1_if2} | ${NONE}
-| | ...  | ${dut2} | ${dut2_if1} | ${NONE}
-| | ...  | ${duts_locator_set} | ${dut1_ip6o4_eid} | ${dut2_ip6o4_eid}
-| | ...  | ${dut1_ip6o4_static_adjacency} | ${dut2_ip6o4_static_adjacency}
+| | ... | ${dut1_to_dut2_ip6o4} | ${dut1_to_tg_ip6o4} | ${dut2_to_dut1_ip6o4}
+| | ... | ${dut2_to_tg_ip6o4} | ${tg_prefix6o4} | ${dut_prefix6o4}
+| | And Set up Lisp topology
+| | ... | ${dut1} | ${dut1_if2} | ${NONE}
+| | ... | ${dut2} | ${dut2_if1} | ${NONE}
+| | ... | ${duts_locator_set} | ${dut1_ip6o4_eid} | ${dut2_ip6o4_eid}
+| | ... | ${dut1_ip6o4_static_adjacency} | ${dut2_ip6o4_static_adjacency}
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-IPv6
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc16-1460B-4t4c-ethip6lispip4-ip6base-pdrdisc
 | | [Documentation]
@@ -539,23 +519,21 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
 | | When Lisp IPv6 over IPv4 forwarding initialized in a 3-node circular topology
-| | ...  | ${dut1_to_dut2_ip6o4} | ${dut1_to_tg_ip6o4} | ${dut2_to_dut1_ip6o4}
-| | ...  | ${dut2_to_tg_ip6o4} | ${tg_prefix6o4} | ${dut_prefix6o4}
-| | And  Set up Lisp topology
-| | ...  | ${dut1} | ${dut1_if2} | ${NONE}
-| | ...  | ${dut2} | ${dut2_if1} | ${NONE}
-| | ...  | ${duts_locator_set} | ${dut1_ip6o4_eid} | ${dut2_ip6o4_eid}
-| | ...  | ${dut1_ip6o4_static_adjacency} | ${dut2_ip6o4_static_adjacency}
+| | ... | ${dut1_to_dut2_ip6o4} | ${dut1_to_tg_ip6o4} | ${dut2_to_dut1_ip6o4}
+| | ... | ${dut2_to_tg_ip6o4} | ${tg_prefix6o4} | ${dut_prefix6o4}
+| | And Set up Lisp topology
+| | ... | ${dut1} | ${dut1_if2} | ${NONE}
+| | ... | ${dut2} | ${dut2_if1} | ${NONE}
+| | ... | ${duts_locator_set} | ${dut1_ip6o4_eid} | ${dut2_ip6o4_eid}
+| | ... | ${dut1_ip6o4_static_adjacency} | ${dut2_ip6o4_static_adjacency}
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-IPv6
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
-| | ...                                       | ${perf_pdr_loss_acceptance}
-| | ...                                       | ${perf_pdr_loss_acceptance_type}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
+| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
 
 | tc17-9000B-4t4c-ethip6lispip4-ip6base-ndrdisc
 | | [Documentation]
@@ -572,20 +550,19 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Apply startup configuration on all VPP DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Apply startup configuration on all VPP DUTs
 | | When Lisp IPv6 over IPv4 forwarding initialized in a 3-node circular topology
-| | ...  | ${dut1_to_dut2_ip6o4} | ${dut1_to_tg_ip6o4} | ${dut2_to_dut1_ip6o4}
-| | ...  | ${dut2_to_tg_ip6o4} | ${tg_prefix6o4} | ${dut_prefix6o4}
-| | And  Set up Lisp topology
-| | ...  | ${dut1} | ${dut1_if2} | ${NONE}
-| | ...  | ${dut2} | ${dut2_if1} | ${NONE}
-| | ...  | ${duts_locator_set} | ${dut1_ip6o4_eid} | ${dut2_ip6o4_eid}
-| | ...  | ${dut1_ip6o4_static_adjacency} | ${dut2_ip6o4_static_adjacency}
+| | ... | ${dut1_to_dut2_ip6o4} | ${dut1_to_tg_ip6o4} | ${dut2_to_dut1_ip6o4}
+| | ... | ${dut2_to_tg_ip6o4} | ${tg_prefix6o4} | ${dut_prefix6o4}
+| | And Set up Lisp topology
+| | ... | ${dut1} | ${dut1_if2} | ${NONE}
+| | ... | ${dut2} | ${dut2_if1} | ${NONE}
+| | ... | ${duts_locator_set} | ${dut1_ip6o4_eid} | ${dut2_ip6o4_eid}
+| | ... | ${dut1_ip6o4_static_adjacency} | ${dut2_ip6o4_static_adjacency}
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-IPv6
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc18-9000B-4t4c-ethip6lispip4-ip6base-pdrdisc
 | | [Documentation]
@@ -602,19 +579,17 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Apply startup configuration on all VPP DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Apply startup configuration on all VPP DUTs
 | | When Lisp IPv6 over IPv4 forwarding initialized in a 3-node circular topology
-| | ...  | ${dut1_to_dut2_ip6o4} | ${dut1_to_tg_ip6o4} | ${dut2_to_dut1_ip6o4}
-| | ...  | ${dut2_to_tg_ip6o4} | ${tg_prefix6o4} | ${dut_prefix6o4}
-| | And  Set up Lisp topology
-| | ...  | ${dut1} | ${dut1_if2} | ${NONE}
-| | ...  | ${dut2} | ${dut2_if1} | ${NONE}
-| | ...  | ${duts_locator_set} | ${dut1_ip6o4_eid} | ${dut2_ip6o4_eid}
-| | ...  | ${dut1_ip6o4_static_adjacency} | ${dut2_ip6o4_static_adjacency}
+| | ... | ${dut1_to_dut2_ip6o4} | ${dut1_to_tg_ip6o4} | ${dut2_to_dut1_ip6o4}
+| | ... | ${dut2_to_tg_ip6o4} | ${tg_prefix6o4} | ${dut_prefix6o4}
+| | And Set up Lisp topology
+| | ... | ${dut1} | ${dut1_if2} | ${NONE}
+| | ... | ${dut2} | ${dut2_if1} | ${NONE}
+| | ... | ${duts_locator_set} | ${dut1_ip6o4_eid} | ${dut2_ip6o4_eid}
+| | ... | ${dut1_ip6o4_static_adjacency} | ${dut2_ip6o4_static_adjacency}
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-IPv6
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
-| | ...                                       | ${perf_pdr_loss_acceptance}
-| | ...                                       | ${perf_pdr_loss_acceptance_type}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
+| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
diff --git a/tests/perf/10ge2p1x520-ethip6lispip6-ip6base-ndrchk.robot b/tests/perf/10ge2p1x520-ethip6lispip6-ip6base-ndrchk.robot
index cb42a63878..798edbca44 100644
--- a/tests/perf/10ge2p1x520-ethip6lispip6-ip6base-ndrchk.robot
+++ b/tests/perf/10ge2p1x520-ethip6lispip6-ip6base-ndrchk.robot
@@ -47,6 +47,10 @@
 | ... | IP protocol=61 and generated payload.
 | ... | *[Ref] Applicable standard specifications:* RFC2544.
 
+*** Variables ***
+# Traffic profile:
+| ${traffic_profile} | trex-sl-3n-ethip6-ip6src253
+
 *** Test Cases ***
 | tc01-78B-1t1c-ethip6lispip6-ip6base-ndrchk
 | | [Documentation]
@@ -70,7 +74,7 @@
 | | ... | ${duts_locator_set} | ${dut1_ip6_eid} | ${dut2_ip6_eid}
 | | ... | ${dut1_ip6_static_adjacency} | ${dut2_ip6_static_adjacency}
 | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv6
+| | ... | ${framesize} | ${traffic_profile}
 
 | tc02-1460B-1t1c-ethip6lispip6-ip6base-ndrchk
 | | [Documentation]
@@ -94,7 +98,7 @@
 | | ... | ${duts_locator_set} | ${dut1_ip6_eid} | ${dut2_ip6_eid}
 | | ... | ${dut1_ip6_static_adjacency} | ${dut2_ip6_static_adjacency}
 | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv6
+| | ... | ${framesize} | ${traffic_profile}
 
 | tc03-9000B-1t1c-ethip6lispip6-ip6base-ndrchk
 | | [Documentation]
@@ -117,7 +121,7 @@
 | | ... | ${duts_locator_set} | ${dut1_ip6_eid} | ${dut2_ip6_eid}
 | | ... | ${dut1_ip6_static_adjacency} | ${dut2_ip6_static_adjacency}
 | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv6
+| | ... | ${framesize} | ${traffic_profile}
 
 | tc04-78B-2t2c-ethip6lispip6-ip6base-ndrchk
 | | [Documentation]
@@ -141,7 +145,7 @@
 | | ... | ${duts_locator_set} | ${dut1_ip6_eid} | ${dut2_ip6_eid}
 | | ... | ${dut1_ip6_static_adjacency} | ${dut2_ip6_static_adjacency}
 | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv6
+| | ... | ${framesize} | ${traffic_profile}
 
 | tc05-1460B-2t2c-ethip6lispip6-ip6base-ndrchk
 | | [Documentation]
@@ -165,7 +169,7 @@
 | | ... | ${duts_locator_set} | ${dut1_ip6_eid} | ${dut2_ip6_eid}
 | | ... | ${dut1_ip6_static_adjacency} | ${dut2_ip6_static_adjacency}
 | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv6
+| | ... | ${framesize} | ${traffic_profile}
 
 | tc06-9000B-2t2c-ethip6lispip6-ip6base-ndrchk
 | | [Documentation]
@@ -188,7 +192,7 @@
 | | ... | ${duts_locator_set} | ${dut1_ip6_eid} | ${dut2_ip6_eid}
 | | ... | ${dut1_ip6_static_adjacency} | ${dut2_ip6_static_adjacency}
 | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv6
+| | ... | ${framesize} | ${traffic_profile}
 
 | tc07-78B-4t4c-ethip6lispip6-ip6base-ndrchk
 | | [Documentation]
@@ -212,7 +216,7 @@
 | | ... | ${duts_locator_set} | ${dut1_ip6_eid} | ${dut2_ip6_eid}
 | | ... | ${dut1_ip6_static_adjacency} | ${dut2_ip6_static_adjacency}
 | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv6
+| | ... | ${framesize} | ${traffic_profile}
 
 | tc08-1460B-4t4c-ethip6lispip6-ip6base-ndrchk
 | | [Documentation]
@@ -236,7 +240,7 @@
 | | ... | ${duts_locator_set} | ${dut1_ip6_eid} | ${dut2_ip6_eid}
 | | ... | ${dut1_ip6_static_adjacency} | ${dut2_ip6_static_adjacency}
 | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv6
+| | ... | ${framesize} | ${traffic_profile}
 
 | tc09-9000B-4t4c-ethip6lispip6-ip6base-ndrchk
 | | [Documentation]
@@ -259,5 +263,4 @@
 | | ... | ${duts_locator_set} | ${dut1_ip6_eid} | ${dut2_ip6_eid}
 | | ... | ${dut1_ip6_static_adjacency} | ${dut2_ip6_static_adjacency}
 | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv6
-
+| | ... | ${framesize} | ${traffic_profile}
diff --git a/tests/perf/10ge2p1x520-ethip6lispip6-ip6base-ndrpdrdisc.robot b/tests/perf/10ge2p1x520-ethip6lispip6-ip6base-ndrpdrdisc.robot
index a22650aae1..ed6e99a8f9 100644
--- a/tests/perf/10ge2p1x520-ethip6lispip6-ip6base-ndrpdrdisc.robot
+++ b/tests/perf/10ge2p1x520-ethip6lispip6-ip6base-ndrpdrdisc.robot
@@ -25,7 +25,7 @@
 | ...
 | Test Setup | Performance test setup
 | Test Teardown | Performance test teardown | ${min_rate}pps | ${framesize}
-| ... | 3-node-IPv6
+| ... | ${traffic_profile}
 | ...
 | Documentation | *RFC6830: Pkt throughput Lisp test cases*
 | ...
@@ -47,6 +47,8 @@
 *** Variables ***
 # X520-DA2 bandwidth limit
 | ${s_limit} | ${10000000000}
+# Traffic profile:
+| ${traffic_profile} | trex-sl-3n-ethip6-ip6src253
 
 *** Test Cases ***
 | tc01-78B-1t1c-ethip6lispip6-ip6base-ndrdisc
@@ -64,21 +66,20 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
 | | When Lisp IPv6 forwarding initialized in a 3-node circular topology
-| | ...  | ${dut1_to_dut2_ip6} | ${dut1_to_tg_ip6} | ${dut2_to_dut1_ip6}
-| | ...  | ${dut2_to_tg_ip6} | ${prefix6}
-| | And  Set up Lisp topology
-| | ...  | ${dut1} | ${dut1_if2} | ${NONE}
-| | ...  | ${dut2} | ${dut2_if1} | ${NONE}
-| | ...  | ${duts_locator_set} | ${dut1_ip6_eid} | ${dut2_ip6_eid}
-| | ...  | ${dut1_ip6_static_adjacency} | ${dut2_ip6_static_adjacency}
+| | ... | ${dut1_to_dut2_ip6} | ${dut1_to_tg_ip6} | ${dut2_to_dut1_ip6}
+| | ... | ${dut2_to_tg_ip6} | ${prefix6}
+| | And Set up Lisp topology
+| | ... | ${dut1} | ${dut1_if2} | ${NONE}
+| | ... | ${dut2} | ${dut2_if1} | ${NONE}
+| | ... | ${duts_locator_set} | ${dut1_ip6_eid} | ${dut2_ip6_eid}
+| | ... | ${dut1_ip6_static_adjacency} | ${dut2_ip6_static_adjacency}
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-IPv6
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc02-78B-1t1c-ethip6lispip6-ip6base-pdrdisc
 | | [Documentation]
@@ -95,23 +96,21 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
 | | When Lisp IPv6 forwarding initialized in a 3-node circular topology
-| | ...  | ${dut1_to_dut2_ip6} | ${dut1_to_tg_ip6} | ${dut2_to_dut1_ip6}
-| | ...  | ${dut2_to_tg_ip6} | ${prefix6}
-| | And  Set up Lisp topology
-| | ...  | ${dut1} | ${dut1_if2} | ${NONE}
-| | ...  | ${dut2} | ${dut2_if1} | ${NONE}
-| | ...  | ${duts_locator_set} | ${dut1_ip6_eid} | ${dut2_ip6_eid}
-| | ...  | ${dut1_ip6_static_adjacency} | ${dut2_ip6_static_adjacency}
+| | ... | ${dut1_to_dut2_ip6} | ${dut1_to_tg_ip6} | ${dut2_to_dut1_ip6}
+| | ... | ${dut2_to_tg_ip6} | ${prefix6}
+| | And Set up Lisp topology
+| | ... | ${dut1} | ${dut1_if2} | ${NONE}
+| | ... | ${dut2} | ${dut2_if1} | ${NONE}
+| | ... | ${duts_locator_set} | ${dut1_ip6_eid} | ${dut2_ip6_eid}
+| | ... | ${dut1_ip6_static_adjacency} | ${dut2_ip6_static_adjacency}
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-IPv6
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
-| | ...                                       | ${perf_pdr_loss_acceptance}
-| | ...                                       | ${perf_pdr_loss_acceptance_type}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
+| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
 
 | tc03-1460B-1t1c-ethip6lispip6-ip6base-ndrdisc
 | | [Documentation]
@@ -128,21 +127,20 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
 | | When Lisp IPv6 forwarding initialized in a 3-node circular topology
-| | ...  | ${dut1_to_dut2_ip6} | ${dut1_to_tg_ip6} | ${dut2_to_dut1_ip6}
-| | ...  | ${dut2_to_tg_ip6} | ${prefix6}
-| | And  Set up Lisp topology
-| | ...  | ${dut1} | ${dut1_if2} | ${NONE}
-| | ...  | ${dut2} | ${dut2_if1} | ${NONE}
-| | ...  | ${duts_locator_set} | ${dut1_ip6_eid} | ${dut2_ip6_eid}
-| | ...  | ${dut1_ip6_static_adjacency} | ${dut2_ip6_static_adjacency}
+| | ... | ${dut1_to_dut2_ip6} | ${dut1_to_tg_ip6} | ${dut2_to_dut1_ip6}
+| | ... | ${dut2_to_tg_ip6} | ${prefix6}
+| | And Set up Lisp topology
+| | ... | ${dut1} | ${dut1_if2} | ${NONE}
+| | ... | ${dut2} | ${dut2_if1} | ${NONE}
+| | ... | ${duts_locator_set} | ${dut1_ip6_eid} | ${dut2_ip6_eid}
+| | ... | ${dut1_ip6_static_adjacency} | ${dut2_ip6_static_adjacency}
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-IPv6
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc04-1460B-1t1c-ethip6lispip6-ip6base-pdrdisc
 | | [Documentation]
@@ -159,23 +157,21 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
 | | When Lisp IPv6 forwarding initialized in a 3-node circular topology
-| | ...  | ${dut1_to_dut2_ip6} | ${dut1_to_tg_ip6} | ${dut2_to_dut1_ip6}
-| | ...  | ${dut2_to_tg_ip6} | ${prefix6}
-| | And  Set up Lisp topology
-| | ...  | ${dut1} | ${dut1_if2} | ${NONE}
-| | ...  | ${dut2} | ${dut2_if1} | ${NONE}
-| | ...  | ${duts_locator_set} | ${dut1_ip6_eid} | ${dut2_ip6_eid}
-| | ...  | ${dut1_ip6_static_adjacency} | ${dut2_ip6_static_adjacency}
+| | ... | ${dut1_to_dut2_ip6} | ${dut1_to_tg_ip6} | ${dut2_to_dut1_ip6}
+| | ... | ${dut2_to_tg_ip6} | ${prefix6}
+| | And Set up Lisp topology
+| | ... | ${dut1} | ${dut1_if2} | ${NONE}
+| | ... | ${dut2} | ${dut2_if1} | ${NONE}
+| | ... | ${duts_locator_set} | ${dut1_ip6_eid} | ${dut2_ip6_eid}
+| | ... | ${dut1_ip6_static_adjacency} | ${dut2_ip6_static_adjacency}
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-IPv6
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
-| | ...                                       | ${perf_pdr_loss_acceptance}
-| | ...                                       | ${perf_pdr_loss_acceptance_type}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
+| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
 
 | tc05-9000B-1t1c-ethip6lispip6-ip6base-ndrdisc
 | | [Documentation]
@@ -192,20 +188,19 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Apply startup configuration on all VPP DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Apply startup configuration on all VPP DUTs
 | | When Lisp IPv6 forwarding initialized in a 3-node circular topology
-| | ...  | ${dut1_to_dut2_ip6} | ${dut1_to_tg_ip6} | ${dut2_to_dut1_ip6}
-| | ...  | ${dut2_to_tg_ip6} | ${prefix6}
-| | And  Set up Lisp topology
-| | ...  | ${dut1} | ${dut1_if2} | ${NONE}
-| | ...  | ${dut2} | ${dut2_if1} | ${NONE}
-| | ...  | ${duts_locator_set} | ${dut1_ip6_eid} | ${dut2_ip6_eid}
-| | ...  | ${dut1_ip6_static_adjacency} | ${dut2_ip6_static_adjacency}
+| | ... | ${dut1_to_dut2_ip6} | ${dut1_to_tg_ip6} | ${dut2_to_dut1_ip6}
+| | ... | ${dut2_to_tg_ip6} | ${prefix6}
+| | And Set up Lisp topology
+| | ... | ${dut1} | ${dut1_if2} | ${NONE}
+| | ... | ${dut2} | ${dut2_if1} | ${NONE}
+| | ... | ${duts_locator_set} | ${dut1_ip6_eid} | ${dut2_ip6_eid}
+| | ... | ${dut1_ip6_static_adjacency} | ${dut2_ip6_static_adjacency}
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-IPv6
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc06-9000B-1t1c-ethip6lispip6-ip6base-pdrdisc
 | | [Documentation]
@@ -222,22 +217,20 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Apply startup configuration on all VPP DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Apply startup configuration on all VPP DUTs
 | | When Lisp IPv6 forwarding initialized in a 3-node circular topology
-| | ...  | ${dut1_to_dut2_ip6} | ${dut1_to_tg_ip6} | ${dut2_to_dut1_ip6}
-| | ...  | ${dut2_to_tg_ip6} | ${prefix6}
-| | And  Set up Lisp topology
-| | ...  | ${dut1} | ${dut1_if2} | ${NONE}
-| | ...  | ${dut2} | ${dut2_if1} | ${NONE}
-| | ...  | ${duts_locator_set} | ${dut1_ip6_eid} | ${dut2_ip6_eid}
-| | ...  | ${dut1_ip6_static_adjacency} | ${dut2_ip6_static_adjacency}
+| | ... | ${dut1_to_dut2_ip6} | ${dut1_to_tg_ip6} | ${dut2_to_dut1_ip6}
+| | ... | ${dut2_to_tg_ip6} | ${prefix6}
+| | And Set up Lisp topology
+| | ... | ${dut1} | ${dut1_if2} | ${NONE}
+| | ... | ${dut2} | ${dut2_if1} | ${NONE}
+| | ... | ${duts_locator_set} | ${dut1_ip6_eid} | ${dut2_ip6_eid}
+| | ... | ${dut1_ip6_static_adjacency} | ${dut2_ip6_static_adjacency}
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-IPv6
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
-| | ...                                       | ${perf_pdr_loss_acceptance}
-| | ...                                       | ${perf_pdr_loss_acceptance_type}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
+| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
 
 | tc07-78B-2t2c-ethip6lispip6-ip6base-ndrdisc
 | | [Documentation]
@@ -254,21 +247,20 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
 | | When Lisp IPv6 forwarding initialized in a 3-node circular topology
-| | ...  | ${dut1_to_dut2_ip6} | ${dut1_to_tg_ip6} | ${dut2_to_dut1_ip6}
-| | ...  | ${dut2_to_tg_ip6} | ${prefix6}
-| | And  Set up Lisp topology
-| | ...  | ${dut1} | ${dut1_if2} | ${NONE}
-| | ...  | ${dut2} | ${dut2_if1} | ${NONE}
-| | ...  | ${duts_locator_set} | ${dut1_ip6_eid} | ${dut2_ip6_eid}
-| | ...  | ${dut1_ip6_static_adjacency} | ${dut2_ip6_static_adjacency}
+| | ... | ${dut1_to_dut2_ip6} | ${dut1_to_tg_ip6} | ${dut2_to_dut1_ip6}
+| | ... | ${dut2_to_tg_ip6} | ${prefix6}
+| | And Set up Lisp topology
+| | ... | ${dut1} | ${dut1_if2} | ${NONE}
+| | ... | ${dut2} | ${dut2_if1} | ${NONE}
+| | ... | ${duts_locator_set} | ${dut1_ip6_eid} | ${dut2_ip6_eid}
+| | ... | ${dut1_ip6_static_adjacency} | ${dut2_ip6_static_adjacency}
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-IPv6
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc08-78B-2t2c-ethip6lispip6-ip6base-pdrdisc
 | | [Documentation]
@@ -285,23 +277,21 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
 | | When Lisp IPv6 forwarding initialized in a 3-node circular topology
-| | ...  | ${dut1_to_dut2_ip6} | ${dut1_to_tg_ip6} | ${dut2_to_dut1_ip6}
-| | ...  | ${dut2_to_tg_ip6} | ${prefix6}
-| | And  Set up Lisp topology
-| | ...  | ${dut1} | ${dut1_if2} | ${NONE}
-| | ...  | ${dut2} | ${dut2_if1} | ${NONE}
-| | ...  | ${duts_locator_set} | ${dut1_ip6_eid} | ${dut2_ip6_eid}
-| | ...  | ${dut1_ip6_static_adjacency} | ${dut2_ip6_static_adjacency}
+| | ... | ${dut1_to_dut2_ip6} | ${dut1_to_tg_ip6} | ${dut2_to_dut1_ip6}
+| | ... | ${dut2_to_tg_ip6} | ${prefix6}
+| | And Set up Lisp topology
+| | ... | ${dut1} | ${dut1_if2} | ${NONE}
+| | ... | ${dut2} | ${dut2_if1} | ${NONE}
+| | ... | ${duts_locator_set} | ${dut1_ip6_eid} | ${dut2_ip6_eid}
+| | ... | ${dut1_ip6_static_adjacency} | ${dut2_ip6_static_adjacency}
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-IPv6
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
-| | ...                                       | ${perf_pdr_loss_acceptance}
-| | ...                                       | ${perf_pdr_loss_acceptance_type}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
+| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
 
 | tc09-1460B-2t2c-ethip6lispip6-ip6base-ndrdisc
 | | [Documentation]
@@ -318,21 +308,20 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
 | | When Lisp IPv6 forwarding initialized in a 3-node circular topology
-| | ...  | ${dut1_to_dut2_ip6} | ${dut1_to_tg_ip6} | ${dut2_to_dut1_ip6}
-| | ...  | ${dut2_to_tg_ip6} | ${prefix6}
-| | And  Set up Lisp topology
-| | ...  | ${dut1} | ${dut1_if2} | ${NONE}
-| | ...  | ${dut2} | ${dut2_if1} | ${NONE}
-| | ...  | ${duts_locator_set} | ${dut1_ip6_eid} | ${dut2_ip6_eid}
-| | ...  | ${dut1_ip6_static_adjacency} | ${dut2_ip6_static_adjacency}
+| | ... | ${dut1_to_dut2_ip6} | ${dut1_to_tg_ip6} | ${dut2_to_dut1_ip6}
+| | ... | ${dut2_to_tg_ip6} | ${prefix6}
+| | And Set up Lisp topology
+| | ... | ${dut1} | ${dut1_if2} | ${NONE}
+| | ... | ${dut2} | ${dut2_if1} | ${NONE}
+| | ... | ${duts_locator_set} | ${dut1_ip6_eid} | ${dut2_ip6_eid}
+| | ... | ${dut1_ip6_static_adjacency} | ${dut2_ip6_static_adjacency}
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-IPv6
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc10-1460B-2t2c-ethip6lispip6-ip6base-pdrdisc
 | | [Documentation]
@@ -349,23 +338,21 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
 | | When Lisp IPv6 forwarding initialized in a 3-node circular topology
-| | ...  | ${dut1_to_dut2_ip6} | ${dut1_to_tg_ip6} | ${dut2_to_dut1_ip6}
-| | ...  | ${dut2_to_tg_ip6} | ${prefix6}
-| | And  Set up Lisp topology
-| | ...  | ${dut1} | ${dut1_if2} | ${NONE}
-| | ...  | ${dut2} | ${dut2_if1} | ${NONE}
-| | ...  | ${duts_locator_set} | ${dut1_ip6_eid} | ${dut2_ip6_eid}
-| | ...  | ${dut1_ip6_static_adjacency} | ${dut2_ip6_static_adjacency}
+| | ... | ${dut1_to_dut2_ip6} | ${dut1_to_tg_ip6} | ${dut2_to_dut1_ip6}
+| | ... | ${dut2_to_tg_ip6} | ${prefix6}
+| | And Set up Lisp topology
+| | ... | ${dut1} | ${dut1_if2} | ${NONE}
+| | ... | ${dut2} | ${dut2_if1} | ${NONE}
+| | ... | ${duts_locator_set} | ${dut1_ip6_eid} | ${dut2_ip6_eid}
+| | ... | ${dut1_ip6_static_adjacency} | ${dut2_ip6_static_adjacency}
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-IPv6
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
-| | ...                                       | ${perf_pdr_loss_acceptance}
-| | ...                                       | ${perf_pdr_loss_acceptance_type}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
+| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
 
 | tc11-9000B-2t2c-ethip6lispip6-ip6base-ndrdisc
 | | [Documentation]
@@ -382,20 +369,19 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Apply startup configuration on all VPP DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Apply startup configuration on all VPP DUTs
 | | When Lisp IPv6 forwarding initialized in a 3-node circular topology
-| | ...  | ${dut1_to_dut2_ip6} | ${dut1_to_tg_ip6} | ${dut2_to_dut1_ip6}
-| | ...  | ${dut2_to_tg_ip6} | ${prefix6}
-| | And  Set up Lisp topology
-| | ...  | ${dut1} | ${dut1_if2} | ${NONE}
-| | ...  | ${dut2} | ${dut2_if1} | ${NONE}
-| | ...  | ${duts_locator_set} | ${dut1_ip6_eid} | ${dut2_ip6_eid}
-| | ...  | ${dut1_ip6_static_adjacency} | ${dut2_ip6_static_adjacency}
+| | ... | ${dut1_to_dut2_ip6} | ${dut1_to_tg_ip6} | ${dut2_to_dut1_ip6}
+| | ... | ${dut2_to_tg_ip6} | ${prefix6}
+| | And Set up Lisp topology
+| | ... | ${dut1} | ${dut1_if2} | ${NONE}
+| | ... | ${dut2} | ${dut2_if1} | ${NONE}
+| | ... | ${duts_locator_set} | ${dut1_ip6_eid} | ${dut2_ip6_eid}
+| | ... | ${dut1_ip6_static_adjacency} | ${dut2_ip6_static_adjacency}
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-IPv6
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc12-9000B-2t2c-ethip6lispip6-ip6base-pdrdisc
 | | [Documentation]
@@ -412,22 +398,20 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Apply startup configuration on all VPP DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Apply startup configuration on all VPP DUTs
 | | When Lisp IPv6 forwarding initialized in a 3-node circular topology
-| | ...  | ${dut1_to_dut2_ip6} | ${dut1_to_tg_ip6} | ${dut2_to_dut1_ip6}
-| | ...  | ${dut2_to_tg_ip6} | ${prefix6}
-| | And  Set up Lisp topology
-| | ...  | ${dut1} | ${dut1_if2} | ${NONE}
-| | ...  | ${dut2} | ${dut2_if1} | ${NONE}
-| | ...  | ${duts_locator_set} | ${dut1_ip6_eid} | ${dut2_ip6_eid}
-| | ...  | ${dut1_ip6_static_adjacency} | ${dut2_ip6_static_adjacency}
+| | ... | ${dut1_to_dut2_ip6} | ${dut1_to_tg_ip6} | ${dut2_to_dut1_ip6}
+| | ... | ${dut2_to_tg_ip6} | ${prefix6}
+| | And Set up Lisp topology
+| | ... | ${dut1} | ${dut1_if2} | ${NONE}
+| | ... | ${dut2} | ${dut2_if1} | ${NONE}
+| | ... | ${duts_locator_set} | ${dut1_ip6_eid} | ${dut2_ip6_eid}
+| | ... | ${dut1_ip6_static_adjacency} | ${dut2_ip6_static_adjacency}
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-IPv6
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
-| | ...                                       | ${perf_pdr_loss_acceptance}
-| | ...                                       | ${perf_pdr_loss_acceptance_type}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
+| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
 
 | tc13-78B-4t4c-ethip6lispip6-ip6base-ndrdisc
 | | [Documentation]
@@ -444,21 +428,20 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
 | | When Lisp IPv6 forwarding initialized in a 3-node circular topology
-| | ...  | ${dut1_to_dut2_ip6} | ${dut1_to_tg_ip6} | ${dut2_to_dut1_ip6}
-| | ...  | ${dut2_to_tg_ip6} | ${prefix6}
-| | And  Set up Lisp topology
-| | ...  | ${dut1} | ${dut1_if2} | ${NONE}
-| | ...  | ${dut2} | ${dut2_if1} | ${NONE}
-| | ...  | ${duts_locator_set} | ${dut1_ip6_eid} | ${dut2_ip6_eid}
-| | ...  | ${dut1_ip6_static_adjacency} | ${dut2_ip6_static_adjacency}
+| | ... | ${dut1_to_dut2_ip6} | ${dut1_to_tg_ip6} | ${dut2_to_dut1_ip6}
+| | ... | ${dut2_to_tg_ip6} | ${prefix6}
+| | And Set up Lisp topology
+| | ... | ${dut1} | ${dut1_if2} | ${NONE}
+| | ... | ${dut2} | ${dut2_if1} | ${NONE}
+| | ... | ${duts_locator_set} | ${dut1_ip6_eid} | ${dut2_ip6_eid}
+| | ... | ${dut1_ip6_static_adjacency} | ${dut2_ip6_static_adjacency}
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-IPv6
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc14-78B-4t4c-ethip6lispip6-ip6base-pdrdisc
 | | [Documentation]
@@ -475,23 +458,21 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
 | | When Lisp IPv6 forwarding initialized in a 3-node circular topology
-| | ...  | ${dut1_to_dut2_ip6} | ${dut1_to_tg_ip6} | ${dut2_to_dut1_ip6}
-| | ...  | ${dut2_to_tg_ip6} | ${prefix6}
-| | And  Set up Lisp topology
-| | ...  | ${dut1} | ${dut1_if2} | ${NONE}
-| | ...  | ${dut2} | ${dut2_if1} | ${NONE}
-| | ...  | ${duts_locator_set} | ${dut1_ip6_eid} | ${dut2_ip6_eid}
-| | ...  | ${dut1_ip6_static_adjacency} | ${dut2_ip6_static_adjacency}
+| | ... | ${dut1_to_dut2_ip6} | ${dut1_to_tg_ip6} | ${dut2_to_dut1_ip6}
+| | ... | ${dut2_to_tg_ip6} | ${prefix6}
+| | And Set up Lisp topology
+| | ... | ${dut1} | ${dut1_if2} | ${NONE}
+| | ... | ${dut2} | ${dut2_if1} | ${NONE}
+| | ... | ${duts_locator_set} | ${dut1_ip6_eid} | ${dut2_ip6_eid}
+| | ... | ${dut1_ip6_static_adjacency} | ${dut2_ip6_static_adjacency}
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-IPv6
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
-| | ...                                       | ${perf_pdr_loss_acceptance}
-| | ...                                       | ${perf_pdr_loss_acceptance_type}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
+| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
 
 | tc15-1460B-4t4c-ethip6lispip6-ip6base-ndrdisc
 | | [Documentation]
@@ -508,21 +489,20 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
 | | When Lisp IPv6 forwarding initialized in a 3-node circular topology
-| | ...  | ${dut1_to_dut2_ip6} | ${dut1_to_tg_ip6} | ${dut2_to_dut1_ip6}
-| | ...  | ${dut2_to_tg_ip6} | ${prefix6}
-| | And  Set up Lisp topology
-| | ...  | ${dut1} | ${dut1_if2} | ${NONE}
-| | ...  | ${dut2} | ${dut2_if1} | ${NONE}
-| | ...  | ${duts_locator_set} | ${dut1_ip6_eid} | ${dut2_ip6_eid}
-| | ...  | ${dut1_ip6_static_adjacency} | ${dut2_ip6_static_adjacency}
+| | ... | ${dut1_to_dut2_ip6} | ${dut1_to_tg_ip6} | ${dut2_to_dut1_ip6}
+| | ... | ${dut2_to_tg_ip6} | ${prefix6}
+| | And Set up Lisp topology
+| | ... | ${dut1} | ${dut1_if2} | ${NONE}
+| | ... | ${dut2} | ${dut2_if1} | ${NONE}
+| | ... | ${duts_locator_set} | ${dut1_ip6_eid} | ${dut2_ip6_eid}
+| | ... | ${dut1_ip6_static_adjacency} | ${dut2_ip6_static_adjacency}
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-IPv6
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc16-1460B-4t4c-ethip6lispip6-ip6base-pdrdisc
 | | [Documentation]
@@ -539,23 +519,21 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
 | | When Lisp IPv6 forwarding initialized in a 3-node circular topology
-| | ...  | ${dut1_to_dut2_ip6} | ${dut1_to_tg_ip6} | ${dut2_to_dut1_ip6}
-| | ...  | ${dut2_to_tg_ip6} | ${prefix6}
-| | And  Set up Lisp topology
-| | ...  | ${dut1} | ${dut1_if2} | ${NONE}
-| | ...  | ${dut2} | ${dut2_if1} | ${NONE}
-| | ...  | ${duts_locator_set} | ${dut1_ip6_eid} | ${dut2_ip6_eid}
-| | ...  | ${dut1_ip6_static_adjacency} | ${dut2_ip6_static_adjacency}
+| | ... | ${dut1_to_dut2_ip6} | ${dut1_to_tg_ip6} | ${dut2_to_dut1_ip6}
+| | ... | ${dut2_to_tg_ip6} | ${prefix6}
+| | And Set up Lisp topology
+| | ... | ${dut1} | ${dut1_if2} | ${NONE}
+| | ... | ${dut2} | ${dut2_if1} | ${NONE}
+| | ... | ${duts_locator_set} | ${dut1_ip6_eid} | ${dut2_ip6_eid}
+| | ... | ${dut1_ip6_static_adjacency} | ${dut2_ip6_static_adjacency}
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-IPv6
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
-| | ...                                       | ${perf_pdr_loss_acceptance}
-| | ...                                       | ${perf_pdr_loss_acceptance_type}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
+| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
 
 | tc17-9000B-4t4c-ethip6lispip6-ip6base-ndrdisc
 | | [Documentation]
@@ -572,20 +550,19 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Apply startup configuration on all VPP DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Apply startup configuration on all VPP DUTs
 | | When Lisp IPv6 forwarding initialized in a 3-node circular topology
-| | ...  | ${dut1_to_dut2_ip6} | ${dut1_to_tg_ip6} | ${dut2_to_dut1_ip6}
-| | ...  | ${dut2_to_tg_ip6} | ${prefix6}
-| | And  Set up Lisp topology
-| | ...  | ${dut1} | ${dut1_if2} | ${NONE}
-| | ...  | ${dut2} | ${dut2_if1} | ${NONE}
-| | ...  | ${duts_locator_set} | ${dut1_ip6_eid} | ${dut2_ip6_eid}
-| | ...  | ${dut1_ip6_static_adjacency} | ${dut2_ip6_static_adjacency}
+| | ... | ${dut1_to_dut2_ip6} | ${dut1_to_tg_ip6} | ${dut2_to_dut1_ip6}
+| | ... | ${dut2_to_tg_ip6} | ${prefix6}
+| | And Set up Lisp topology
+| | ... | ${dut1} | ${dut1_if2} | ${NONE}
+| | ... | ${dut2} | ${dut2_if1} | ${NONE}
+| | ... | ${duts_locator_set} | ${dut1_ip6_eid} | ${dut2_ip6_eid}
+| | ... | ${dut1_ip6_static_adjacency} | ${dut2_ip6_static_adjacency}
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-IPv6
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc18-9000B-4t4c-ethip6lispip6-ip6base-pdrdisc
 | | [Documentation]
@@ -602,19 +579,17 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Apply startup configuration on all VPP DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Apply startup configuration on all VPP DUTs
 | | When Lisp IPv6 forwarding initialized in a 3-node circular topology
-| | ...  | ${dut1_to_dut2_ip6} | ${dut1_to_tg_ip6} | ${dut2_to_dut1_ip6}
-| | ...  | ${dut2_to_tg_ip6} | ${prefix6}
-| | And  Set up Lisp topology
-| | ...  | ${dut1} | ${dut1_if2} | ${NONE}
-| | ...  | ${dut2} | ${dut2_if1} | ${NONE}
-| | ...  | ${duts_locator_set} | ${dut1_ip6_eid} | ${dut2_ip6_eid}
-| | ...  | ${dut1_ip6_static_adjacency} | ${dut2_ip6_static_adjacency}
+| | ... | ${dut1_to_dut2_ip6} | ${dut1_to_tg_ip6} | ${dut2_to_dut1_ip6}
+| | ... | ${dut2_to_tg_ip6} | ${prefix6}
+| | And Set up Lisp topology
+| | ... | ${dut1} | ${dut1_if2} | ${NONE}
+| | ... | ${dut2} | ${dut2_if1} | ${NONE}
+| | ... | ${duts_locator_set} | ${dut1_ip6_eid} | ${dut2_ip6_eid}
+| | ... | ${dut1_ip6_static_adjacency} | ${dut2_ip6_static_adjacency}
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-IPv6
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
-| | ...                                       | ${perf_pdr_loss_acceptance}
-| | ...                                       | ${perf_pdr_loss_acceptance_type}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
+| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
diff --git a/tests/perf/10ge2p1x710-eth-l2bdbasemaclrn-eth-2vhost-1vm-ndrpdrdisc.robot b/tests/perf/10ge2p1x710-eth-l2bdbasemaclrn-eth-2vhost-1vm-ndrpdrdisc.robot
index eff924e0ed..298c3d40ad 100644
--- a/tests/perf/10ge2p1x710-eth-l2bdbasemaclrn-eth-2vhost-1vm-ndrpdrdisc.robot
+++ b/tests/perf/10ge2p1x710-eth-l2bdbasemaclrn-eth-2vhost-1vm-ndrpdrdisc.robot
@@ -24,7 +24,7 @@
 | ...
 | Test Setup | Performance test setup
 | Test Teardown | Performance test with vhost and VM with dpdk-testpmd teardown
-| ... | ${min_rate}pps | ${framesize} | 3-node-bridge
+| ... | ${min_rate}pps | ${framesize} | ${traffic_profile}
 | ... | dut1_node=${dut1} | dut1_vm_refs=${dut1_vm_refs}
 | ... | dut2_node=${dut2} | dut2_vm_refs=${dut2_vm_refs}
 | ...
@@ -63,6 +63,8 @@
 | ${bd_id2}= | 2
 | ${sock1}= | /tmp/sock-1-${bd_id1}
 | ${sock2}= | /tmp/sock-1-${bd_id2}
+# Traffic profile:
+| ${traffic_profile} | trex-sl-3n-ethip4-ip4src254
 
 *** Test Cases ***
 | tc01-64B-1t1c-eth-l2bdbasemaclrn-eth-2vhost-1vm-ndrdisc
@@ -94,8 +96,8 @@
 | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
-| | ... | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc02-64B-1t1c-eth-l2bdbasemaclrn-eth-2vhost-1vm-pdrdisc
 | | [Documentation]
@@ -126,8 +128,8 @@
 | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
-| | ... | ${threshold} | ${perf_pdr_loss_acceptance}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold} | ${perf_pdr_loss_acceptance}
 | | ... | ${perf_pdr_loss_acceptance_type}
 
 | tc03-1518B-1t1c-eth-l2bdbasemaclrn-eth-2vhost-1vm-ndrdisc
@@ -159,8 +161,8 @@
 | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
-| | ... | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc04-1518B-1t1c-eth-l2bdbasemaclrn-eth-2vhost-1vm-pdrdisc
 | | [Documentation]
@@ -191,8 +193,8 @@
 | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
-| | ... | ${threshold} | ${perf_pdr_loss_acceptance}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold} | ${perf_pdr_loss_acceptance}
 | | ... | ${perf_pdr_loss_acceptance_type}
 
 | tc05-IMIX-1t1c-eth-l2bdbasemaclrn-eth-2vhost-1vm-ndrdisc
@@ -225,8 +227,8 @@
 | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
-| | ... | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc06-IMIX-1t1c-eth-l2bdbasemaclrn-eth-2vhost-1vm-pdrdisc
 | | [Documentation]
@@ -257,8 +259,8 @@
 | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
-| | ... | ${threshold} | ${perf_pdr_loss_acceptance}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold} | ${perf_pdr_loss_acceptance}
 | | ... | ${perf_pdr_loss_acceptance_type}
 
 | tc07-64B-2t2c-eth-l2bdbasemaclrn-eth-2vhost-1vm-ndrdisc
@@ -290,8 +292,8 @@
 | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
-| | ... | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc08-64B-2t2c-eth-l2bdbasemaclrn-eth-2vhost-1vm-pdrdisc
 | | [Documentation]
@@ -322,8 +324,8 @@
 | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
-| | ... | ${threshold} | ${perf_pdr_loss_acceptance}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold} | ${perf_pdr_loss_acceptance}
 | | ... | ${perf_pdr_loss_acceptance_type}
 
 | tc09-1518B-2t2c-eth-l2bdbasemaclrn-eth-2vhost-1vm-ndrdisc
@@ -355,8 +357,8 @@
 | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
-| | ... | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc10-1518B-2t2c-eth-l2bdbasemaclrn-eth-2vhost-1vm-pdrdisc
 | | [Documentation]
@@ -387,8 +389,8 @@
 | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
-| | ... | ${threshold} | ${perf_pdr_loss_acceptance}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold} | ${perf_pdr_loss_acceptance}
 | | ... | ${perf_pdr_loss_acceptance_type}
 
 | tc11-IMIX-2t2c-eth-l2bdbasemaclrn-eth-2vhost-1vm-ndrdisc
@@ -421,8 +423,8 @@
 | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
-| | ... | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc12-IMIX-2t2c-eth-l2bdbasemaclrn-eth-2vhost-1vm-pdrdisc
 | | [Documentation]
@@ -454,8 +456,8 @@
 | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
-| | ... | ${threshold} | ${perf_pdr_loss_acceptance}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold} | ${perf_pdr_loss_acceptance}
 | | ... | ${perf_pdr_loss_acceptance_type}
 
 | tc13-64B-4t4c-eth-l2bdbasemaclrn-eth-2vhost-1vm-ndrdisc
@@ -487,8 +489,8 @@
 | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
-| | ... | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc14-64B-4t4c-eth-l2bdbasemaclrn-eth-2vhost-1vm-pdrdisc
 | | [Documentation]
@@ -519,8 +521,8 @@
 | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
-| | ... | ${threshold} | ${perf_pdr_loss_acceptance}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold} | ${perf_pdr_loss_acceptance}
 | | ... | ${perf_pdr_loss_acceptance_type}
 
 | tc15-1518B-4t4c-eth-l2bdbasemaclrn-eth-2vhost-1vm-ndrdisc
@@ -552,8 +554,8 @@
 | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
-| | ... | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc16-1518B-4t4c-eth-l2bdbasemaclrn-eth-2vhost-1vm-pdrdisc
 | | [Documentation]
@@ -584,8 +586,8 @@
 | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
-| | ... | ${threshold} | ${perf_pdr_loss_acceptance}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold} | ${perf_pdr_loss_acceptance}
 | | ... | ${perf_pdr_loss_acceptance_type}
 
 | tc17-IMIX-4t4c-eth-l2bdbasemaclrn-eth-2vhost-1vm-ndrdisc
@@ -618,8 +620,8 @@
 | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
-| | ... | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc18-IMIX-4t4c-eth-l2bdbasemaclrn-eth-2vhost-1vm-pdrdisc
 | | [Documentation]
@@ -651,6 +653,6 @@
 | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
-| | ... | ${threshold} | ${perf_pdr_loss_acceptance}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold} | ${perf_pdr_loss_acceptance}
 | | ... | ${perf_pdr_loss_acceptance_type}
diff --git a/tests/perf/10ge2p1x710-eth-l2bdbasemaclrn-ndrpdrdisc.robot b/tests/perf/10ge2p1x710-eth-l2bdbasemaclrn-ndrpdrdisc.robot
index 24e021ecbe..a1e4bf4ce6 100644
--- a/tests/perf/10ge2p1x710-eth-l2bdbasemaclrn-ndrpdrdisc.robot
+++ b/tests/perf/10ge2p1x710-eth-l2bdbasemaclrn-ndrpdrdisc.robot
@@ -23,7 +23,7 @@
 | ...
 | Test Setup | Performance test setup
 | Test Teardown | Performance test teardown | ${min_rate}pps | ${framesize}
-| ... | 3-node-bridge
+| ... | ${traffic_profile}
 | ...
 | Documentation | *RFC2544: Pkt throughput L2BD test cases*
 | ...
@@ -50,6 +50,8 @@
 *** Variables ***
 # X710 bandwidth limit
 | ${s_limit} | ${10000000000}
+# Traffic profile:
+| ${traffic_profile} | trex-sl-3n-ethip4-ip4src254
 
 *** Keywords ***
 | L2 Bridge Domain NDR Binary Search
@@ -67,7 +69,7 @@
 | | Apply startup configuration on all VPP DUTs
 | | L2 bridge domain initialized in a 3-node circular topology
 | | Find NDR using binary search and pps
-| | ... | ${framesize} | ${binary_min} | ${binary_max} | 3-node-bridge
+| | ... | ${framesize} | ${binary_min} | ${binary_max} | ${traffic_profile}
 | | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | L2 Bridge Domain PDR Binary Search
@@ -85,7 +87,7 @@
 | | Apply startup configuration on all VPP DUTs
 | | L2 bridge domain initialized in a 3-node circular topology
 | | Find PDR using binary search and pps
-| | ... | ${framesize} | ${binary_min} | ${binary_max} | 3-node-bridge
+| | ... | ${framesize} | ${binary_min} | ${binary_max} | ${traffic_profile}
 | | ... | ${min_rate} | ${max_rate} | ${threshold}
 | | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
 
diff --git a/tests/perf/40ge2p1vic1385-eth-l2bdbasemaclrn-ndrpdrdisc.robot b/tests/perf/40ge2p1vic1385-eth-l2bdbasemaclrn-ndrpdrdisc.robot
index 5e1d50bac8..28ffef0b59 100644
--- a/tests/perf/40ge2p1vic1385-eth-l2bdbasemaclrn-ndrpdrdisc.robot
+++ b/tests/perf/40ge2p1vic1385-eth-l2bdbasemaclrn-ndrpdrdisc.robot
@@ -24,7 +24,7 @@
 | ...
 | Test Setup | Performance test setup
 | Test Teardown | Performance test teardown | ${min_rate}pps | ${framesize}
-| ... | 3-node-bridge
+| ... | ${traffic_profile}
 | ...
 | Documentation | *RFC2544: Pkt throughput L2BD test cases*
 | ...
@@ -53,6 +53,8 @@
 | ${s_24.5G} | ${24500000000}
 # XL710-DA2 Mpps (TG) limit 37.5Mpps/2=18.75Mpps
 | ${s_18.75Mpps} | ${18750000}
+# Traffic profile:
+| ${traffic_profile} | trex-sl-3n-ethip4-ip4src254
 
 *** Test Cases ***
 | tc01-64B-1t1c-eth-l2bdbasemaclrn-ndrdisc
@@ -76,8 +78,8 @@
 | | And Apply startup configuration on all VPP DUTs
 | | And L2 bridge domain initialized in a 3-node circular topology
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
-| | ... | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc02-64B-1t1c-eth-l2bdbasemaclrn-pdrdisc
 | | [Documentation]
@@ -100,8 +102,8 @@
 | | And Apply startup configuration on all VPP DUTs
 | | And L2 bridge domain initialized in a 3-node circular topology
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
-| | ... | ${threshold} | ${perf_pdr_loss_acceptance}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold} | ${perf_pdr_loss_acceptance}
 | | ... | ${perf_pdr_loss_acceptance_type}
 
 | tc03-1518B-1t1c-eth-l2bdbasemaclrn-ndrdisc
@@ -125,8 +127,8 @@
 | | And Apply startup configuration on all VPP DUTs
 | | And L2 bridge domain initialized in a 3-node circular topology
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
-| | ... | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc05-9000B-1t1c-eth-l2bdbasemaclrn-ndrdisc
 | | [Documentation]
@@ -149,8 +151,8 @@
 | | And Apply startup configuration on all VPP DUTs
 | | And L2 bridge domain initialized in a 3-node circular topology
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
-| | ... | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc07-64B-2t2c-eth-l2bdbasemaclrn-ndrdisc
 | | [Documentation]
@@ -173,8 +175,8 @@
 | | And Apply startup configuration on all VPP DUTs
 | | And L2 bridge domain initialized in a 3-node circular topology
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
-| | ... | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc08-64B-2t2c-eth-l2bdbasemaclrn-pdrdisc
 | | [Documentation]
@@ -197,8 +199,8 @@
 | | And Apply startup configuration on all VPP DUTs
 | | And L2 bridge domain initialized in a 3-node circular topology
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
-| | ... | ${threshold} | ${perf_pdr_loss_acceptance}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold} | ${perf_pdr_loss_acceptance}
 | | ... | ${perf_pdr_loss_acceptance_type}
 
 | tc09-1518B-2t2c-eth-l2bdbasemaclrn-ndrdisc
@@ -222,8 +224,8 @@
 | | And Apply startup configuration on all VPP DUTs
 | | And L2 bridge domain initialized in a 3-node circular topology
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
-| | ... | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc13-64B-4t4c-eth-l2bdbasemaclrn-ndrdisc
 | | [Documentation]
@@ -246,8 +248,8 @@
 | | And Apply startup configuration on all VPP DUTs
 | | And L2 bridge domain initialized in a 3-node circular topology
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
-| | ... | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc15-1518B-4t4c-eth-l2bdbasemaclrn-ndrdisc
 | | [Documentation]
@@ -270,8 +272,8 @@
 | | And Apply startup configuration on all VPP DUTs
 | | And L2 bridge domain initialized in a 3-node circular topology
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
-| | ... | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc19-IMIX-1t1c-eth-l2bdbasemaclrn-ndrdisc
 | | [Documentation]
@@ -295,8 +297,8 @@
 | | And Apply startup configuration on all VPP DUTs
 | | And L2 bridge domain initialized in a 3-node circular topology
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
-| | ... | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc20-IMIX-2t2c-eth-l2bdbasemaclrn-ndrdisc
 | | [Documentation]
@@ -320,8 +322,8 @@
 | | And Apply startup configuration on all VPP DUTs
 | | And L2 bridge domain initialized in a 3-node circular topology
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
-| | ... | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc21-IMIX-4t4c-eth-l2bdbasemaclrn-ndrdisc
 | | [Documentation]
@@ -345,5 +347,5 @@
 | | And Apply startup configuration on all VPP DUTs
 | | And L2 bridge domain initialized in a 3-node circular topology
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
-| | ... | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
diff --git a/tests/perf/40ge2p1xl710-eth-l2bdbasemaclrn-eth-2vhost-1vm-ndrpdrdisc.robot b/tests/perf/40ge2p1xl710-eth-l2bdbasemaclrn-eth-2vhost-1vm-ndrpdrdisc.robot
index 348348b45c..9af93d3f93 100644
--- a/tests/perf/40ge2p1xl710-eth-l2bdbasemaclrn-eth-2vhost-1vm-ndrpdrdisc.robot
+++ b/tests/perf/40ge2p1xl710-eth-l2bdbasemaclrn-eth-2vhost-1vm-ndrpdrdisc.robot
@@ -24,7 +24,7 @@
 | ...
 | Test Setup | Performance test setup
 | Test Teardown | Performance test with vhost and VM with dpdk-testpmd teardown
-| ... | ${min_rate}pps | ${framesize} | 3-node-bridge
+| ... | ${min_rate}pps | ${framesize} | ${traffic_profile}
 | ... | dut1_node=${dut1} | dut1_vm_refs=${dut1_vm_refs}
 | ... | dut2_node=${dut2} | dut2_vm_refs=${dut2_vm_refs}
 | ...
@@ -65,6 +65,8 @@
 | ${bd_id2}= | 2
 | ${sock1}= | /tmp/sock-1-${bd_id1}
 | ${sock2}= | /tmp/sock-1-${bd_id2}
+# Traffic profile:
+| ${traffic_profile} | trex-sl-3n-ethip4-ip4src254
 
 *** Test Cases ***
 | tc01-64B-1t1c-eth-l2bdbasemaclrn-eth-2vhost-1vm-ndrdisc
@@ -96,8 +98,8 @@
 | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
-| | ... | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc02-64B-1t1c-eth-l2bdbasemaclrn-eth-2vhost-1vm-pdrdisc
 | | [Documentation]
@@ -128,8 +130,8 @@
 | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
-| | ... | ${threshold} | ${perf_pdr_loss_acceptance}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold} | ${perf_pdr_loss_acceptance}
 | | ... | ${perf_pdr_loss_acceptance_type}
 
 | tc03-1518B-1t1c-eth-l2bdbasemaclrn-eth-2vhost-1vm-ndrdisc
@@ -161,8 +163,8 @@
 | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
-| | ... | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc04-1518B-1t1c-eth-l2bdbasemaclrn-eth-2vhost-1vm-pdrdisc
 | | [Documentation]
@@ -193,8 +195,8 @@
 | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
-| | ... | ${threshold} | ${perf_pdr_loss_acceptance}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold} | ${perf_pdr_loss_acceptance}
 | | ... | ${perf_pdr_loss_acceptance_type}
 
 | tc05-IMIX-1t1c-eth-l2bdbasemaclrn-eth-2vhost-1vm-ndrdisc
@@ -227,8 +229,8 @@
 | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
-| | ... | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc06-IMIX-1t1c-eth-l2bdbasemaclrn-eth-2vhost-1vm-pdrdisc
 | | [Documentation]
@@ -259,8 +261,8 @@
 | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
-| | ... | ${threshold} | ${perf_pdr_loss_acceptance}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold} | ${perf_pdr_loss_acceptance}
 | | ... | ${perf_pdr_loss_acceptance_type}
 
 | tc07-64B-2t2c-eth-l2bdbasemaclrn-eth-2vhost-1vm-ndrdisc
@@ -292,8 +294,8 @@
 | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
-| | ... | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc08-64B-2t2c-eth-l2bdbasemaclrn-eth-2vhost-1vm-pdrdisc
 | | [Documentation]
@@ -324,8 +326,8 @@
 | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
-| | ... | ${threshold} | ${perf_pdr_loss_acceptance}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold} | ${perf_pdr_loss_acceptance}
 | | ... | ${perf_pdr_loss_acceptance_type}
 
 | tc09-1518B-2t2c-eth-l2bdbasemaclrn-eth-2vhost-1vm-ndrdisc
@@ -357,8 +359,8 @@
 | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
-| | ... | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc10-1518B-2t2c-eth-l2bdbasemaclrn-eth-2vhost-1vm-pdrdisc
 | | [Documentation]
@@ -389,8 +391,8 @@
 | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
-| | ... | ${threshold} | ${perf_pdr_loss_acceptance}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold} | ${perf_pdr_loss_acceptance}
 | | ... | ${perf_pdr_loss_acceptance_type}
 
 | tc11-IMIX-2t2c-eth-l2bdbasemaclrn-eth-2vhost-1vm-ndrdisc
@@ -423,8 +425,8 @@
 | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
-| | ... | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc12-IMIX-2t2c-eth-l2bdbasemaclrn-eth-2vhost-1vm-pdrdisc
 | | [Documentation]
@@ -456,8 +458,8 @@
 | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
-| | ... | ${threshold} | ${perf_pdr_loss_acceptance}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold} | ${perf_pdr_loss_acceptance}
 | | ... | ${perf_pdr_loss_acceptance_type}
 
 | tc13-64B-4t4c-eth-l2bdbasemaclrn-eth-2vhost-1vm-ndrdisc
@@ -489,8 +491,8 @@
 | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
-| | ... | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc14-64B-4t4c-eth-l2bdbasemaclrn-eth-2vhost-1vm-pdrdisc
 | | [Documentation]
@@ -521,8 +523,8 @@
 | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
-| | ... | ${threshold} | ${perf_pdr_loss_acceptance}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold} | ${perf_pdr_loss_acceptance}
 | | ... | ${perf_pdr_loss_acceptance_type}
 
 | tc15-1518B-4t4c-eth-l2bdbasemaclrn-eth-2vhost-1vm-ndrdisc
@@ -554,8 +556,8 @@
 | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
-| | ... | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc16-1518B-4t4c-eth-l2bdbasemaclrn-eth-2vhost-1vm-pdrdisc
 | | [Documentation]
@@ -586,8 +588,8 @@
 | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
-| | ... | ${threshold} | ${perf_pdr_loss_acceptance}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold} | ${perf_pdr_loss_acceptance}
 | | ... | ${perf_pdr_loss_acceptance_type}
 
 | tc17-IMIX-4t4c-eth-l2bdbasemaclrn-eth-2vhost-1vm-ndrdisc
@@ -620,8 +622,8 @@
 | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
-| | ... | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc18-IMIX-4t4c-eth-l2bdbasemaclrn-eth-2vhost-1vm-pdrdisc
 | | [Documentation]
@@ -653,6 +655,6 @@
 | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | 3-node-bridge | ${min_rate} | ${max_rate}
-| | ... | ${threshold} | ${perf_pdr_loss_acceptance}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold} | ${perf_pdr_loss_acceptance}
 | | ... | ${perf_pdr_loss_acceptance_type}
diff --git a/tests/perf/40ge2p1xl710-eth-l2bdbasemaclrn-eth-4vhost-2vm-ndrpdrdisc.robot b/tests/perf/40ge2p1xl710-eth-l2bdbasemaclrn-eth-4vhost-2vm-ndrpdrdisc.robot
index 740cbd7a3b..d81a40bf07 100644
--- a/tests/perf/40ge2p1xl710-eth-l2bdbasemaclrn-eth-4vhost-2vm-ndrpdrdisc.robot
+++ b/tests/perf/40ge2p1xl710-eth-l2bdbasemaclrn-eth-4vhost-2vm-ndrpdrdisc.robot
@@ -24,7 +24,7 @@
 | ...
 | Test Setup | Performance test setup
 | Test Teardown | Performance test with vhost and VM with dpdk-testpmd teardown
-| ... | ${min_rate}pps | ${framesize} | 3-node-bridge
+| ... | ${min_rate}pps | ${framesize} | ${traffic_profile}
 | ... | dut1_node=${dut1} | dut1_vm_refs=${dut1_vm_refs}
 | ... | dut2_node=${dut2} | dut2_vm_refs=${dut2_vm_refs}
 | ...
@@ -60,10 +60,12 @@
 | ${s_24.5G} | ${24500000000}
 # XL710-DA2 Mpps limit 37.5Mpps/2=18.75Mpps
 | ${s_18.75Mpps} | ${18750000}
-#CPU settings
+# CPU settings
 | ${system_cpus}= | ${1}
 | ${vpp_cpus}= | ${5}
 | ${vm_cpus}= | ${5}
+# Traffic profile:
+| ${traffic_profile} | trex-sl-3n-ethip4-ip4src254
 
 *** Test Cases ***
 | tc01-64B-1t1c-eth-l2bdbasemaclrn-eth-4vhost-2vm-ndrdisc
@@ -85,14 +87,14 @@
 | | Set Test Variable | ${dut1_vm_refs}
 | | Set Test Variable | ${dut2_vm_refs}
 | | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | When  L2 bridge domains with Vhost-User for '2' VMs initialized in a 3-node circular topology
-| | And   '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology
-| | Then  Find NDR using binary search and pps
-| | ...   | ${framesize} | ${binary_min} | ${binary_max} | 3-node-bridge
-| | ...   | ${min_rate} | ${max_rate} | ${threshold}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | When L2 bridge domains with Vhost-User for '2' VMs initialized in a 3-node circular topology
+| | And '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology
+| | Then Find NDR using binary search and pps
+| | ... | ${framesize} | ${binary_min} | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc02-64B-1t1c-eth-l2bdbasemaclrn-eth-4vhost-2vm-pdrdisc
 | | [Documentation]
@@ -113,15 +115,15 @@
 | | Set Test Variable | ${dut1_vm_refs}
 | | Set Test Variable | ${dut2_vm_refs}
 | | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | When  L2 bridge domains with Vhost-User for '2' VMs initialized in a 3-node circular topology
-| | And   '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology
-| | Then  Find PDR using binary search and pps
-| | ...   | ${framesize} | ${binary_min} | ${binary_max} | 3-node-bridge
-| | ...   | ${min_rate} | ${max_rate} | ${threshold}
-| | ...   | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | When L2 bridge domains with Vhost-User for '2' VMs initialized in a 3-node circular topology
+| | And '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology
+| | 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}
 
 | tc03-1518B-1t1c-eth-l2bdbasemaclrn-eth-4vhost-2vm-ndrdisc
 | | [Documentation]
@@ -142,14 +144,14 @@
 | | Set Test Variable | ${dut1_vm_refs}
 | | Set Test Variable | ${dut2_vm_refs}
 | | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | When  L2 bridge domains with Vhost-User for '2' VMs initialized in a 3-node circular topology
-| | And   '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology
-| | Then  Find NDR using binary search and pps
-| | ...   | ${framesize} | ${binary_min} | ${binary_max} | 3-node-bridge
-| | ...   | ${min_rate} | ${max_rate} | ${threshold}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | When L2 bridge domains with Vhost-User for '2' VMs initialized in a 3-node circular topology
+| | And '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology
+| | Then Find NDR using binary search and pps
+| | ... | ${framesize} | ${binary_min} | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc04-1518B-1t1c-eth-l2bdbasemaclrn-eth-4vhost-2vm-pdrdisc
 | | [Documentation]
@@ -170,15 +172,15 @@
 | | Set Test Variable | ${dut1_vm_refs}
 | | Set Test Variable | ${dut2_vm_refs}
 | | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | When  L2 bridge domains with Vhost-User for '2' VMs initialized in a 3-node circular topology
-| | And   '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology
-| | Then  Find PDR using binary search and pps
-| | ...   | ${framesize} | ${binary_min} | ${binary_max} | 3-node-bridge
-| | ...   | ${min_rate} | ${max_rate} | ${threshold}
-| | ...   | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | When L2 bridge domains with Vhost-User for '2' VMs initialized in a 3-node circular topology
+| | And '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology
+| | 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}
 
 | tc05-IMIX-1t1c-eth-l2bdbasemaclrn-eth-4vhost-2vm-ndrdisc
 | | [Documentation]
@@ -200,14 +202,14 @@
 | | Set Test Variable | ${dut1_vm_refs}
 | | Set Test Variable | ${dut2_vm_refs}
 | | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | When  L2 bridge domains with Vhost-User for '2' VMs initialized in a 3-node circular topology
-| | And   '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology
-| | Then  Find NDR using binary search and pps
-| | ...   | ${framesize} | ${binary_min} | ${binary_max} | 3-node-bridge
-| | ...   | ${min_rate} | ${max_rate} | ${threshold}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | When L2 bridge domains with Vhost-User for '2' VMs initialized in a 3-node circular topology
+| | And '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology
+| | Then Find NDR using binary search and pps
+| | ... | ${framesize} | ${binary_min} | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc06-IMIX-1t1c-eth-l2bdbasemaclrn-eth-4vhost-2vm-pdrdisc
 | | [Documentation]
@@ -229,15 +231,15 @@
 | | Set Test Variable | ${dut1_vm_refs}
 | | Set Test Variable | ${dut2_vm_refs}
 | | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | When  L2 bridge domains with Vhost-User for '2' VMs initialized in a 3-node circular topology
-| | And   '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology
-| | Then  Find PDR using binary search and pps
-| | ...   | ${framesize} | ${binary_min} | ${binary_max} | 3-node-bridge
-| | ...   | ${min_rate} | ${max_rate} | ${threshold}
-| | ...   | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | When L2 bridge domains with Vhost-User for '2' VMs initialized in a 3-node circular topology
+| | And '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology
+| | 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}
 
 | tc07-64B-2t2c-eth-l2bdbasemaclrn-eth-4vhost-2vm-ndrdisc
 | | [Documentation]
@@ -258,14 +260,14 @@
 | | Set Test Variable | ${dut1_vm_refs}
 | | Set Test Variable | ${dut2_vm_refs}
 | | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | When  L2 bridge domains with Vhost-User for '2' VMs initialized in a 3-node circular topology
-| | And   '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology
-| | Then  Find NDR using binary search and pps
-| | ...   | ${framesize} | ${binary_min} | ${binary_max} | 3-node-bridge
-| | ...   | ${min_rate} | ${max_rate} | ${threshold}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | When L2 bridge domains with Vhost-User for '2' VMs initialized in a 3-node circular topology
+| | And '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology
+| | Then Find NDR using binary search and pps
+| | ... | ${framesize} | ${binary_min} | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc08-64B-2t2c-eth-l2bdbasemaclrn-eth-4vhost-2vm-pdrdisc
 | | [Documentation]
@@ -286,15 +288,15 @@
 | | Set Test Variable | ${dut1_vm_refs}
 | | Set Test Variable | ${dut2_vm_refs}
 | | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | When  L2 bridge domains with Vhost-User for '2' VMs initialized in a 3-node circular topology
-| | And   '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology
-| | Then  Find PDR using binary search and pps
-| | ...   | ${framesize} | ${binary_min} | ${binary_max} | 3-node-bridge
-| | ...   | ${min_rate} | ${max_rate} | ${threshold}
-| | ...   | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | When L2 bridge domains with Vhost-User for '2' VMs initialized in a 3-node circular topology
+| | And '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology
+| | 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}
 
 | tc09-1518B-2t2c-eth-l2bdbasemaclrn-eth-4vhost-2vm-ndrdisc
 | | [Documentation]
@@ -315,14 +317,14 @@
 | | Set Test Variable | ${dut1_vm_refs}
 | | Set Test Variable | ${dut2_vm_refs}
 | | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | When  L2 bridge domains with Vhost-User for '2' VMs initialized in a 3-node circular topology
-| | And   '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology
-| | Then  Find NDR using binary search and pps
-| | ...   | ${framesize} | ${binary_min} | ${binary_max} | 3-node-bridge
-| | ...   | ${min_rate} | ${max_rate} | ${threshold}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | When L2 bridge domains with Vhost-User for '2' VMs initialized in a 3-node circular topology
+| | And '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology
+| | Then Find NDR using binary search and pps
+| | ... | ${framesize} | ${binary_min} | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc10-1518B-2t2c-eth-l2bdbasemaclrn-eth-4vhost-2vm-pdrdisc
 | | [Documentation]
@@ -343,15 +345,15 @@
 | | Set Test Variable | ${dut1_vm_refs}
 | | Set Test Variable | ${dut2_vm_refs}
 | | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | When  L2 bridge domains with Vhost-User for '2' VMs initialized in a 3-node circular topology
-| | And   '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology
-| | Then  Find PDR using binary search and pps
-| | ...   | ${framesize} | ${binary_min} | ${binary_max} | 3-node-bridge
-| | ...   | ${min_rate} | ${max_rate} | ${threshold}
-| | ...   | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | When L2 bridge domains with Vhost-User for '2' VMs initialized in a 3-node circular topology
+| | And '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology
+| | 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}
 
 | tc11-IMIX-2t2c-eth-l2bdbasemaclrn-eth-4vhost-2vm-ndrdisc
 | | [Documentation]
@@ -373,14 +375,14 @@
 | | Set Test Variable | ${dut1_vm_refs}
 | | Set Test Variable | ${dut2_vm_refs}
 | | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | When  L2 bridge domains with Vhost-User for '2' VMs initialized in a 3-node circular topology
-| | And   '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology
-| | Then  Find NDR using binary search and pps
-| | ...   | ${framesize} | ${binary_min} | ${binary_max} | 3-node-bridge
-| | ...   | ${min_rate} | ${max_rate} | ${threshold}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | When L2 bridge domains with Vhost-User for '2' VMs initialized in a 3-node circular topology
+| | And '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology
+| | Then Find NDR using binary search and pps
+| | ... | ${framesize} | ${binary_min} | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc12-IMIX-2t2c-eth-l2bdbasemaclrn-eth-4vhost-2vm-pdrdisc
 | | [Documentation]
@@ -402,15 +404,15 @@
 | | Set Test Variable | ${dut1_vm_refs}
 | | Set Test Variable | ${dut2_vm_refs}
 | | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | When  L2 bridge domains with Vhost-User for '2' VMs initialized in a 3-node circular topology
-| | And   '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology
-| | Then  Find PDR using binary search and pps
-| | ...   | ${framesize} | ${binary_min} | ${binary_max} | 3-node-bridge
-| | ...   | ${min_rate} | ${max_rate} | ${threshold}
-| | ...   | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | When L2 bridge domains with Vhost-User for '2' VMs initialized in a 3-node circular topology
+| | And '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology
+| | 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}
 
 | tc13-64B-4t4c-eth-l2bdbasemaclrn-eth-4vhost-2vm-ndrdisc
 | | [Documentation]
@@ -431,14 +433,14 @@
 | | Set Test Variable | ${dut1_vm_refs}
 | | Set Test Variable | ${dut2_vm_refs}
 | | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | When  L2 bridge domains with Vhost-User for '2' VMs initialized in a 3-node circular topology
-| | And   '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology
-| | Then  Find NDR using binary search and pps
-| | ...   | ${framesize} | ${binary_min} | ${binary_max} | 3-node-bridge
-| | ...   | ${min_rate} | ${max_rate} | ${threshold}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | When L2 bridge domains with Vhost-User for '2' VMs initialized in a 3-node circular topology
+| | And '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology
+| | Then Find NDR using binary search and pps
+| | ... | ${framesize} | ${binary_min} | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc14-64B-4t4c-eth-l2bdbasemaclrn-eth-4vhost-2vm-pdrdisc
 | | [Documentation]
@@ -459,15 +461,15 @@
 | | Set Test Variable | ${dut1_vm_refs}
 | | Set Test Variable | ${dut2_vm_refs}
 | | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | When  L2 bridge domains with Vhost-User for '2' VMs initialized in a 3-node circular topology
-| | And   '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology
-| | Then  Find PDR using binary search and pps
-| | ...   | ${framesize} | ${binary_min} | ${binary_max} | 3-node-bridge
-| | ...   | ${min_rate} | ${max_rate} | ${threshold}
-| | ...   | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | When L2 bridge domains with Vhost-User for '2' VMs initialized in a 3-node circular topology
+| | And '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology
+| | 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}
 
 | tc15-1518B-4t4c-eth-l2bdbasemaclrn-eth-4vhost-2vm-ndrdisc
 | | [Documentation]
@@ -488,14 +490,14 @@
 | | Set Test Variable | ${dut1_vm_refs}
 | | Set Test Variable | ${dut2_vm_refs}
 | | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | When  L2 bridge domains with Vhost-User for '2' VMs initialized in a 3-node circular topology
-| | And   '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology
-| | Then  Find NDR using binary search and pps
-| | ...   | ${framesize} | ${binary_min} | ${binary_max} | 3-node-bridge
-| | ...   | ${min_rate} | ${max_rate} | ${threshold}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | When L2 bridge domains with Vhost-User for '2' VMs initialized in a 3-node circular topology
+| | And '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology
+| | Then Find NDR using binary search and pps
+| | ... | ${framesize} | ${binary_min} | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc16-1518B-4t4c-eth-l2bdbasemaclrn-eth-4vhost-2vm-pdrdisc
 | | [Documentation]
@@ -516,15 +518,15 @@
 | | Set Test Variable | ${dut1_vm_refs}
 | | Set Test Variable | ${dut2_vm_refs}
 | | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | When  L2 bridge domains with Vhost-User for '2' VMs initialized in a 3-node circular topology
-| | And   '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology
-| | Then  Find PDR using binary search and pps
-| | ...   | ${framesize} | ${binary_min} | ${binary_max} | 3-node-bridge
-| | ...   | ${min_rate} | ${max_rate} | ${threshold}
-| | ...   | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | When L2 bridge domains with Vhost-User for '2' VMs initialized in a 3-node circular topology
+| | And '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology
+| | 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}
 
 | tc17-IMIX-4t4c-eth-l2bdbasemaclrn-eth-4vhost-2vm-ndrdisc
 | | [Documentation]
@@ -546,14 +548,14 @@
 | | Set Test Variable | ${dut1_vm_refs}
 | | Set Test Variable | ${dut2_vm_refs}
 | | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | When  L2 bridge domains with Vhost-User for '2' VMs initialized in a 3-node circular topology
-| | And   '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology
-| | Then  Find NDR using binary search and pps
-| | ...   | ${framesize} | ${binary_min} | ${binary_max} | 3-node-bridge
-| | ...   | ${min_rate} | ${max_rate} | ${threshold}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | When L2 bridge domains with Vhost-User for '2' VMs initialized in a 3-node circular topology
+| | And '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology
+| | Then Find NDR using binary search and pps
+| | ... | ${framesize} | ${binary_min} | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc18-IMIX-4t4c-eth-l2bdbasemaclrn-eth-4vhost-2vm-pdrdisc
 | | [Documentation]
@@ -575,12 +577,12 @@
 | | Set Test Variable | ${dut1_vm_refs}
 | | Set Test Variable | ${dut2_vm_refs}
 | | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | When  L2 bridge domains with Vhost-User for '2' VMs initialized in a 3-node circular topology
-| | And   '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology
-| | Then  Find PDR using binary search and pps
-| | ...   | ${framesize} | ${binary_min} | ${binary_max} | 3-node-bridge
-| | ...   | ${min_rate} | ${max_rate} | ${threshold}
-| | ...   | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | When L2 bridge domains with Vhost-User for '2' VMs initialized in a 3-node circular topology
+| | And '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology
+| | 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}
diff --git a/tests/perf/40ge2p1xl710-eth-l2bdbasemaclrn-ndrpdrdisc.robot b/tests/perf/40ge2p1xl710-eth-l2bdbasemaclrn-ndrpdrdisc.robot
index b58f133e7d..6d450b6a8c 100644
--- a/tests/perf/40ge2p1xl710-eth-l2bdbasemaclrn-ndrpdrdisc.robot
+++ b/tests/perf/40ge2p1xl710-eth-l2bdbasemaclrn-ndrpdrdisc.robot
@@ -23,7 +23,7 @@
 | ...
 | Test Setup | Performance test setup
 | Test Teardown | Performance test teardown | ${min_rate}pps | ${framesize}
-| ... | 3-node-bridge
+| ... | ${traffic_profile}
 | ...
 | Documentation | *RFC2544: Pkt throughput L2BD test cases*
 | ...
@@ -52,6 +52,8 @@
 | ${s_24.5G} | ${24500000000}
 # XL710-DA2 Mpps limit 37.5Mpps/2=18.75Mpps
 | ${s_18.75Mpps} | ${18750000}
+# Traffic profile:
+| ${traffic_profile} | trex-sl-3n-ethip4-ip4src254
 
 *** Keywords ***
 | L2 Bridge Domain NDR Binary Search BW limit
@@ -69,7 +71,7 @@
 | | Apply startup configuration on all VPP DUTs
 | | L2 bridge domain initialized in a 3-node circular topology
 | | Find NDR using binary search and pps
-| | ... | ${framesize} | ${binary_min} | ${binary_max} | 3-node-bridge
+| | ... | ${framesize} | ${binary_min} | ${binary_max} | ${traffic_profile}
 | | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | L2 Bridge Domain NDR Binary Search
@@ -87,7 +89,7 @@
 | | Apply startup configuration on all VPP DUTs
 | | L2 bridge domain initialized in a 3-node circular topology
 | | Find NDR using binary search and pps
-| | ... | ${framesize} | ${binary_min} | ${binary_max} | 3-node-bridge
+| | ... | ${framesize} | ${binary_min} | ${binary_max} | ${traffic_profile}
 | | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | L2 Bridge Domain PDR Binary Search BW limit
@@ -105,7 +107,7 @@
 | | Apply startup configuration on all VPP DUTs
 | | L2 bridge domain initialized in a 3-node circular topology
 | | Find PDR using binary search and pps
-| | ... | ${framesize} | ${binary_min} | ${binary_max} | 3-node-bridge
+| | ... | ${framesize} | ${binary_min} | ${binary_max} | ${traffic_profile}
 | | ... | ${min_rate} | ${max_rate} | ${threshold}
 | | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
 
@@ -124,7 +126,7 @@
 | | Apply startup configuration on all VPP DUTs
 | | L2 bridge domain initialized in a 3-node circular topology
 | | Find PDR using binary search and pps
-| | ... | ${framesize} | ${binary_min} | ${binary_max} | 3-node-bridge
+| | ... | ${framesize} | ${binary_min} | ${binary_max} | ${traffic_profile}
 | | ... | ${min_rate} | ${max_rate} | ${threshold}
 | | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
 
diff --git a/tests/perf/40ge2p1xl710-eth-l2xcbase-eth-4vhost-2vm-ndrpdrdisc.robot b/tests/perf/40ge2p1xl710-eth-l2xcbase-eth-4vhost-2vm-ndrpdrdisc.robot
index 807c66f435..b0bd555036 100644
--- a/tests/perf/40ge2p1xl710-eth-l2xcbase-eth-4vhost-2vm-ndrpdrdisc.robot
+++ b/tests/perf/40ge2p1xl710-eth-l2xcbase-eth-4vhost-2vm-ndrpdrdisc.robot
@@ -24,7 +24,7 @@
 | ...
 | Test Setup | Performance test setup
 | Test Teardown | Performance test with vhost and VM with dpdk-testpmd teardown
-| ... | ${min_rate}pps | ${framesize} | 3-node-xconnect
+| ... | ${min_rate}pps | ${framesize} | ${traffic_profile}
 | ... | dut1_node=${dut1} | dut1_vm_refs=${dut1_vm_refs}
 | ... | dut2_node=${dut2} | dut2_vm_refs=${dut2_vm_refs}
 | ...
@@ -60,10 +60,12 @@
 | ${s_24.5G} | ${24500000000}
 # XL710-DA2 Mpps limit 37.5Mpps/2=18.75Mpps
 | ${s_18.75Mpps} | ${18750000}
-#CPU settings
+# CPU settings
 | ${system_cpus}= | ${1}
 | ${vpp_cpus}= | ${5}
 | ${vm_cpus}= | ${5}
+# Traffic profile:
+| ${traffic_profile} | trex-sl-3n-ethip4-ip4src254
 
 *** Test Cases ***
 | tc01-64B-1t1c-eth-l2xcbase-eth-4vhost-2vm-ndrdisc
@@ -85,14 +87,14 @@
 | | Set Test Variable | ${dut1_vm_refs}
 | | Set Test Variable | ${dut2_vm_refs}
 | | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | When  L2 xconnect with Vhost-User for '2' initialized in a 3-node circular topology
-| | And   '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology
-| | Then  Find NDR using binary search and pps
-| | ...   | ${framesize} | ${binary_min} | ${binary_max} | 3-node-xconnect
-| | ...   | ${min_rate} | ${max_rate} | ${threshold}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | When L2 xconnect with Vhost-User for '2' initialized in a 3-node circular topology
+| | And '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology
+| | Then Find NDR using binary search and pps
+| | ... | ${framesize} | ${binary_min} | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc02-64B-1t1c-eth-l2xcbase-eth-4vhost-2vm-pdrdisc
 | | [Documentation]
@@ -113,15 +115,15 @@
 | | Set Test Variable | ${dut1_vm_refs}
 | | Set Test Variable | ${dut2_vm_refs}
 | | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | When  L2 xconnect with Vhost-User for '2' initialized in a 3-node circular topology
-| | And   '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology
-| | Then  Find PDR using binary search and pps
-| | ...   | ${framesize} | ${binary_min} | ${binary_max} | 3-node-xconnect
-| | ...   | ${min_rate} | ${max_rate} | ${threshold}
-| | ...   | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | When L2 xconnect with Vhost-User for '2' initialized in a 3-node circular topology
+| | And '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology
+| | 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}
 
 | tc03-1518B-1t1c-eth-l2xcbase-eth-4vhost-2vm-ndrdisc
 | | [Documentation]
@@ -142,14 +144,14 @@
 | | Set Test Variable | ${dut1_vm_refs}
 | | Set Test Variable | ${dut2_vm_refs}
 | | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | When  L2 xconnect with Vhost-User for '2' initialized in a 3-node circular topology
-| | And   '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology
-| | Then  Find NDR using binary search and pps
-| | ...   | ${framesize} | ${binary_min} | ${binary_max} | 3-node-xconnect
-| | ...   | ${min_rate} | ${max_rate} | ${threshold}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | When L2 xconnect with Vhost-User for '2' initialized in a 3-node circular topology
+| | And '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology
+| | Then Find NDR using binary search and pps
+| | ... | ${framesize} | ${binary_min} | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc04-1518B-1t1c-eth-l2xcbase-eth-4vhost-2vm-pdrdisc
 | | [Documentation]
@@ -170,15 +172,15 @@
 | | Set Test Variable | ${dut1_vm_refs}
 | | Set Test Variable | ${dut2_vm_refs}
 | | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | When  L2 xconnect with Vhost-User for '2' initialized in a 3-node circular topology
-| | And   '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology
-| | Then  Find PDR using binary search and pps
-| | ...   | ${framesize} | ${binary_min} | ${binary_max} | 3-node-xconnect
-| | ...   | ${min_rate} | ${max_rate} | ${threshold}
-| | ...   | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | When L2 xconnect with Vhost-User for '2' initialized in a 3-node circular topology
+| | And '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology
+| | 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}
 
 | tc05-IMIX-1t1c-eth-l2xcbase-eth-4vhost-2vm-ndrdisc
 | | [Documentation]
@@ -200,14 +202,14 @@
 | | Set Test Variable | ${dut1_vm_refs}
 | | Set Test Variable | ${dut2_vm_refs}
 | | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | When  L2 xconnect with Vhost-User for '2' initialized in a 3-node circular topology
-| | And   '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology
-| | Then  Find NDR using binary search and pps
-| | ...   | ${framesize} | ${binary_min} | ${binary_max} | 3-node-xconnect
-| | ...   | ${min_rate} | ${max_rate} | ${threshold}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | When L2 xconnect with Vhost-User for '2' initialized in a 3-node circular topology
+| | And '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology
+| | Then Find NDR using binary search and pps
+| | ... | ${framesize} | ${binary_min} | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc06-IMIX-1t1c-eth-l2xcbase-eth-4vhost-2vm-pdrdisc
 | | [Documentation]
@@ -229,15 +231,15 @@
 | | Set Test Variable | ${dut1_vm_refs}
 | | Set Test Variable | ${dut2_vm_refs}
 | | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | When  L2 xconnect with Vhost-User for '2' initialized in a 3-node circular topology
-| | And   '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology
-| | Then  Find PDR using binary search and pps
-| | ...   | ${framesize} | ${binary_min} | ${binary_max} | 3-node-xconnect
-| | ...   | ${min_rate} | ${max_rate} | ${threshold}
-| | ...   | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | When L2 xconnect with Vhost-User for '2' initialized in a 3-node circular topology
+| | And '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology
+| | 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}
 
 | tc07-64B-2t2c-eth-l2xcbase-eth-4vhost-2vm-ndrdisc
 | | [Documentation]
@@ -258,14 +260,14 @@
 | | Set Test Variable | ${dut1_vm_refs}
 | | Set Test Variable | ${dut2_vm_refs}
 | | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | When  L2 xconnect with Vhost-User for '2' initialized in a 3-node circular topology
-| | And   '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology
-| | Then  Find NDR using binary search and pps
-| | ...   | ${framesize} | ${binary_min} | ${binary_max} | 3-node-xconnect
-| | ...   | ${min_rate} | ${max_rate} | ${threshold}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | When L2 xconnect with Vhost-User for '2' initialized in a 3-node circular topology
+| | And '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology
+| | Then Find NDR using binary search and pps
+| | ... | ${framesize} | ${binary_min} | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc08-64B-2t2c-eth-l2xcbase-eth-4vhost-2vm-pdrdisc
 | | [Documentation]
@@ -286,15 +288,15 @@
 | | Set Test Variable | ${dut1_vm_refs}
 | | Set Test Variable | ${dut2_vm_refs}
 | | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | When  L2 xconnect with Vhost-User for '2' initialized in a 3-node circular topology
-| | And   '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology
-| | Then  Find PDR using binary search and pps
-| | ...   | ${framesize} | ${binary_min} | ${binary_max} | 3-node-xconnect
-| | ...   | ${min_rate} | ${max_rate} | ${threshold}
-| | ...   | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | When L2 xconnect with Vhost-User for '2' initialized in a 3-node circular topology
+| | And '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology
+| | 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}
 
 | tc09-1518B-2t2c-eth-l2xcbase-eth-4vhost-2vm-ndrdisc
 | | [Documentation]
@@ -315,14 +317,14 @@
 | | Set Test Variable | ${dut1_vm_refs}
 | | Set Test Variable | ${dut2_vm_refs}
 | | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | When  L2 xconnect with Vhost-User for '2' initialized in a 3-node circular topology
-| | And   '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology
-| | Then  Find NDR using binary search and pps
-| | ...   | ${framesize} | ${binary_min} | ${binary_max} | 3-node-xconnect
-| | ...   | ${min_rate} | ${max_rate} | ${threshold}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | When L2 xconnect with Vhost-User for '2' initialized in a 3-node circular topology
+| | And '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology
+| | Then Find NDR using binary search and pps
+| | ... | ${framesize} | ${binary_min} | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc10-1518B-2t2c-eth-l2xcbase-eth-4vhost-2vm-pdrdisc
 | | [Documentation]
@@ -343,15 +345,15 @@
 | | Set Test Variable | ${dut1_vm_refs}
 | | Set Test Variable | ${dut2_vm_refs}
 | | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | When  L2 xconnect with Vhost-User for '2' initialized in a 3-node circular topology
-| | And   '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology
-| | Then  Find PDR using binary search and pps
-| | ...   | ${framesize} | ${binary_min} | ${binary_max} | 3-node-xconnect
-| | ...   | ${min_rate} | ${max_rate} | ${threshold}
-| | ...   | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | When L2 xconnect with Vhost-User for '2' initialized in a 3-node circular topology
+| | And '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology
+| | 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}
 
 | tc11-IMIX-2t2c-eth-l2xcbase-eth-4vhost-2vm-ndrdisc
 | | [Documentation]
@@ -373,14 +375,14 @@
 | | Set Test Variable | ${dut1_vm_refs}
 | | Set Test Variable | ${dut2_vm_refs}
 | | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | When  L2 xconnect with Vhost-User for '2' initialized in a 3-node circular topology
-| | And   '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology
-| | Then  Find NDR using binary search and pps
-| | ...   | ${framesize} | ${binary_min} | ${binary_max} | 3-node-xconnect
-| | ...   | ${min_rate} | ${max_rate} | ${threshold}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | When L2 xconnect with Vhost-User for '2' initialized in a 3-node circular topology
+| | And '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology
+| | Then Find NDR using binary search and pps
+| | ... | ${framesize} | ${binary_min} | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc12-IMIX-2t2c-eth-l2xcbase-eth-4vhost-2vm-pdrdisc
 | | [Documentation]
@@ -402,15 +404,15 @@
 | | Set Test Variable | ${dut1_vm_refs}
 | | Set Test Variable | ${dut2_vm_refs}
 | | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | When  L2 xconnect with Vhost-User for '2' initialized in a 3-node circular topology
-| | And   '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology
-| | Then  Find PDR using binary search and pps
-| | ...   | ${framesize} | ${binary_min} | ${binary_max} | 3-node-xconnect
-| | ...   | ${min_rate} | ${max_rate} | ${threshold}
-| | ...   | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | When L2 xconnect with Vhost-User for '2' initialized in a 3-node circular topology
+| | And '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology
+| | 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}
 
 | tc13-64B-4t4c-eth-l2xcbase-eth-4vhost-2vm-ndrdisc
 | | [Documentation]
@@ -431,14 +433,14 @@
 | | Set Test Variable | ${dut1_vm_refs}
 | | Set Test Variable | ${dut2_vm_refs}
 | | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | When  L2 xconnect with Vhost-User for '2' initialized in a 3-node circular topology
-| | And   '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology
-| | Then  Find NDR using binary search and pps
-| | ...   | ${framesize} | ${binary_min} | ${binary_max} | 3-node-xconnect
-| | ...   | ${min_rate} | ${max_rate} | ${threshold}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | When L2 xconnect with Vhost-User for '2' initialized in a 3-node circular topology
+| | And '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology
+| | Then Find NDR using binary search and pps
+| | ... | ${framesize} | ${binary_min} | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc14-64B-4t4c-eth-l2xcbase-eth-4vhost-2vm-pdrdisc
 | | [Documentation]
@@ -459,15 +461,15 @@
 | | Set Test Variable | ${dut1_vm_refs}
 | | Set Test Variable | ${dut2_vm_refs}
 | | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | When  L2 xconnect with Vhost-User for '2' initialized in a 3-node circular topology
-| | And   '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology
-| | Then  Find PDR using binary search and pps
-| | ...   | ${framesize} | ${binary_min} | ${binary_max} | 3-node-xconnect
-| | ...   | ${min_rate} | ${max_rate} | ${threshold}
-| | ...   | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | When L2 xconnect with Vhost-User for '2' initialized in a 3-node circular topology
+| | And '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology
+| | 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}
 
 | tc15-1518B-4t4c-eth-l2xcbase-eth-4vhost-2vm-ndrdisc
 | | [Documentation]
@@ -488,14 +490,14 @@
 | | Set Test Variable | ${dut1_vm_refs}
 | | Set Test Variable | ${dut2_vm_refs}
 | | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | When  L2 xconnect with Vhost-User for '2' initialized in a 3-node circular topology
-| | And   '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology
-| | Then  Find NDR using binary search and pps
-| | ...   | ${framesize} | ${binary_min} | ${binary_max} | 3-node-xconnect
-| | ...   | ${min_rate} | ${max_rate} | ${threshold}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | When L2 xconnect with Vhost-User for '2' initialized in a 3-node circular topology
+| | And '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology
+| | Then Find NDR using binary search and pps
+| | ... | ${framesize} | ${binary_min} | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc16-1518B-4t4c-eth-l2xcbase-eth-4vhost-2vm-pdrdisc
 | | [Documentation]
@@ -516,15 +518,15 @@
 | | Set Test Variable | ${dut1_vm_refs}
 | | Set Test Variable | ${dut2_vm_refs}
 | | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | When  L2 xconnect with Vhost-User for '2' initialized in a 3-node circular topology
-| | And   '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology
-| | Then  Find PDR using binary search and pps
-| | ...   | ${framesize} | ${binary_min} | ${binary_max} | 3-node-xconnect
-| | ...   | ${min_rate} | ${max_rate} | ${threshold}
-| | ...   | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | When L2 xconnect with Vhost-User for '2' initialized in a 3-node circular topology
+| | And '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology
+| | 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}
 
 | tc17-IMIX-4t4c-eth-l2xcbase-eth-4vhost-2vm-ndrdisc
 | | [Documentation]
@@ -546,14 +548,14 @@
 | | Set Test Variable | ${dut1_vm_refs}
 | | Set Test Variable | ${dut2_vm_refs}
 | | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | When  L2 xconnect with Vhost-User for '2' initialized in a 3-node circular topology
-| | And   '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology
-| | Then  Find NDR using binary search and pps
-| | ...   | ${framesize} | ${binary_min} | ${binary_max} | 3-node-xconnect
-| | ...   | ${min_rate} | ${max_rate} | ${threshold}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | When L2 xconnect with Vhost-User for '2' initialized in a 3-node circular topology
+| | And '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology
+| | Then Find NDR using binary search and pps
+| | ... | ${framesize} | ${binary_min} | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc18-IMIX-4t4c-eth-l2xcbase-eth-4vhost-2vm-pdrdisc
 | | [Documentation]
@@ -575,12 +577,12 @@
 | | Set Test Variable | ${dut1_vm_refs}
 | | Set Test Variable | ${dut2_vm_refs}
 | | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | When  L2 xconnect with Vhost-User for '2' initialized in a 3-node circular topology
-| | And   '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology
-| | Then  Find PDR using binary search and pps
-| | ...   | ${framesize} | ${binary_min} | ${binary_max} | 3-node-xconnect
-| | ...   | ${min_rate} | ${max_rate} | ${threshold}
-| | ...   | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | When L2 xconnect with Vhost-User for '2' initialized in a 3-node circular topology
+| | And '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology
+| | 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}
diff --git a/tests/perf/40ge2p1xl710-eth-l2xcbase-ndrpdrdisc.robot b/tests/perf/40ge2p1xl710-eth-l2xcbase-ndrpdrdisc.robot
index 853e03fbb6..856cddfa55 100644
--- a/tests/perf/40ge2p1xl710-eth-l2xcbase-ndrpdrdisc.robot
+++ b/tests/perf/40ge2p1xl710-eth-l2xcbase-ndrpdrdisc.robot
@@ -25,7 +25,7 @@
 | ...
 | Test Setup | Performance test setup
 | Test Teardown | Performance test teardown | ${min_rate}pps | ${framesize}
-| ... | 3-node-xconnect
+| ... | ${traffic_profile}
 | ...
 | Documentation | *RFC2544: Pkt throughput L2XC test cases*
 | ...
@@ -53,6 +53,8 @@
 | ${s_24.5G} | ${24500000000}
 # XL710-DA2 Mpps limit 37.5Mpps/2=18.75Mpps
 | ${s_18.75Mpps} | ${18750000}
+# Traffic profile:
+| ${traffic_profile} | trex-sl-3n-ethip4-ip4src254
 
 *** Test Cases ***
 | tc01-64B-1t1c-eth-l2xcbase-ndrdisc
@@ -68,14 +70,13 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | 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
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | 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 binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-xconnect
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc03-1518B-1t1c-eth-l2xcbase-ndrdisc
 | | [Documentation]
@@ -90,14 +91,13 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | 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
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | 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 binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-xconnect
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc07-64B-2t2c-eth-l2xcbase-ndrdisc
 | | [Documentation]
@@ -112,14 +112,13 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | 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
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | 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 binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-xconnect
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc09-1518B-2t2c-eth-l2xcbase-ndrdisc
 | | [Documentation]
@@ -134,14 +133,13 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | 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
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | 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 binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-xconnect
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc13-64B-4t4c-eth-l2xcbase-ndrdisc
 | | [Documentation]
@@ -156,14 +154,13 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | 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
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | 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 binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-xconnect
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc15-1518B-4t4c-eth-l2xcbase-ndrdisc
 | | [Documentation]
@@ -178,14 +175,13 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | 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
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | 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 binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-xconnect
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc19-IMIX-1t1c-eth-l2xcbase-ndrdisc
 | | [Documentation]
@@ -201,14 +197,13 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | 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
+| | 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 binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-xconnect
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc20-IMIX-2t2c-eth-l2xcbase-ndrdisc
 | | [Documentation]
@@ -224,14 +219,13 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | 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
+| | 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 binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-xconnect
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc21-IMIX-4t4c-eth-l2xcbase-ndrdisc
 | | [Documentation]
@@ -247,11 +241,10 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | 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
+| | 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 binary search and pps | ${framesize} | ${binary_min}
-| | ...                                       | ${binary_max} | 3-node-xconnect
-| | ...                                       | ${min_rate} | ${max_rate}
-| | ...                                       | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
diff --git a/tests/perf/40ge2p1xl710-ethip4-ip4base-eth-4vhost-2vm-ndrpdrdisc.robot b/tests/perf/40ge2p1xl710-ethip4-ip4base-eth-4vhost-2vm-ndrpdrdisc.robot
index 0ab0f37d35..4c15189059 100644
--- a/tests/perf/40ge2p1xl710-ethip4-ip4base-eth-4vhost-2vm-ndrpdrdisc.robot
+++ b/tests/perf/40ge2p1xl710-ethip4-ip4base-eth-4vhost-2vm-ndrpdrdisc.robot
@@ -24,7 +24,7 @@
 | ...
 | Test Setup | Performance test setup
 | Test Teardown | Performance test with vhost and VM with dpdk-testpmd teardown
-| ... | ${min_rate}pps | ${framesize} | 3-node-IPv4
+| ... | ${min_rate}pps | ${framesize} | ${traffic_profile}
 | ... | dut1_node=${dut1} | dut1_vm_refs=${dut1_vm_refs}
 | ... | dut2_node=${dut2} | dut2_vm_refs=${dut2_vm_refs}
 | ...
@@ -60,10 +60,12 @@
 | ${s_24.5G} | ${24500000000}
 # XL710-DA2 Mpps limit 37.5Mpps/2=18.75Mpps
 | ${s_18.75Mpps} | ${18750000}
-#CPU settings
+# CPU settings
 | ${system_cpus}= | ${1}
 | ${vpp_cpus}= | ${5}
 | ${vm_cpus}= | ${5}
+# Traffic profile:
+| ${traffic_profile} | trex-sl-3n-ethip4-ip4src253
 
 *** Test Cases ***
 | tc01-64B-1t1c-eth-ip4base-eth-4vhost-2vm-ndrdisc
@@ -85,14 +87,14 @@
 | | Set Test Variable | ${dut1_vm_refs}
 | | Set Test Variable | ${dut2_vm_refs}
 | | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | When  IPv4 forwarding with Vhost-User for '2' VMs initialized in a 3-node circular topology
-| | And   '2' Guest VMs with dpdk-testpmd-mac connected via vhost-user is setup in a 3-node circular topology
-| | Then  Find NDR using binary search and pps
-| | ...   | ${framesize} | ${binary_min} | ${binary_max} | 3-node-IPv4
-| | ...   | ${min_rate} | ${max_rate} | ${threshold}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | When IPv4 forwarding with Vhost-User for '2' VMs initialized in a 3-node circular topology
+| | And '2' Guest VMs with dpdk-testpmd-mac connected via vhost-user is setup in a 3-node circular topology
+| | Then Find NDR using binary search and pps
+| | ... | ${framesize} | ${binary_min} | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc02-64B-1t1c-eth-ip4base-eth-4vhost-2vm-pdrdisc
 | | [Documentation]
@@ -113,15 +115,15 @@
 | | Set Test Variable | ${dut1_vm_refs}
 | | Set Test Variable | ${dut2_vm_refs}
 | | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | When  IPv4 forwarding with Vhost-User for '2' VMs initialized in a 3-node circular topology
-| | And   '2' Guest VMs with dpdk-testpmd-mac connected via vhost-user is setup in a 3-node circular topology
-| | Then  Find PDR using binary search and pps
-| | ...   | ${framesize} | ${binary_min} | ${binary_max} | 3-node-IPv4
-| | ...   | ${min_rate} | ${max_rate} | ${threshold}
-| | ...   | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | When IPv4 forwarding with Vhost-User for '2' VMs initialized in a 3-node circular topology
+| | And '2' Guest VMs with dpdk-testpmd-mac connected via vhost-user is setup in a 3-node circular topology
+| | 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}
 
 | tc03-1518B-1t1c-eth-ip4base-eth-4vhost-2vm-ndrdisc
 | | [Documentation]
@@ -142,14 +144,14 @@
 | | Set Test Variable | ${dut1_vm_refs}
 | | Set Test Variable | ${dut2_vm_refs}
 | | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | When  IPv4 forwarding with Vhost-User for '2' VMs initialized in a 3-node circular topology
-| | And   '2' Guest VMs with dpdk-testpmd-mac connected via vhost-user is setup in a 3-node circular topology
-| | Then  Find NDR using binary search and pps
-| | ...   | ${framesize} | ${binary_min} | ${binary_max} | 3-node-IPv4
-| | ...   | ${min_rate} | ${max_rate} | ${threshold}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | When IPv4 forwarding with Vhost-User for '2' VMs initialized in a 3-node circular topology
+| | And '2' Guest VMs with dpdk-testpmd-mac connected via vhost-user is setup in a 3-node circular topology
+| | Then Find NDR using binary search and pps
+| | ... | ${framesize} | ${binary_min} | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc04-1518B-1t1c-eth-ip4base-eth-4vhost-2vm-pdrdisc
 | | [Documentation]
@@ -170,15 +172,15 @@
 | | Set Test Variable | ${dut1_vm_refs}
 | | Set Test Variable | ${dut2_vm_refs}
 | | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | When  IPv4 forwarding with Vhost-User for '2' VMs initialized in a 3-node circular topology
-| | And   '2' Guest VMs with dpdk-testpmd-mac connected via vhost-user is setup in a 3-node circular topology
-| | Then  Find PDR using binary search and pps
-| | ...   | ${framesize} | ${binary_min} | ${binary_max} | 3-node-IPv4
-| | ...   | ${min_rate} | ${max_rate} | ${threshold}
-| | ...   | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | When IPv4 forwarding with Vhost-User for '2' VMs initialized in a 3-node circular topology
+| | And '2' Guest VMs with dpdk-testpmd-mac connected via vhost-user is setup in a 3-node circular topology
+| | 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}
 
 | tc05-IMIX-1t1c-eth-ip4base-eth-4vhost-2vm-ndrdisc
 | | [Documentation]
@@ -200,14 +202,14 @@
 | | Set Test Variable | ${dut1_vm_refs}
 | | Set Test Variable | ${dut2_vm_refs}
 | | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | When  IPv4 forwarding with Vhost-User for '2' VMs initialized in a 3-node circular topology
-| | And   '2' Guest VMs with dpdk-testpmd-mac connected via vhost-user is setup in a 3-node circular topology
-| | Then  Find NDR using binary search and pps
-| | ...   | ${framesize} | ${binary_min} | ${binary_max} | 3-node-IPv4
-| | ...   | ${min_rate} | ${max_rate} | ${threshold}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | When IPv4 forwarding with Vhost-User for '2' VMs initialized in a 3-node circular topology
+| | And '2' Guest VMs with dpdk-testpmd-mac connected via vhost-user is setup in a 3-node circular topology
+| | Then Find NDR using binary search and pps
+| | ... | ${framesize} | ${binary_min} | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc06-IMIX-1t1c-eth-ip4base-eth-4vhost-2vm-pdrdisc
 | | [Documentation]
@@ -229,15 +231,15 @@
 | | Set Test Variable | ${dut1_vm_refs}
 | | Set Test Variable | ${dut2_vm_refs}
 | | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | When  IPv4 forwarding with Vhost-User for '2' VMs initialized in a 3-node circular topology
-| | And   '2' Guest VMs with dpdk-testpmd-mac connected via vhost-user is setup in a 3-node circular topology
-| | Then  Find PDR using binary search and pps
-| | ...   | ${framesize} | ${binary_min} | ${binary_max} | 3-node-IPv4
-| | ...   | ${min_rate} | ${max_rate} | ${threshold}
-| | ...   | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | When IPv4 forwarding with Vhost-User for '2' VMs initialized in a 3-node circular topology
+| | And '2' Guest VMs with dpdk-testpmd-mac connected via vhost-user is setup in a 3-node circular topology
+| | 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}
 
 | tc07-64B-2t2c-eth-ip4base-eth-4vhost-2vm-ndrdisc
 | | [Documentation]
@@ -258,14 +260,14 @@
 | | Set Test Variable | ${dut1_vm_refs}
 | | Set Test Variable | ${dut2_vm_refs}
 | | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | When  IPv4 forwarding with Vhost-User for '2' VMs initialized in a 3-node circular topology
-| | And   '2' Guest VMs with dpdk-testpmd-mac connected via vhost-user is setup in a 3-node circular topology
-| | Then  Find NDR using binary search and pps
-| | ...   | ${framesize} | ${binary_min} | ${binary_max} | 3-node-IPv4
-| | ...   | ${min_rate} | ${max_rate} | ${threshold}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | When IPv4 forwarding with Vhost-User for '2' VMs initialized in a 3-node circular topology
+| | And '2' Guest VMs with dpdk-testpmd-mac connected via vhost-user is setup in a 3-node circular topology
+| | Then Find NDR using binary search and pps
+| | ... | ${framesize} | ${binary_min} | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc08-64B-2t2c-eth-ip4base-eth-4vhost-2vm-pdrdisc
 | | [Documentation]
@@ -286,15 +288,15 @@
 | | Set Test Variable | ${dut1_vm_refs}
 | | Set Test Variable | ${dut2_vm_refs}
 | | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | When  IPv4 forwarding with Vhost-User for '2' VMs initialized in a 3-node circular topology
-| | And   '2' Guest VMs with dpdk-testpmd-mac connected via vhost-user is setup in a 3-node circular topology
-| | Then  Find PDR using binary search and pps
-| | ...   | ${framesize} | ${binary_min} | ${binary_max} | 3-node-IPv4
-| | ...   | ${min_rate} | ${max_rate} | ${threshold}
-| | ...   | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | When IPv4 forwarding with Vhost-User for '2' VMs initialized in a 3-node circular topology
+| | And '2' Guest VMs with dpdk-testpmd-mac connected via vhost-user is setup in a 3-node circular topology
+| | 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}
 
 | tc09-1518B-2t2c-eth-ip4base-eth-4vhost-2vm-ndrdisc
 | | [Documentation]
@@ -315,14 +317,14 @@
 | | Set Test Variable | ${dut1_vm_refs}
 | | Set Test Variable | ${dut2_vm_refs}
 | | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | When  IPv4 forwarding with Vhost-User for '2' VMs initialized in a 3-node circular topology
-| | And   '2' Guest VMs with dpdk-testpmd-mac connected via vhost-user is setup in a 3-node circular topology
-| | Then  Find NDR using binary search and pps
-| | ...   | ${framesize} | ${binary_min} | ${binary_max} | 3-node-IPv4
-| | ...   | ${min_rate} | ${max_rate} | ${threshold}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | When IPv4 forwarding with Vhost-User for '2' VMs initialized in a 3-node circular topology
+| | And '2' Guest VMs with dpdk-testpmd-mac connected via vhost-user is setup in a 3-node circular topology
+| | Then Find NDR using binary search and pps
+| | ... | ${framesize} | ${binary_min} | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc10-1518B-2t2c-eth-ip4base-eth-4vhost-2vm-pdrdisc
 | | [Documentation]
@@ -343,15 +345,15 @@
 | | Set Test Variable | ${dut1_vm_refs}
 | | Set Test Variable | ${dut2_vm_refs}
 | | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | When  IPv4 forwarding with Vhost-User for '2' VMs initialized in a 3-node circular topology
-| | And   '2' Guest VMs with dpdk-testpmd-mac connected via vhost-user is setup in a 3-node circular topology
-| | Then  Find PDR using binary search and pps
-| | ...   | ${framesize} | ${binary_min} | ${binary_max} | 3-node-IPv4
-| | ...   | ${min_rate} | ${max_rate} | ${threshold}
-| | ...   | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | When IPv4 forwarding with Vhost-User for '2' VMs initialized in a 3-node circular topology
+| | And '2' Guest VMs with dpdk-testpmd-mac connected via vhost-user is setup in a 3-node circular topology
+| | 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}
 
 | tc11-IMIX-2t2c-eth-ip4base-eth-4vhost-2vm-ndrdisc
 | | [Documentation]
@@ -373,14 +375,14 @@
 | | Set Test Variable | ${dut1_vm_refs}
 | | Set Test Variable | ${dut2_vm_refs}
 | | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | When  IPv4 forwarding with Vhost-User for '2' VMs initialized in a 3-node circular topology
-| | And   '2' Guest VMs with dpdk-testpmd-mac connected via vhost-user is setup in a 3-node circular topology
-| | Then  Find NDR using binary search and pps
-| | ...   | ${framesize} | ${binary_min} | ${binary_max} | 3-node-IPv4
-| | ...   | ${min_rate} | ${max_rate} | ${threshold}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | When IPv4 forwarding with Vhost-User for '2' VMs initialized in a 3-node circular topology
+| | And '2' Guest VMs with dpdk-testpmd-mac connected via vhost-user is setup in a 3-node circular topology
+| | Then Find NDR using binary search and pps
+| | ... | ${framesize} | ${binary_min} | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc12-IMIX-2t2c-eth-ip4base-eth-4vhost-2vm-pdrdisc
 | | [Documentation]
@@ -402,15 +404,15 @@
 | | Set Test Variable | ${dut1_vm_refs}
 | | Set Test Variable | ${dut2_vm_refs}
 | | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | When  IPv4 forwarding with Vhost-User for '2' VMs initialized in a 3-node circular topology
-| | And   '2' Guest VMs with dpdk-testpmd-mac connected via vhost-user is setup in a 3-node circular topology
-| | Then  Find PDR using binary search and pps
-| | ...   | ${framesize} | ${binary_min} | ${binary_max} | 3-node-IPv4
-| | ...   | ${min_rate} | ${max_rate} | ${threshold}
-| | ...   | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | When IPv4 forwarding with Vhost-User for '2' VMs initialized in a 3-node circular topology
+| | And '2' Guest VMs with dpdk-testpmd-mac connected via vhost-user is setup in a 3-node circular topology
+| | 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}
 
 | tc13-64B-4t4c-eth-ip4base-eth-4vhost-2vm-ndrdisc
 | | [Documentation]
@@ -431,14 +433,14 @@
 | | Set Test Variable | ${dut1_vm_refs}
 | | Set Test Variable | ${dut2_vm_refs}
 | | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | When  IPv4 forwarding with Vhost-User for '2' VMs initialized in a 3-node circular topology
-| | And   '2' Guest VMs with dpdk-testpmd-mac connected via vhost-user is setup in a 3-node circular topology
-| | Then  Find NDR using binary search and pps
-| | ...   | ${framesize} | ${binary_min} | ${binary_max} | 3-node-IPv4
-| | ...   | ${min_rate} | ${max_rate} | ${threshold}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | When IPv4 forwarding with Vhost-User for '2' VMs initialized in a 3-node circular topology
+| | And '2' Guest VMs with dpdk-testpmd-mac connected via vhost-user is setup in a 3-node circular topology
+| | Then Find NDR using binary search and pps
+| | ... | ${framesize} | ${binary_min} | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc14-64B-4t4c-eth-ip4base-eth-4vhost-2vm-pdrdisc
 | | [Documentation]
@@ -459,15 +461,15 @@
 | | Set Test Variable | ${dut1_vm_refs}
 | | Set Test Variable | ${dut2_vm_refs}
 | | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | When  IPv4 forwarding with Vhost-User for '2' VMs initialized in a 3-node circular topology
-| | And   '2' Guest VMs with dpdk-testpmd-mac connected via vhost-user is setup in a 3-node circular topology
-| | Then  Find PDR using binary search and pps
-| | ...   | ${framesize} | ${binary_min} | ${binary_max} | 3-node-IPv4
-| | ...   | ${min_rate} | ${max_rate} | ${threshold}
-| | ...   | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | When IPv4 forwarding with Vhost-User for '2' VMs initialized in a 3-node circular topology
+| | And '2' Guest VMs with dpdk-testpmd-mac connected via vhost-user is setup in a 3-node circular topology
+| | 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}
 
 | tc15-1518B-4t4c-eth-ip4base-eth-4vhost-2vm-ndrdisc
 | | [Documentation]
@@ -488,14 +490,14 @@
 | | Set Test Variable | ${dut1_vm_refs}
 | | Set Test Variable | ${dut2_vm_refs}
 | | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | When  IPv4 forwarding with Vhost-User for '2' VMs initialized in a 3-node circular topology
-| | And   '2' Guest VMs with dpdk-testpmd-mac connected via vhost-user is setup in a 3-node circular topology
-| | Then  Find NDR using binary search and pps
-| | ...   | ${framesize} | ${binary_min} | ${binary_max} | 3-node-IPv4
-| | ...   | ${min_rate} | ${max_rate} | ${threshold}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | When IPv4 forwarding with Vhost-User for '2' VMs initialized in a 3-node circular topology
+| | And '2' Guest VMs with dpdk-testpmd-mac connected via vhost-user is setup in a 3-node circular topology
+| | Then Find NDR using binary search and pps
+| | ... | ${framesize} | ${binary_min} | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc16-1518B-4t4c-eth-ip4base-eth-4vhost-2vm-pdrdisc
 | | [Documentation]
@@ -516,15 +518,15 @@
 | | Set Test Variable | ${dut1_vm_refs}
 | | Set Test Variable | ${dut2_vm_refs}
 | | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | When  IPv4 forwarding with Vhost-User for '2' VMs initialized in a 3-node circular topology
-| | And   '2' Guest VMs with dpdk-testpmd-mac connected via vhost-user is setup in a 3-node circular topology
-| | Then  Find PDR using binary search and pps
-| | ...   | ${framesize} | ${binary_min} | ${binary_max} | 3-node-IPv4
-| | ...   | ${min_rate} | ${max_rate} | ${threshold}
-| | ...   | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | When IPv4 forwarding with Vhost-User for '2' VMs initialized in a 3-node circular topology
+| | And '2' Guest VMs with dpdk-testpmd-mac connected via vhost-user is setup in a 3-node circular topology
+| | 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}
 
 | tc17-IMIX-4t4c-eth-ip4base-eth-4vhost-2vm-ndrdisc
 | | [Documentation]
@@ -546,14 +548,14 @@
 | | Set Test Variable | ${dut1_vm_refs}
 | | Set Test Variable | ${dut2_vm_refs}
 | | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | When  IPv4 forwarding with Vhost-User for '2' VMs initialized in a 3-node circular topology
-| | And   '2' Guest VMs with dpdk-testpmd-mac connected via vhost-user is setup in a 3-node circular topology
-| | Then  Find NDR using binary search and pps
-| | ...   | ${framesize} | ${binary_min} | ${binary_max} | 3-node-IPv4
-| | ...   | ${min_rate} | ${max_rate} | ${threshold}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | When IPv4 forwarding with Vhost-User for '2' VMs initialized in a 3-node circular topology
+| | And '2' Guest VMs with dpdk-testpmd-mac connected via vhost-user is setup in a 3-node circular topology
+| | Then Find NDR using binary search and pps
+| | ... | ${framesize} | ${binary_min} | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc18-IMIX-4t4c-eth-ip4base-eth-4vhost-2vm-pdrdisc
 | | [Documentation]
@@ -575,12 +577,12 @@
 | | Set Test Variable | ${dut1_vm_refs}
 | | Set Test Variable | ${dut2_vm_refs}
 | | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
-| | When  IPv4 forwarding with Vhost-User for '2' VMs initialized in a 3-node circular topology
-| | And   '2' Guest VMs with dpdk-testpmd-mac connected via vhost-user is setup in a 3-node circular topology
-| | Then  Find PDR using binary search and pps
-| | ...   | ${framesize} | ${binary_min} | ${binary_max} | 3-node-IPv4
-| | ...   | ${min_rate} | ${max_rate} | ${threshold}
-| | ...   | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | When IPv4 forwarding with Vhost-User for '2' VMs initialized in a 3-node circular topology
+| | And '2' Guest VMs with dpdk-testpmd-mac connected via vhost-user is setup in a 3-node circular topology
+| | 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}
diff --git a/tests/perf/40ge2p1xl710-ethip4-ip4base-ndrpdrdisc.robot b/tests/perf/40ge2p1xl710-ethip4-ip4base-ndrpdrdisc.robot
index c3531d0b0a..276b260c2d 100644
--- a/tests/perf/40ge2p1xl710-ethip4-ip4base-ndrpdrdisc.robot
+++ b/tests/perf/40ge2p1xl710-ethip4-ip4base-ndrpdrdisc.robot
@@ -30,7 +30,7 @@
 | ...
 | Test Setup | Performance test setup
 | Test Teardown | Performance test teardown | ${min_rate}pps | ${framesize}
-| ... | 3-node-IPv4
+| ... | ${traffic_profile}
 | ...
 | Documentation | *RFC2544: Pkt throughput IPv4 routing test cases*
 | ...
@@ -59,6 +59,8 @@
 | ${s_24.5G} | ${24500000000}
 # XL710-DA2 Mpps limit 37.5Mpps/2=18.75Mpps
 | ${s_18.75Mpps} | ${18750000}
+# Traffic profile:
+| ${traffic_profile} | trex-sl-3n-ethip4-ip4src253
 
 *** Test Cases ***
 | tc01-64B-1t1c-ethip4-ip4base-ndrdisc
@@ -74,14 +76,13 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | 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
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | 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}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc03-1518B-1t1c-ethip4-ip4base-ndrdisc
 | | [Documentation]
@@ -96,14 +97,13 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | 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
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | 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}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc07-64B-2t2c-ethip4-ip4base-ndrdisc
 | | [Documentation]
@@ -118,14 +118,13 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | 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
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | 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}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc09-1518B-2t2c-ethip4-ip4base-ndrdisc
 | | [Documentation]
@@ -140,14 +139,13 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | 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
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | 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}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc13-64B-4t4c-ethip4-ip4base-ndrdisc
 | | [Documentation]
@@ -162,14 +160,13 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | 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
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | 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}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc15-1518B-4t4c-ethip4-ip4base-ndrdisc
 | | [Documentation]
@@ -184,14 +181,13 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | 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
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | 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}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc19-IMIX-1t1c-ethip4-ip4base-ndrdisc
 | | [Documentation]
@@ -207,14 +203,13 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | 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
+| | 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}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc20-IMIX-2t2c-ethip4-ip4base-ndrdisc
 | | [Documentation]
@@ -230,14 +225,13 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | 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
+| | 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}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc21-IMIX-4t4c-ethip4-ip4base-ndrdisc
 | | [Documentation]
@@ -253,12 +247,10 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | 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
+| | 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}
-
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
diff --git a/tests/perf/40ge2p1xl710-ethip4ipsecbasetnl-ip4base-int-aes-gcm-ndrpdrdisc.robot b/tests/perf/40ge2p1xl710-ethip4ipsecbasetnl-ip4base-int-aes-gcm-ndrpdrdisc.robot
index e4c9d346ac..253809da2c 100644
--- a/tests/perf/40ge2p1xl710-ethip4ipsecbasetnl-ip4base-int-aes-gcm-ndrpdrdisc.robot
+++ b/tests/perf/40ge2p1xl710-ethip4ipsecbasetnl-ip4base-int-aes-gcm-ndrpdrdisc.robot
@@ -26,7 +26,7 @@
 | ...
 | Test Setup | Performance test setup
 | Test Teardown | Performance test teardown | ${min_rate}pps | ${framesize}
-| ... | 3-node-IPv4-dst-${n_tunnels}
+| ... | ${traffic_profile}
 | ...
 | Documentation | *IPv4 IPsec tunnel mode performance test suite.*
 | ...
@@ -68,6 +68,9 @@
 | ${laddr_ip4}= | 10.0.0.0
 | ${addr_range}= | ${32}
 | ${ipsec_overhead_gcm}= | ${54}
+| ${n_tunnels}= | ${1}
+# Traffic profile:
+| ${traffic_profile} | trex-sl-3n-ethip4-ip4dst${n_tunnels}
 
 *** Test Cases ***
 | tc01-64B-1t1c-ethip4ipsecbasetnl-ip4base-int-aes-gcm-ndrdisc
@@ -79,7 +82,6 @@
 | | ...
 | | [Tags] | 64B | 1T1C | STHREAD | NDRDISC
 | | ...
-| | ${n_tunnels}= | Set Variable | ${1}
 | | ${framesize}= | Set Variable | ${64}
 | | ${min_rate}= | Set Variable | ${10000}
 | | ${max_rate}= | Set Variable | ${s_18.75Mpps}
@@ -100,7 +102,7 @@
 | | ... | ${encr_alg} | ${encr_key} | ${auth_alg} | ${auth_key} | ${laddr_ip4}
 | | ... | ${raddr_ip4} | ${addr_range}
 | | Then Find NDR using binary search and pps | ${framesize}
-| | ... | ${binary_min} | ${binary_max} | 3-node-IPv4-dst-${n_tunnels}
+| | ... | ${binary_min} | ${binary_max} | ${traffic_profile}
 | | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc02-64B-1t1c-ethip4ipsecbasetnl-ip4base-int-aes-gcm-pdrdisc
@@ -112,7 +114,6 @@
 | | ...
 | | [Tags] | 64B | 1T1C | STHREAD | PDRDISC | SKIP_PATCH
 | | ...
-| | ${n_tunnels}= | Set Variable | ${1}
 | | ${framesize}= | Set Variable | ${64}
 | | ${min_rate}= | Set Variable | ${10000}
 | | ${max_rate}= | Set Variable | ${s_18.75Mpps}
@@ -133,7 +134,7 @@
 | | ... | ${encr_alg} | ${encr_key} | ${auth_alg} | ${auth_key} | ${laddr_ip4}
 | | ... | ${raddr_ip4} | ${addr_range}
 | | Then Find PDR using binary search and pps | ${framesize}
-| | ... | ${binary_min} | ${binary_max} | 3-node-IPv4-dst-${n_tunnels}
+| | ... | ${binary_min} | ${binary_max} | ${traffic_profile}
 | | ... | ${min_rate} | ${max_rate} | ${threshold} | ${perf_pdr_loss_acceptance}
 | | ... | ${perf_pdr_loss_acceptance_type}
 
@@ -146,7 +147,6 @@
 | | ...
 | | [Tags] | 1518B | 1T1C | STHREAD | NDRDISC
 | | ...
-| | ${n_tunnels}= | Set Variable | ${1}
 | | ${framesize}= | Set Variable | ${1518}
 | | ${min_rate}= | Set Variable | ${10000}
 | | ${max_rate}= | Calculate pps | ${s_24.5G}
@@ -167,7 +167,7 @@
 | | ... | ${encr_alg} | ${encr_key} | ${auth_alg} | ${auth_key} | ${laddr_ip4}
 | | ... | ${raddr_ip4} | ${addr_range}
 | | Then Find NDR using binary search and pps | ${framesize}
-| | ... | ${binary_min} | ${binary_max} | 3-node-IPv4-dst-${n_tunnels}
+| | ... | ${binary_min} | ${binary_max} | ${traffic_profile}
 | | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc04-1518B-1t1c-ethip4ipsecbasetnl-ip4base-int-aes-gcm-pdrdisc
@@ -179,7 +179,6 @@
 | | ...
 | | [Tags] | 1518B | 1T1C | STHREAD | PDRDISC | SKIP_PATCH
 | | ...
-| | ${n_tunnels}= | Set Variable | ${1}
 | | ${framesize}= | Set Variable | ${1518}
 | | ${min_rate}= | Set Variable | ${10000}
 | | ${max_rate}= | Calculate pps | ${s_24.5G}
@@ -200,7 +199,7 @@
 | | ... | ${encr_alg} | ${encr_key} | ${auth_alg} | ${auth_key} | ${laddr_ip4}
 | | ... | ${raddr_ip4} | ${addr_range}
 | | Then Find PDR using binary search and pps | ${framesize}
-| | ... | ${binary_min} | ${binary_max} | 3-node-IPv4-dst-${n_tunnels}
+| | ... | ${binary_min} | ${binary_max} | ${traffic_profile}
 | | ... | ${min_rate} | ${max_rate} | ${threshold} | ${perf_pdr_loss_acceptance}
 | | ... | ${perf_pdr_loss_acceptance_type}
 
@@ -214,7 +213,6 @@
 | | ...
 | | [Tags] | IMIX | 1T1C | STHREAD | NDRDISC
 | | ...
-| | ${n_tunnels}= | Set Variable | ${1}
 | | ${framesize}= | Set Variable | IMIX_v4_1
 | | ${imix_size}= | Get Frame Size | ${framesize}
 | | ${min_rate}= | Set Variable | ${10000}
@@ -236,7 +234,7 @@
 | | ... | ${encr_alg} | ${encr_key} | ${auth_alg} | ${auth_key} | ${laddr_ip4}
 | | ... | ${raddr_ip4} | ${addr_range}
 | | Then Find NDR using binary search and pps | ${framesize}
-| | ... | ${binary_min} | ${binary_max} | 3-node-IPv4-dst-${n_tunnels}
+| | ... | ${binary_min} | ${binary_max} | ${traffic_profile}
 | | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc06-IMIX-1t1c-ethip4ipsecbasetnl-ip4base-int-aes-gcm-pdrdisc
@@ -249,7 +247,6 @@
 | | ...
 | | [Tags] | IMIX | 1T1C | STHREAD | PDRDISC | SKIP_PATCH
 | | ...
-| | ${n_tunnels}= | Set Variable | ${1}
 | | ${framesize}= | Set Variable | IMIX_v4_1
 | | ${imix_size}= | Get Frame Size | ${framesize}
 | | ${min_rate}= | Set Variable | ${10000}
@@ -271,7 +268,7 @@
 | | ... | ${encr_alg} | ${encr_key} | ${auth_alg} | ${auth_key} | ${laddr_ip4}
 | | ... | ${raddr_ip4} | ${addr_range}
 | | Then Find PDR using binary search and pps | ${framesize}
-| | ... | ${binary_min} | ${binary_max} | 3-node-IPv4-dst-${n_tunnels}
+| | ... | ${binary_min} | ${binary_max} | ${traffic_profile}
 | | ... | ${min_rate} | ${max_rate} | ${threshold} | ${perf_pdr_loss_acceptance}
 | | ... | ${perf_pdr_loss_acceptance_type}
 
@@ -284,7 +281,6 @@
 | | ...
 | | [Tags] | 64B | 2T2C | MTHREAD | NDRDISC
 | | ...
-| | ${n_tunnels}= | Set Variable | ${1}
 | | ${framesize}= | Set Variable | ${64}
 | | ${min_rate}= | Set Variable | ${10000}
 | | ${max_rate}= | Set Variable | ${s_18.75Mpps}
@@ -305,7 +301,7 @@
 | | ... | ${encr_alg} | ${encr_key} | ${auth_alg} | ${auth_key} | ${laddr_ip4}
 | | ... | ${raddr_ip4} | ${addr_range}
 | | Then Find NDR using binary search and pps | ${framesize}
-| | ... | ${binary_min} | ${binary_max} | 3-node-IPv4-dst-${n_tunnels}
+| | ... | ${binary_min} | ${binary_max} | ${traffic_profile}
 | | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc08-64B-2t2c-ethip4ipsecbasetnl-ip4base-int-aes-gcm-pdrdisc
@@ -317,7 +313,6 @@
 | | ...
 | | [Tags] | 64B | 2T2C | MTHREAD | PDRDISC | SKIP_PATCH
 | | ...
-| | ${n_tunnels}= | Set Variable | ${1}
 | | ${framesize}= | Set Variable | ${64}
 | | ${min_rate}= | Set Variable | ${10000}
 | | ${max_rate}= | Set Variable | ${s_18.75Mpps}
@@ -338,6 +333,6 @@
 | | ... | ${encr_alg} | ${encr_key} | ${auth_alg} | ${auth_key} | ${laddr_ip4}
 | | ... | ${raddr_ip4} | ${addr_range}
 | | Then Find PDR using binary search and pps | ${framesize}
-| | ... | ${binary_min} | ${binary_max} | 3-node-IPv4-dst-${n_tunnels}
+| | ... | ${binary_min} | ${binary_max} | ${traffic_profile}
 | | ... | ${min_rate} | ${max_rate} | ${threshold} | ${perf_pdr_loss_acceptance}
 | | ... | ${perf_pdr_loss_acceptance_type}
diff --git a/tests/perf/40ge2p1xl710-ethip4ipsecbasetnl-ip4base-int-cbc-sha1-ndrpdrdisc.robot b/tests/perf/40ge2p1xl710-ethip4ipsecbasetnl-ip4base-int-cbc-sha1-ndrpdrdisc.robot
index 79293964bc..5014f78ddb 100644
--- a/tests/perf/40ge2p1xl710-ethip4ipsecbasetnl-ip4base-int-cbc-sha1-ndrpdrdisc.robot
+++ b/tests/perf/40ge2p1xl710-ethip4ipsecbasetnl-ip4base-int-cbc-sha1-ndrpdrdisc.robot
@@ -26,7 +26,7 @@
 | ...
 | Test Setup | Performance test setup
 | Test Teardown | Performance test teardown | ${min_rate}pps | ${framesize}
-| ... | 3-node-IPv4-dst-${n_tunnels}
+| ... | ${traffic_profile}
 | ...
 | Documentation | *IPv4 IPsec tunnel mode performance test suite.*
 | ...
@@ -68,6 +68,9 @@
 | ${laddr_ip4}= | 10.0.0.0
 | ${addr_range}= | ${32}
 | ${ipsec_overhead}= | ${58}
+| ${n_tunnels}= | ${1}
+# Traffic profile:
+| ${traffic_profile} | trex-sl-3n-ethip4-ip4dst${n_tunnels}
 
 *** Test Cases ***
 | tc01-64B-1t1c-ethip4ipsecbasetnl-ip4base-int-cbc-sha1-ndrdisc
@@ -79,7 +82,6 @@
 | | ...
 | | [Tags] | 64B | 1T1C | STHREAD | NDRDISC
 | | ...
-| | ${n_tunnels}= | Set Variable | ${1}
 | | ${framesize}= | Set Variable | ${64}
 | | ${min_rate}= | Set Variable | ${10000}
 | | ${max_rate}= | Set Variable | ${s_18.75Mpps}
@@ -100,7 +102,7 @@
 | | ... | ${encr_alg} | ${encr_key} | ${auth_alg} | ${auth_key} | ${laddr_ip4}
 | | ... | ${raddr_ip4} | ${addr_range}
 | | Then Find NDR using binary search and pps | ${framesize}
-| | ... | ${binary_min} | ${binary_max} | 3-node-IPv4-dst-${n_tunnels}
+| | ... | ${binary_min} | ${binary_max} | ${traffic_profile}
 | | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc02-64B-1t1c-ethip4ipsecbasetnl-ip4base-int-cbc-sha1-pdrdisc
@@ -112,7 +114,6 @@
 | | ...
 | | [Tags] | 64B | 1T1C | STHREAD | PDRDISC | SKIP_PATCH
 | | ...
-| | ${n_tunnels}= | Set Variable | ${1}
 | | ${framesize}= | Set Variable | ${64}
 | | ${min_rate}= | Set Variable | ${10000}
 | | ${max_rate}= | Set Variable | ${s_18.75Mpps}
@@ -133,7 +134,7 @@
 | | ... | ${encr_alg} | ${encr_key} | ${auth_alg} | ${auth_key} | ${laddr_ip4}
 | | ... | ${raddr_ip4} | ${addr_range}
 | | Then Find PDR using binary search and pps | ${framesize}
-| | ... | ${binary_min} | ${binary_max} | 3-node-IPv4-dst-${n_tunnels}
+| | ... | ${binary_min} | ${binary_max} | ${traffic_profile}
 | | ... | ${min_rate} | ${max_rate} | ${threshold} | ${perf_pdr_loss_acceptance}
 | | ... | ${perf_pdr_loss_acceptance_type}
 
@@ -146,7 +147,6 @@
 | | ...
 | | [Tags] | 1518B | 1T1C | STHREAD | NDRDISC
 | | ...
-| | ${n_tunnels}= | Set Variable | ${1}
 | | ${framesize}= | Set Variable | ${1518}
 | | ${min_rate}= | Set Variable | ${10000}
 | | ${max_rate}= | Calculate pps | ${s_24.5G} | ${framesize + ${ipsec_overhead}}
@@ -166,7 +166,7 @@
 | | ... | ${encr_alg} | ${encr_key} | ${auth_alg} | ${auth_key} | ${laddr_ip4}
 | | ... | ${raddr_ip4} | ${addr_range}
 | | Then Find NDR using binary search and pps | ${framesize}
-| | ... | ${binary_min} | ${binary_max} | 3-node-IPv4-dst-${n_tunnels}
+| | ... | ${binary_min} | ${binary_max} | ${traffic_profile}
 | | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc04-1518B-1t1c-ethip4ipsecbasetnl-ip4base-int-cbc-sha1-pdrdisc
@@ -178,7 +178,6 @@
 | | ...
 | | [Tags] | 1518B | 1T1C | STHREAD | PDRDISC | SKIP_PATCH
 | | ...
-| | ${n_tunnels}= | Set Variable | ${1}
 | | ${framesize}= | Set Variable | ${1518}
 | | ${min_rate}= | Set Variable | ${10000}
 | | ${max_rate}= | Calculate pps | ${s_24.5G} | ${framesize + ${ipsec_overhead}}
@@ -198,7 +197,7 @@
 | | ... | ${encr_alg} | ${encr_key} | ${auth_alg} | ${auth_key} | ${laddr_ip4}
 | | ... | ${raddr_ip4} | ${addr_range}
 | | Then Find PDR using binary search and pps | ${framesize}
-| | ... | ${binary_min} | ${binary_max} | 3-node-IPv4-dst-${n_tunnels}
+| | ... | ${binary_min} | ${binary_max} | ${traffic_profile}
 | | ... | ${min_rate} | ${max_rate} | ${threshold} | ${perf_pdr_loss_acceptance}
 | | ... | ${perf_pdr_loss_acceptance_type}
 
@@ -212,7 +211,6 @@
 | | ...
 | | [Tags] | IMIX | 1T1C | STHREAD | NDRDISC
 | | ...
-| | ${n_tunnels}= | Set Variable | ${1}
 | | ${framesize}= | Set Variable | IMIX_v4_1
 | | ${imix_size}= | Get Frame Size | ${framesize}
 | | ${min_rate}= | Set Variable | ${10000}
@@ -233,7 +231,7 @@
 | | ... | ${encr_alg} | ${encr_key} | ${auth_alg} | ${auth_key} | ${laddr_ip4}
 | | ... | ${raddr_ip4} | ${addr_range}
 | | Then Find NDR using binary search and pps | ${framesize}
-| | ... | ${binary_min} | ${binary_max} | 3-node-IPv4-dst-${n_tunnels}
+| | ... | ${binary_min} | ${binary_max} | ${traffic_profile}
 | | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc06-IMIX-1t1c-ethip4ipsecbasetnl-ip4base-int-cbc-sha1-pdrdisc
@@ -246,7 +244,6 @@
 | | ...
 | | [Tags] | IMIX | 1T1C | STHREAD | PDRDISC | SKIP_PATCH
 | | ...
-| | ${n_tunnels}= | Set Variable | ${1}
 | | ${framesize}= | Set Variable | IMIX_v4_1
 | | ${imix_size}= | Get Frame Size | ${framesize}
 | | ${min_rate}= | Set Variable | ${10000}
@@ -267,7 +264,7 @@
 | | ... | ${encr_alg} | ${encr_key} | ${auth_alg} | ${auth_key} | ${laddr_ip4}
 | | ... | ${raddr_ip4} | ${addr_range}
 | | Then Find PDR using binary search and pps | ${framesize}
-| | ... | ${binary_min} | ${binary_max} | 3-node-IPv4-dst-${n_tunnels}
+| | ... | ${binary_min} | ${binary_max} | ${traffic_profile}
 | | ... | ${min_rate} | ${max_rate} | ${threshold} | ${perf_pdr_loss_acceptance}
 | | ... | ${perf_pdr_loss_acceptance_type}
 
@@ -280,7 +277,6 @@
 | | ...
 | | [Tags] | 64B | 2T2C | MTHREAD | NDRDISC
 | | ...
-| | ${n_tunnels}= | Set Variable | ${1}
 | | ${framesize}= | Set Variable | ${64}
 | | ${min_rate}= | Set Variable | ${10000}
 | | ${max_rate}= | Set Variable | ${s_18.75Mpps}
@@ -301,7 +297,7 @@
 | | ... | ${encr_alg} | ${encr_key} | ${auth_alg} | ${auth_key} | ${laddr_ip4}
 | | ... | ${raddr_ip4} | ${addr_range}
 | | Then Find NDR using binary search and pps | ${framesize}
-| | ... | ${binary_min} | ${binary_max} | 3-node-IPv4-dst-${n_tunnels}
+| | ... | ${binary_min} | ${binary_max} | ${traffic_profile}
 | | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc08-64B-2t2c-ethip4ipsecbasetnl-ip4base-int-cbc-sha1-pdrdisc
@@ -313,7 +309,6 @@
 | | ...
 | | [Tags] | 64B | 2T2C | MTHREAD | PDRDISC | SKIP_PATCH
 | | ...
-| | ${n_tunnels}= | Set Variable | ${1}
 | | ${framesize}= | Set Variable | ${64}
 | | ${min_rate}= | Set Variable | ${10000}
 | | ${max_rate}= | Set Variable | ${s_18.75Mpps}
@@ -334,6 +329,6 @@
 | | ... | ${encr_alg} | ${encr_key} | ${auth_alg} | ${auth_key} | ${laddr_ip4}
 | | ... | ${raddr_ip4} | ${addr_range}
 | | Then Find PDR using binary search and pps | ${framesize}
-| | ... | ${binary_min} | ${binary_max} | 3-node-IPv4-dst-${n_tunnels}
+| | ... | ${binary_min} | ${binary_max} | ${traffic_profile}
 | | ... | ${min_rate} | ${max_rate} | ${threshold} | ${perf_pdr_loss_acceptance}
 | | ... | ${perf_pdr_loss_acceptance_type}
diff --git a/tests/perf/40ge2p1xl710-ethip4ipsecbasetnl-ip4base-tnl-aes-gcm-ndrpdrdisc.robot b/tests/perf/40ge2p1xl710-ethip4ipsecbasetnl-ip4base-tnl-aes-gcm-ndrpdrdisc.robot
index 3cbdd4a389..a6f0985ffd 100644
--- a/tests/perf/40ge2p1xl710-ethip4ipsecbasetnl-ip4base-tnl-aes-gcm-ndrpdrdisc.robot
+++ b/tests/perf/40ge2p1xl710-ethip4ipsecbasetnl-ip4base-tnl-aes-gcm-ndrpdrdisc.robot
@@ -26,7 +26,7 @@
 | ...
 | Test Setup | Performance test setup
 | Test Teardown | Performance test teardown | ${min_rate}pps | ${framesize}
-| ... | 3-node-IPv4-dst-${n_tunnels}
+| ... | ${traffic_profile}
 | ...
 | Documentation | *IPv4 IPsec tunnel mode performance test suite.*
 | ...
@@ -68,6 +68,9 @@
 | ${laddr_ip4}= | 10.0.0.0
 | ${addr_range}= | ${32}
 | ${ipsec_overhead_gcm}= | ${54}
+| ${n_tunnels}= | ${1}
+# Traffic profile:
+| ${traffic_profile} | trex-sl-3n-ethip4-ip4dst${n_tunnels}
 
 *** Test Cases ***
 | tc01-64B-1t1c-ethip4ipsecbasetnl-ip4base-tnl-aes-gcm-ndrdisc
@@ -79,7 +82,6 @@
 | | ...
 | | [Tags] | 64B | 1T1C | STHREAD | NDRDISC
 | | ...
-| | ${n_tunnels}= | Set Variable | ${1}
 | | ${framesize}= | Set Variable | ${64}
 | | ${min_rate}= | Set Variable | ${10000}
 | | ${max_rate}= | Set Variable | ${s_18.75Mpps}
@@ -103,7 +105,7 @@
 | | ... | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${laddr_ip4} | ${raddr_ip4}
 | | ... | ${addr_range}
 | | Then Find NDR using binary search and pps | ${framesize}
-| | ... | ${binary_min} | ${binary_max} | 3-node-IPv4-dst-${n_tunnels}
+| | ... | ${binary_min} | ${binary_max} | ${traffic_profile}
 | | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc02-64B-1t1c-ethip4ipsecbasetnl-ip4base-tnl-aes-gcm-pdrdisc
@@ -115,7 +117,6 @@
 | | ...
 | | [Tags] | 64B | 1T1C | STHREAD | PDRDISC | SKIP_PATCH
 | | ...
-| | ${n_tunnels}= | Set Variable | ${1}
 | | ${framesize}= | Set Variable | ${64}
 | | ${min_rate}= | Set Variable | ${10000}
 | | ${max_rate}= | Set Variable | ${s_18.75Mpps}
@@ -139,7 +140,7 @@
 | | ... | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${laddr_ip4} | ${raddr_ip4}
 | | ... | ${addr_range}
 | | Then Find PDR using binary search and pps | ${framesize}
-| | ... | ${binary_min} | ${binary_max} | 3-node-IPv4-dst-${n_tunnels}
+| | ... | ${binary_min} | ${binary_max} | ${traffic_profile}
 | | ... | ${min_rate} | ${max_rate} | ${threshold} | ${perf_pdr_loss_acceptance}
 | | ... | ${perf_pdr_loss_acceptance_type}
 
@@ -152,7 +153,6 @@
 | | ...
 | | [Tags] | 1518B | 1T1C | STHREAD | NDRDISC
 | | ...
-| | ${n_tunnels}= | Set Variable | ${1}
 | | ${framesize}= | Set Variable | ${1518}
 | | ${min_rate}= | Set Variable | ${10000}
 | | ${max_rate}= | Calculate pps | ${s_24.5G}
@@ -176,7 +176,7 @@
 | | ... | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${laddr_ip4} | ${raddr_ip4}
 | | ... | ${addr_range}
 | | Then Find NDR using binary search and pps | ${framesize}
-| | ... | ${binary_min} | ${binary_max} | 3-node-IPv4-dst-${n_tunnels}
+| | ... | ${binary_min} | ${binary_max} | ${traffic_profile}
 | | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc04-1518B-1t1c-ethip4ipsecbasetnl-ip4base-tnl-aes-gcm-pdrdisc
@@ -188,7 +188,6 @@
 | | ...
 | | [Tags] | 1518B | 1T1C | STHREAD | PDRDISC | SKIP_PATCH
 | | ...
-| | ${n_tunnels}= | Set Variable | ${1}
 | | ${framesize}= | Set Variable | ${1518}
 | | ${min_rate}= | Set Variable | ${10000}
 | | ${max_rate}= | Calculate pps | ${s_24.5G}
@@ -212,7 +211,7 @@
 | | ... | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${laddr_ip4} | ${raddr_ip4}
 | | ... | ${addr_range}
 | | Then Find PDR using binary search and pps | ${framesize}
-| | ... | ${binary_min} | ${binary_max} | 3-node-IPv4-dst-${n_tunnels}
+| | ... | ${binary_min} | ${binary_max} | ${traffic_profile}
 | | ... | ${min_rate} | ${max_rate} | ${threshold} | ${perf_pdr_loss_acceptance}
 | | ... | ${perf_pdr_loss_acceptance_type}
 
@@ -226,7 +225,6 @@
 | | ...
 | | [Tags] | IMIX | 1T1C | STHREAD | NDRDISC
 | | ...
-| | ${n_tunnels}= | Set Variable | ${1}
 | | ${framesize}= | Set Variable | IMIX_v4_1
 | | ${imix_size}= | Get Frame Size | ${framesize}
 | | ${min_rate}= | Set Variable | ${10000}
@@ -251,7 +249,7 @@
 | | ... | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${laddr_ip4} | ${raddr_ip4}
 | | ... | ${addr_range}
 | | Then Find NDR using binary search and pps | ${framesize}
-| | ... | ${binary_min} | ${binary_max} | 3-node-IPv4-dst-${n_tunnels}
+| | ... | ${binary_min} | ${binary_max} | ${traffic_profile}
 | | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc06-IMIX-1t1c-ethip4ipsecbasetnl-ip4base-tnl-aes-gcm-pdrdisc
@@ -264,7 +262,6 @@
 | | ...
 | | [Tags] | IMIX | 1T1C | STHREAD | PDRDISC | SKIP_PATCH
 | | ...
-| | ${n_tunnels}= | Set Variable | ${1}
 | | ${framesize}= | Set Variable | IMIX_v4_1
 | | ${imix_size}= | Get Frame Size | ${framesize}
 | | ${min_rate}= | Set Variable | ${10000}
@@ -289,7 +286,7 @@
 | | ... | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${laddr_ip4} | ${raddr_ip4}
 | | ... | ${addr_range}
 | | Then Find PDR using binary search and pps | ${framesize}
-| | ... | ${binary_min} | ${binary_max} | 3-node-IPv4-dst-${n_tunnels}
+| | ... | ${binary_min} | ${binary_max} | ${traffic_profile}
 | | ... | ${min_rate} | ${max_rate} | ${threshold} | ${perf_pdr_loss_acceptance}
 | | ... | ${perf_pdr_loss_acceptance_type}
 
@@ -302,7 +299,6 @@
 | | ...
 | | [Tags] | 64B | 2T2C | MTHREAD | NDRDISC
 | | ...
-| | ${n_tunnels}= | Set Variable | ${1}
 | | ${framesize}= | Set Variable | ${64}
 | | ${min_rate}= | Set Variable | ${10000}
 | | ${max_rate}= | Set Variable | ${s_18.75Mpps}
@@ -326,7 +322,7 @@
 | | ... | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${laddr_ip4} | ${raddr_ip4}
 | | ... | ${addr_range}
 | | Then Find NDR using binary search and pps | ${framesize}
-| | ... | ${binary_min} | ${binary_max} | 3-node-IPv4-dst-${n_tunnels}
+| | ... | ${binary_min} | ${binary_max} | ${traffic_profile}
 | | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc08-64B-2t2c-ethip4ipsecbasetnl-ip4base-tnl-aes-gcm-pdrdisc
@@ -338,7 +334,6 @@
 | | ...
 | | [Tags] | 64B | 2T2C | MTHREAD | PDRDISC | SKIP_PATCH
 | | ...
-| | ${n_tunnels}= | Set Variable | ${1}
 | | ${framesize}= | Set Variable | ${64}
 | | ${min_rate}= | Set Variable | ${10000}
 | | ${max_rate}= | Set Variable | ${s_18.75Mpps}
@@ -362,6 +357,6 @@
 | | ... | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${laddr_ip4} | ${raddr_ip4}
 | | ... | ${addr_range}
 | | Then Find PDR using binary search and pps | ${framesize}
-| | ... | ${binary_min} | ${binary_max} | 3-node-IPv4-dst-${n_tunnels}
+| | ... | ${binary_min} | ${binary_max} | ${traffic_profile}
 | | ... | ${min_rate} | ${max_rate} | ${threshold} | ${perf_pdr_loss_acceptance}
 | | ... | ${perf_pdr_loss_acceptance_type}
diff --git a/tests/perf/40ge2p1xl710-ethip4ipsecbasetnl-ip4base-tnl-cbc-sha1-ndrpdrdisc.robot b/tests/perf/40ge2p1xl710-ethip4ipsecbasetnl-ip4base-tnl-cbc-sha1-ndrpdrdisc.robot
index c0a1ab8e8a..b77d42f1f6 100644
--- a/tests/perf/40ge2p1xl710-ethip4ipsecbasetnl-ip4base-tnl-cbc-sha1-ndrpdrdisc.robot
+++ b/tests/perf/40ge2p1xl710-ethip4ipsecbasetnl-ip4base-tnl-cbc-sha1-ndrpdrdisc.robot
@@ -26,7 +26,7 @@
 | ...
 | Test Setup | Performance test setup
 | Test Teardown | Performance test teardown | ${min_rate}pps | ${framesize}
-| ... | 3-node-IPv4-dst-${n_tunnels}
+| ... | ${traffic_profile}
 | ...
 | Documentation | *IPv4 IPsec tunnel mode performance test suite.*
 | ...
@@ -68,6 +68,9 @@
 | ${laddr_ip4}= | 10.0.0.0
 | ${addr_range}= | ${32}
 | ${ipsec_overhead}= | ${58}
+| ${n_tunnels}= | ${1}
+# Traffic profile:
+| ${traffic_profile} | trex-sl-3n-ethip4-ip4dst${n_tunnels}
 
 *** Test Cases ***
 | tc01-64B-1t1c-ethip4ipsecbasetnl-ip4base-tnl-cbc-sha1-ndrdisc
@@ -79,7 +82,6 @@
 | | ...
 | | [Tags] | 64B | 1T1C | STHREAD | NDRDISC
 | | ...
-| | ${n_tunnels}= | Set Variable | ${1}
 | | ${framesize}= | Set Variable | ${64}
 | | ${min_rate}= | Set Variable | ${10000}
 | | ${max_rate}= | Set Variable | ${s_18.75Mpps}
@@ -103,7 +105,7 @@
 | | ... | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${laddr_ip4} | ${raddr_ip4}
 | | ... | ${addr_range}
 | | Then Find NDR using binary search and pps | ${framesize}
-| | ... | ${binary_min} | ${binary_max} | 3-node-IPv4-dst-${n_tunnels}
+| | ... | ${binary_min} | ${binary_max} | ${traffic_profile}
 | | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc02-64B-1t1c-ethip4ipsecbasetnl-ip4base-tnl-cbc-sha1-pdrdisc
@@ -115,7 +117,6 @@
 | | ...
 | | [Tags] | 64B | 1T1C | STHREAD | PDRDISC | SKIP_PATCH
 | | ...
-| | ${n_tunnels}= | Set Variable | ${1}
 | | ${framesize}= | Set Variable | ${64}
 | | ${min_rate}= | Set Variable | ${10000}
 | | ${max_rate}= | Set Variable | ${s_18.75Mpps}
@@ -139,7 +140,7 @@
 | | ... | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${laddr_ip4} | ${raddr_ip4}
 | | ... | ${addr_range}
 | | Then Find PDR using binary search and pps | ${framesize}
-| | ... | ${binary_min} | ${binary_max} | 3-node-IPv4-dst-${n_tunnels}
+| | ... | ${binary_min} | ${binary_max} | ${traffic_profile}
 | | ... | ${min_rate} | ${max_rate} | ${threshold} | ${perf_pdr_loss_acceptance}
 | | ... | ${perf_pdr_loss_acceptance_type}
 
@@ -152,7 +153,6 @@
 | | ...
 | | [Tags] | 1518B | 1T1C | STHREAD | NDRDISC
 | | ...
-| | ${n_tunnels}= | Set Variable | ${1}
 | | ${framesize}= | Set Variable | ${1518}
 | | ${min_rate}= | Set Variable | ${10000}
 | | ${max_rate}= | Calculate pps | ${s_24.5G} | ${framesize + ${ipsec_overhead}}
@@ -175,7 +175,7 @@
 | | ... | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${laddr_ip4} | ${raddr_ip4}
 | | ... | ${addr_range}
 | | Then Find NDR using binary search and pps | ${framesize}
-| | ... | ${binary_min} | ${binary_max} | 3-node-IPv4-dst-${n_tunnels}
+| | ... | ${binary_min} | ${binary_max} | ${traffic_profile}
 | | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc04-1518B-1t1c-ethip4ipsecbasetnl-ip4base-tnl-cbc-sha1-pdrdisc
@@ -187,7 +187,6 @@
 | | ...
 | | [Tags] | 1518B | 1T1C | STHREAD | PDRDISC | SKIP_PATCH
 | | ...
-| | ${n_tunnels}= | Set Variable | ${1}
 | | ${framesize}= | Set Variable | ${1518}
 | | ${min_rate}= | Set Variable | ${10000}
 | | ${max_rate}= | Calculate pps | ${s_24.5G} | ${framesize + ${ipsec_overhead}}
@@ -210,7 +209,7 @@
 | | ... | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${laddr_ip4} | ${raddr_ip4}
 | | ... | ${addr_range}
 | | Then Find PDR using binary search and pps | ${framesize}
-| | ... | ${binary_min} | ${binary_max} | 3-node-IPv4-dst-${n_tunnels}
+| | ... | ${binary_min} | ${binary_max} | ${traffic_profile}
 | | ... | ${min_rate} | ${max_rate} | ${threshold} | ${perf_pdr_loss_acceptance}
 | | ... | ${perf_pdr_loss_acceptance_type}
 
@@ -224,7 +223,6 @@
 | | ...
 | | [Tags] | IMIX | 1T1C | STHREAD | NDRDISC
 | | ...
-| | ${n_tunnels}= | Set Variable | ${1}
 | | ${framesize}= | Set Variable | IMIX_v4_1
 | | ${imix_size}= | Get Frame Size | ${framesize}
 | | ${min_rate}= | Set Variable | ${10000}
@@ -248,7 +246,7 @@
 | | ... | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${laddr_ip4} | ${raddr_ip4}
 | | ... | ${addr_range}
 | | Then Find NDR using binary search and pps | ${framesize}
-| | ... | ${binary_min} | ${binary_max} | 3-node-IPv4-dst-${n_tunnels}
+| | ... | ${binary_min} | ${binary_max} | ${traffic_profile}
 | | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc06-IMIX-1t1c-ethip4ipsecbasetnl-ip4base-tnl-cbc-sha1-pdrdisc
@@ -261,7 +259,6 @@
 | | ...
 | | [Tags] | IMIX | 1T1C | STHREAD | PDRDISC | SKIP_PATCH
 | | ...
-| | ${n_tunnels}= | Set Variable | ${1}
 | | ${framesize}= | Set Variable | IMIX_v4_1
 | | ${imix_size}= | Get Frame Size | ${framesize}
 | | ${min_rate}= | Set Variable | ${10000}
@@ -285,7 +282,7 @@
 | | ... | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${laddr_ip4} | ${raddr_ip4}
 | | ... | ${addr_range}
 | | Then Find PDR using binary search and pps | ${framesize}
-| | ... | ${binary_min} | ${binary_max} | 3-node-IPv4-dst-${n_tunnels}
+| | ... | ${binary_min} | ${binary_max} | ${traffic_profile}
 | | ... | ${min_rate} | ${max_rate} | ${threshold} | ${perf_pdr_loss_acceptance}
 | | ... | ${perf_pdr_loss_acceptance_type}
 
@@ -298,7 +295,6 @@
 | | ...
 | | [Tags] | 64B | 2T2C | MTHREAD | NDRDISC
 | | ...
-| | ${n_tunnels}= | Set Variable | ${1}
 | | ${framesize}= | Set Variable | ${64}
 | | ${min_rate}= | Set Variable | ${10000}
 | | ${max_rate}= | Set Variable | ${s_18.75Mpps}
@@ -322,7 +318,7 @@
 | | ... | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${laddr_ip4} | ${raddr_ip4}
 | | ... | ${addr_range}
 | | Then Find NDR using binary search and pps | ${framesize}
-| | ... | ${binary_min} | ${binary_max} | 3-node-IPv4-dst-${n_tunnels}
+| | ... | ${binary_min} | ${binary_max} | ${traffic_profile}
 | | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc08-64B-2t2c-ethip4ipsecbasetnl-ip4base-tnl-cbc-sha1-pdrdisc
@@ -334,7 +330,6 @@
 | | ...
 | | [Tags] | 64B | 2T2C | MTHREAD | PDRDISC | SKIP_PATCH
 | | ...
-| | ${n_tunnels}= | Set Variable | ${1}
 | | ${framesize}= | Set Variable | ${64}
 | | ${min_rate}= | Set Variable | ${10000}
 | | ${max_rate}= | Set Variable | ${s_18.75Mpps}
@@ -358,6 +353,6 @@
 | | ... | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${laddr_ip4} | ${raddr_ip4}
 | | ... | ${addr_range}
 | | Then Find PDR using binary search and pps | ${framesize}
-| | ... | ${binary_min} | ${binary_max} | 3-node-IPv4-dst-${n_tunnels}
+| | ... | ${binary_min} | ${binary_max} | ${traffic_profile}
 | | ... | ${min_rate} | ${max_rate} | ${threshold} | ${perf_pdr_loss_acceptance}
 | | ... | ${perf_pdr_loss_acceptance_type}
diff --git a/tests/perf/40ge2p1xl710-ethip4ipsecscale1000tnl-ip4base-int-aes-gcm-ndrpdrdisc.robot b/tests/perf/40ge2p1xl710-ethip4ipsecscale1000tnl-ip4base-int-aes-gcm-ndrpdrdisc.robot
index 76c6fbbb09..333ce19998 100644
--- a/tests/perf/40ge2p1xl710-ethip4ipsecscale1000tnl-ip4base-int-aes-gcm-ndrpdrdisc.robot
+++ b/tests/perf/40ge2p1xl710-ethip4ipsecscale1000tnl-ip4base-int-aes-gcm-ndrpdrdisc.robot
@@ -26,7 +26,7 @@
 | ...
 | Test Setup | Performance test setup
 | Test Teardown | Performance test teardown | ${min_rate}pps | ${framesize}
-| ... | 3-node-IPv4-dst-${n_tunnels}
+| ... | ${traffic_profile}
 | ...
 | Documentation | *IPv4 IPsec tunnel mode performance test suite.*
 | ...
@@ -68,6 +68,9 @@
 | ${laddr_ip4}= | 10.0.0.0
 | ${addr_range}= | ${32}
 | ${ipsec_overhead_gcm}= | ${54}
+| ${n_tunnels}= | ${1000}
+# Traffic profile:
+| ${traffic_profile} | trex-sl-3n-ethip4-ip4dst${n_tunnels}
 
 *** Test Cases ***
 | tc01-64B-1t1c-ethip4ipsecscale1000tnl-ip4base-int-aes-gcm-ndrdisc
@@ -79,7 +82,6 @@
 | | ...
 | | [Tags] | 64B | 1T1C | STHREAD | NDRDISC
 | | ...
-| | ${n_tunnels}= | Set Variable | ${1000}
 | | ${framesize}= | Set Variable | ${64}
 | | ${min_rate}= | Set Variable | ${10000}
 | | ${max_rate}= | Set Variable | ${s_18.75Mpps}
@@ -100,7 +102,7 @@
 | | ... | ${encr_alg} | ${encr_key} | ${auth_alg} | ${auth_key} | ${laddr_ip4}
 | | ... | ${raddr_ip4} | ${addr_range}
 | | Then Find NDR using binary search and pps | ${framesize}
-| | ... | ${binary_min} | ${binary_max} | 3-node-IPv4-dst-${n_tunnels}
+| | ... | ${binary_min} | ${binary_max} | ${traffic_profile}
 | | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc02-64B-1t1c-ethip4ipsecscale1000tnl-ip4base-int-aes-gcm-pdrdisc
@@ -112,7 +114,6 @@
 | | ...
 | | [Tags] | 64B | 1T1C | STHREAD | PDRDISC | SKIP_PATCH
 | | ...
-| | ${n_tunnels}= | Set Variable | ${1000}
 | | ${framesize}= | Set Variable | ${64}
 | | ${min_rate}= | Set Variable | ${10000}
 | | ${max_rate}= | Set Variable | ${s_18.75Mpps}
@@ -133,7 +134,7 @@
 | | ... | ${encr_alg} | ${encr_key} | ${auth_alg} | ${auth_key} | ${laddr_ip4}
 | | ... | ${raddr_ip4} | ${addr_range}
 | | Then Find PDR using binary search and pps | ${framesize}
-| | ... | ${binary_min} | ${binary_max} | 3-node-IPv4-dst-${n_tunnels}
+| | ... | ${binary_min} | ${binary_max} | ${traffic_profile}
 | | ... | ${min_rate} | ${max_rate} | ${threshold} | ${perf_pdr_loss_acceptance}
 | | ... | ${perf_pdr_loss_acceptance_type}
 
@@ -146,7 +147,6 @@
 | | ...
 | | [Tags] | 1518B | 1T1C | STHREAD | NDRDISC
 | | ...
-| | ${n_tunnels}= | Set Variable | ${1000}
 | | ${framesize}= | Set Variable | ${1518}
 | | ${min_rate}= | Set Variable | ${10000}
 | | ${max_rate}= | Calculate pps | ${s_24.5G}
@@ -167,7 +167,7 @@
 | | ... | ${encr_alg} | ${encr_key} | ${auth_alg} | ${auth_key} | ${laddr_ip4}
 | | ... | ${raddr_ip4} | ${addr_range}
 | | Then Find NDR using binary search and pps | ${framesize}
-| | ... | ${binary_min} | ${binary_max} | 3-node-IPv4-dst-${n_tunnels}
+| | ... | ${binary_min} | ${binary_max} | ${traffic_profile}
 | | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc04-1518B-1t1c-ethip4ipsecscale1000tnl-ip4base-int-aes-gcm-pdrdisc
@@ -179,7 +179,6 @@
 | | ...
 | | [Tags] | 1518B | 1T1C | STHREAD | PDRDISC | SKIP_PATCH
 | | ...
-| | ${n_tunnels}= | Set Variable | ${1000}
 | | ${framesize}= | Set Variable | ${1518}
 | | ${min_rate}= | Set Variable | ${10000}
 | | ${max_rate}= | Calculate pps | ${s_24.5G}
@@ -200,7 +199,7 @@
 | | ... | ${encr_alg} | ${encr_key} | ${auth_alg} | ${auth_key} | ${laddr_ip4}
 | | ... | ${raddr_ip4} | ${addr_range}
 | | Then Find PDR using binary search and pps | ${framesize}
-| | ... | ${binary_min} | ${binary_max} | 3-node-IPv4-dst-${n_tunnels}
+| | ... | ${binary_min} | ${binary_max} | ${traffic_profile}
 | | ... | ${min_rate} | ${max_rate} | ${threshold} | ${perf_pdr_loss_acceptance}
 | | ... | ${perf_pdr_loss_acceptance_type}
 
@@ -214,7 +213,6 @@
 | | ...
 | | [Tags] | IMIX | 1T1C | STHREAD | NDRDISC
 | | ...
-| | ${n_tunnels}= | Set Variable | ${1000}
 | | ${framesize}= | Set Variable | IMIX_v4_1
 | | ${imix_size}= | Get Frame Size | ${framesize}
 | | ${min_rate}= | Set Variable | ${10000}
@@ -236,7 +234,7 @@
 | | ... | ${encr_alg} | ${encr_key} | ${auth_alg} | ${auth_key} | ${laddr_ip4}
 | | ... | ${raddr_ip4} | ${addr_range}
 | | Then Find NDR using binary search and pps | ${framesize}
-| | ... | ${binary_min} | ${binary_max} | 3-node-IPv4-dst-${n_tunnels}
+| | ... | ${binary_min} | ${binary_max} | ${traffic_profile}
 | | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc06-IMIX-1t1c-ethip4ipsecscale1000tnl-ip4base-int-aes-gcm-pdrdisc
@@ -249,7 +247,6 @@
 | | ...
 | | [Tags] | IMIX | 1T1C | STHREAD | PDRDISC | SKIP_PATCH
 | | ...
-| | ${n_tunnels}= | Set Variable | ${1000}
 | | ${framesize}= | Set Variable | IMIX_v4_1
 | | ${imix_size}= | Get Frame Size | ${framesize}
 | | ${min_rate}= | Set Variable | ${10000}
@@ -271,7 +268,7 @@
 | | ... | ${encr_alg} | ${encr_key} | ${auth_alg} | ${auth_key} | ${laddr_ip4}
 | | ... | ${raddr_ip4} | ${addr_range}
 | | Then Find PDR using binary search and pps | ${framesize}
-| | ... | ${binary_min} | ${binary_max} | 3-node-IPv4-dst-${n_tunnels}
+| | ... | ${binary_min} | ${binary_max} | ${traffic_profile}
 | | ... | ${min_rate} | ${max_rate} | ${threshold} | ${perf_pdr_loss_acceptance}
 | | ... | ${perf_pdr_loss_acceptance_type}
 
@@ -284,7 +281,6 @@
 | | ...
 | | [Tags] | 64B | 2T2C | MTHREAD | NDRDISC
 | | ...
-| | ${n_tunnels}= | Set Variable | ${1000}
 | | ${framesize}= | Set Variable | ${64}
 | | ${min_rate}= | Set Variable | ${10000}
 | | ${max_rate}= | Set Variable | ${s_18.75Mpps}
@@ -305,7 +301,7 @@
 | | ... | ${encr_alg} | ${encr_key} | ${auth_alg} | ${auth_key} | ${laddr_ip4}
 | | ... | ${raddr_ip4} | ${addr_range}
 | | Then Find NDR using binary search and pps | ${framesize}
-| | ... | ${binary_min} | ${binary_max} | 3-node-IPv4-dst-${n_tunnels}
+| | ... | ${binary_min} | ${binary_max} | ${traffic_profile}
 | | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc08-64B-2t2c-ethip4ipsecscale1000tnl-ip4base-int-aes-gcm-pdrdisc
@@ -317,7 +313,6 @@
 | | ...
 | | [Tags] | 64B | 2T2C | MTHREAD | PDRDISC | SKIP_PATCH
 | | ...
-| | ${n_tunnels}= | Set Variable | ${1000}
 | | ${framesize}= | Set Variable | ${64}
 | | ${min_rate}= | Set Variable | ${10000}
 | | ${max_rate}= | Set Variable | ${s_18.75Mpps}
@@ -338,6 +333,6 @@
 | | ... | ${encr_alg} | ${encr_key} | ${auth_alg} | ${auth_key} | ${laddr_ip4}
 | | ... | ${raddr_ip4} | ${addr_range}
 | | Then Find PDR using binary search and pps | ${framesize}
-| | ... | ${binary_min} | ${binary_max} | 3-node-IPv4-dst-${n_tunnels}
+| | ... | ${binary_min} | ${binary_max} | ${traffic_profile}
 | | ... | ${min_rate} | ${max_rate} | ${threshold} | ${perf_pdr_loss_acceptance}
 | | ... | ${perf_pdr_loss_acceptance_type}
diff --git a/tests/perf/40ge2p1xl710-ethip4ipsecscale1000tnl-ip4base-int-cbc-sha1-ndrpdrdisc.robot b/tests/perf/40ge2p1xl710-ethip4ipsecscale1000tnl-ip4base-int-cbc-sha1-ndrpdrdisc.robot
index f05e9c5e75..05448fbd8e 100644
--- a/tests/perf/40ge2p1xl710-ethip4ipsecscale1000tnl-ip4base-int-cbc-sha1-ndrpdrdisc.robot
+++ b/tests/perf/40ge2p1xl710-ethip4ipsecscale1000tnl-ip4base-int-cbc-sha1-ndrpdrdisc.robot
@@ -26,7 +26,7 @@
 | ...
 | Test Setup | Performance test setup
 | Test Teardown | Performance test teardown | ${min_rate}pps | ${framesize}
-| ... | 3-node-IPv4-dst-${n_tunnels}
+| ... | ${traffic_profile}
 | ...
 | Documentation | *IPv4 IPsec tunnel mode performance test suite.*
 | ...
@@ -68,6 +68,9 @@
 | ${laddr_ip4}= | 10.0.0.0
 | ${addr_range}= | ${32}
 | ${ipsec_overhead}= | ${58}
+| ${n_tunnels}= | ${1000}
+# Traffic profile:
+| ${traffic_profile} | trex-sl-3n-ethip4-ip4dst${n_tunnels}
 
 *** Test Cases ***
 | tc01-64B-1t1c-ethip4ipsecscale1000tnl-ip4base-int-cbc-sha1-ndrdisc
@@ -79,7 +82,6 @@
 | | ...
 | | [Tags] | 64B | 1T1C | STHREAD | NDRDISC
 | | ...
-| | ${n_tunnels}= | Set Variable | ${1000}
 | | ${framesize}= | Set Variable | ${64}
 | | ${min_rate}= | Set Variable | ${10000}
 | | ${max_rate}= | Set Variable | ${s_18.75Mpps}
@@ -100,7 +102,7 @@
 | | ... | ${encr_alg} | ${encr_key} | ${auth_alg} | ${auth_key} | ${laddr_ip4}
 | | ... | ${raddr_ip4} | ${addr_range}
 | | Then Find NDR using binary search and pps | ${framesize}
-| | ... | ${binary_min} | ${binary_max} | 3-node-IPv4-dst-${n_tunnels}
+| | ... | ${binary_min} | ${binary_max} | ${traffic_profile}
 | | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc02-64B-1t1c-ethip4ipsecscale1000tnl-ip4base-int-cbc-sha1-pdrdisc
@@ -112,7 +114,6 @@
 | | ...
 | | [Tags] | 64B | 1T1C | STHREAD | PDRDISC | SKIP_PATCH
 | | ...
-| | ${n_tunnels}= | Set Variable | ${1000}
 | | ${framesize}= | Set Variable | ${64}
 | | ${min_rate}= | Set Variable | ${10000}
 | | ${max_rate}= | Set Variable | ${s_18.75Mpps}
@@ -133,7 +134,7 @@
 | | ... | ${encr_alg} | ${encr_key} | ${auth_alg} | ${auth_key} | ${laddr_ip4}
 | | ... | ${raddr_ip4} | ${addr_range}
 | | Then Find PDR using binary search and pps | ${framesize}
-| | ... | ${binary_min} | ${binary_max} | 3-node-IPv4-dst-${n_tunnels}
+| | ... | ${binary_min} | ${binary_max} | ${traffic_profile}
 | | ... | ${min_rate} | ${max_rate} | ${threshold} | ${perf_pdr_loss_acceptance}
 | | ... | ${perf_pdr_loss_acceptance_type}
 
@@ -146,7 +147,6 @@
 | | ...
 | | [Tags] | 1518B | 1T1C | STHREAD | NDRDISC
 | | ...
-| | ${n_tunnels}= | Set Variable | ${1000}
 | | ${framesize}= | Set Variable | ${1518}
 | | ${min_rate}= | Set Variable | ${10000}
 | | ${max_rate}= | Calculate pps | ${s_24.5G} | ${framesize + ${ipsec_overhead}}
@@ -166,7 +166,7 @@
 | | ... | ${encr_alg} | ${encr_key} | ${auth_alg} | ${auth_key} | ${laddr_ip4}
 | | ... | ${raddr_ip4} | ${addr_range}
 | | Then Find NDR using binary search and pps | ${framesize}
-| | ... | ${binary_min} | ${binary_max} | 3-node-IPv4-dst-${n_tunnels}
+| | ... | ${binary_min} | ${binary_max} | ${traffic_profile}
 | | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc04-1518B-1t1c-ethip4ipsecscale1000tnl-ip4base-int-cbc-sha1-pdrdisc
@@ -178,7 +178,6 @@
 | | ...
 | | [Tags] | 1518B | 1T1C | STHREAD | PDRDISC | SKIP_PATCH
 | | ...
-| | ${n_tunnels}= | Set Variable | ${1000}
 | | ${framesize}= | Set Variable | ${1518}
 | | ${min_rate}= | Set Variable | ${10000}
 | | ${max_rate}= | Calculate pps | ${s_24.5G} | ${framesize + ${ipsec_overhead}}
@@ -198,7 +197,7 @@
 | | ... | ${encr_alg} | ${encr_key} | ${auth_alg} | ${auth_key} | ${laddr_ip4}
 | | ... | ${raddr_ip4} | ${addr_range}
 | | Then Find PDR using binary search and pps | ${framesize}
-| | ... | ${binary_min} | ${binary_max} | 3-node-IPv4-dst-${n_tunnels}
+| | ... | ${binary_min} | ${binary_max} | ${traffic_profile}
 | | ... | ${min_rate} | ${max_rate} | ${threshold} | ${perf_pdr_loss_acceptance}
 | | ... | ${perf_pdr_loss_acceptance_type}
 
@@ -212,7 +211,6 @@
 | | ...
 | | [Tags] | IMIX | 1T1C | STHREAD | NDRDISC
 | | ...
-| | ${n_tunnels}= | Set Variable | ${1000}
 | | ${framesize}= | Set Variable | IMIX_v4_1
 | | ${imix_size}= | Get Frame Size | ${framesize}
 | | ${min_rate}= | Set Variable | ${10000}
@@ -233,7 +231,7 @@
 | | ... | ${encr_alg} | ${encr_key} | ${auth_alg} | ${auth_key} | ${laddr_ip4}
 | | ... | ${raddr_ip4} | ${addr_range}
 | | Then Find NDR using binary search and pps | ${framesize}
-| | ... | ${binary_min} | ${binary_max} | 3-node-IPv4-dst-${n_tunnels}
+| | ... | ${binary_min} | ${binary_max} | ${traffic_profile}
 | | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc06-IMIX-1t1c-ethip4ipsecscale1000tnl-ip4base-int-cbc-sha1-pdrdisc
@@ -246,7 +244,6 @@
 | | ...
 | | [Tags] | IMIX | 1T1C | STHREAD | PDRDISC | SKIP_PATCH
 | | ...
-| | ${n_tunnels}= | Set Variable | ${1000}
 | | ${framesize}= | Set Variable | IMIX_v4_1
 | | ${imix_size}= | Get Frame Size | ${framesize}
 | | ${min_rate}= | Set Variable | ${10000}
@@ -267,7 +264,7 @@
 | | ... | ${encr_alg} | ${encr_key} | ${auth_alg} | ${auth_key} | ${laddr_ip4}
 | | ... | ${raddr_ip4} | ${addr_range}
 | | Then Find PDR using binary search and pps | ${framesize}
-| | ... | ${binary_min} | ${binary_max} | 3-node-IPv4-dst-${n_tunnels}
+| | ... | ${binary_min} | ${binary_max} | ${traffic_profile}
 | | ... | ${min_rate} | ${max_rate} | ${threshold} | ${perf_pdr_loss_acceptance}
 | | ... | ${perf_pdr_loss_acceptance_type}
 
@@ -280,7 +277,6 @@
 | | ...
 | | [Tags] | 64B | 2T2C | MTHREAD | NDRDISC
 | | ...
-| | ${n_tunnels}= | Set Variable | ${1000}
 | | ${framesize}= | Set Variable | ${64}
 | | ${min_rate}= | Set Variable | ${10000}
 | | ${max_rate}= | Set Variable | ${s_18.75Mpps}
@@ -301,7 +297,7 @@
 | | ... | ${encr_alg} | ${encr_key} | ${auth_alg} | ${auth_key} | ${laddr_ip4}
 | | ... | ${raddr_ip4} | ${addr_range}
 | | Then Find NDR using binary search and pps | ${framesize}
-| | ... | ${binary_min} | ${binary_max} | 3-node-IPv4-dst-${n_tunnels}
+| | ... | ${binary_min} | ${binary_max} | ${traffic_profile}
 | | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc08-64B-2t2c-ethip4ipsecscale1000tnl-ip4base-int-cbc-sha1-pdrdisc
@@ -313,7 +309,6 @@
 | | ...
 | | [Tags] | 64B | 2T2C | MTHREAD | PDRDISC | SKIP_PATCH
 | | ...
-| | ${n_tunnels}= | Set Variable | ${1000}
 | | ${framesize}= | Set Variable | ${64}
 | | ${min_rate}= | Set Variable | ${10000}
 | | ${max_rate}= | Set Variable | ${s_18.75Mpps}
@@ -334,6 +329,6 @@
 | | ... | ${encr_alg} | ${encr_key} | ${auth_alg} | ${auth_key} | ${laddr_ip4}
 | | ... | ${raddr_ip4} | ${addr_range}
 | | Then Find PDR using binary search and pps | ${framesize}
-| | ... | ${binary_min} | ${binary_max} | 3-node-IPv4-dst-${n_tunnels}
+| | ... | ${binary_min} | ${binary_max} | ${traffic_profile}
 | | ... | ${min_rate} | ${max_rate} | ${threshold} | ${perf_pdr_loss_acceptance}
 | | ... | ${perf_pdr_loss_acceptance_type}
diff --git a/tests/perf/40ge2p1xl710-ethip4ipsecscale1000tnl-ip4base-tnl-aes-gcm-ndrpdrdisc.robot b/tests/perf/40ge2p1xl710-ethip4ipsecscale1000tnl-ip4base-tnl-aes-gcm-ndrpdrdisc.robot
index bef64ae06c..ccea631519 100644
--- a/tests/perf/40ge2p1xl710-ethip4ipsecscale1000tnl-ip4base-tnl-aes-gcm-ndrpdrdisc.robot
+++ b/tests/perf/40ge2p1xl710-ethip4ipsecscale1000tnl-ip4base-tnl-aes-gcm-ndrpdrdisc.robot
@@ -26,7 +26,7 @@
 | ...
 | Test Setup | Performance test setup
 | Test Teardown | Performance test teardown | ${min_rate}pps | ${framesize}
-| ... | 3-node-IPv4-dst-${n_tunnels}
+| ... | ${traffic_profile}
 | ...
 | Documentation | *IPv4 IPsec tunnel mode performance test suite.*
 | ...
@@ -68,6 +68,9 @@
 | ${laddr_ip4}= | 10.0.0.0
 | ${addr_range}= | ${32}
 | ${ipsec_overhead_gcm}= | ${54}
+| ${n_tunnels}= | ${1000}
+# Traffic profile:
+| ${traffic_profile} | trex-sl-3n-ethip4-ip4dst${n_tunnels}
 
 *** Test Cases ***
 | tc01-64B-1t1c-ethip4ipsecscale1000tnl-ip4base-tnl-aes-gcm-ndrdisc
@@ -79,7 +82,6 @@
 | | ...
 | | [Tags] | 64B | 1T1C | STHREAD | NDRDISC
 | | ...
-| | ${n_tunnels}= | Set Variable | ${1000}
 | | ${framesize}= | Set Variable | ${64}
 | | ${min_rate}= | Set Variable | ${10000}
 | | ${max_rate}= | Set Variable | ${s_18.75Mpps}
@@ -103,7 +105,7 @@
 | | ... | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${laddr_ip4} | ${raddr_ip4}
 | | ... | ${addr_range}
 | | Then Find NDR using binary search and pps | ${framesize}
-| | ... | ${binary_min} | ${binary_max} | 3-node-IPv4-dst-${n_tunnels}
+| | ... | ${binary_min} | ${binary_max} | ${traffic_profile}
 | | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc02-64B-1t1c-ethip4ipsecscale1000tnl-ip4base-tnl-aes-gcm-pdrdisc
@@ -115,7 +117,6 @@
 | | ...
 | | [Tags] | 64B | 1T1C | STHREAD | PDRDISC | SKIP_PATCH
 | | ...
-| | ${n_tunnels}= | Set Variable | ${1000}
 | | ${framesize}= | Set Variable | ${64}
 | | ${min_rate}= | Set Variable | ${10000}
 | | ${max_rate}= | Set Variable | ${s_18.75Mpps}
@@ -139,7 +140,7 @@
 | | ... | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${laddr_ip4} | ${raddr_ip4}
 | | ... | ${addr_range}
 | | Then Find PDR using binary search and pps | ${framesize}
-| | ... | ${binary_min} | ${binary_max} | 3-node-IPv4-dst-${n_tunnels}
+| | ... | ${binary_min} | ${binary_max} | ${traffic_profile}
 | | ... | ${min_rate} | ${max_rate} | ${threshold} | ${perf_pdr_loss_acceptance}
 | | ... | ${perf_pdr_loss_acceptance_type}
 
@@ -152,7 +153,6 @@
 | | ...
 | | [Tags] | 1518B | 1T1C | STHREAD | NDRDISC
 | | ...
-| | ${n_tunnels}= | Set Variable | ${1000}
 | | ${framesize}= | Set Variable | ${1518}
 | | ${min_rate}= | Set Variable | ${10000}
 | | ${max_rate}= | Calculate pps | ${s_24.5G}
@@ -176,7 +176,7 @@
 | | ... | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${laddr_ip4} | ${raddr_ip4}
 | | ... | ${addr_range}
 | | Then Find NDR using binary search and pps | ${framesize}
-| | ... | ${binary_min} | ${binary_max} | 3-node-IPv4-dst-${n_tunnels}
+| | ... | ${binary_min} | ${binary_max} | ${traffic_profile}
 | | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc04-1518B-1t1c-ethip4ipsecscale1000tnl-ip4base-tnl-aes-gcm-pdrdisc
@@ -188,7 +188,6 @@
 | | ...
 | | [Tags] | 1518B | 1T1C | STHREAD | PDRDISC | SKIP_PATCH
 | | ...
-| | ${n_tunnels}= | Set Variable | ${1000}
 | | ${framesize}= | Set Variable | ${1518}
 | | ${min_rate}= | Set Variable | ${10000}
 | | ${max_rate}= | Calculate pps | ${s_24.5G}
@@ -212,7 +211,7 @@
 | | ... | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${laddr_ip4} | ${raddr_ip4}
 | | ... | ${addr_range}
 | | Then Find PDR using binary search and pps | ${framesize}
-| | ... | ${binary_min} | ${binary_max} | 3-node-IPv4-dst-${n_tunnels}
+| | ... | ${binary_min} | ${binary_max} | ${traffic_profile}
 | | ... | ${min_rate} | ${max_rate} | ${threshold} | ${perf_pdr_loss_acceptance}
 | | ... | ${perf_pdr_loss_acceptance_type}
 
@@ -226,7 +225,6 @@
 | | ...
 | | [Tags] | IMIX | 1T1C | STHREAD | NDRDISC
 | | ...
-| | ${n_tunnels}= | Set Variable | ${1000}
 | | ${framesize}= | Set Variable | IMIX_v4_1
 | | ${imix_size}= | Get Frame Size | ${framesize}
 | | ${min_rate}= | Set Variable | ${10000}
@@ -251,7 +249,7 @@
 | | ... | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${laddr_ip4} | ${raddr_ip4}
 | | ... | ${addr_range}
 | | Then Find NDR using binary search and pps | ${framesize}
-| | ... | ${binary_min} | ${binary_max} | 3-node-IPv4-dst-${n_tunnels}
+| | ... | ${binary_min} | ${binary_max} | ${traffic_profile}
 | | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc06-IMIX-1t1c-ethip4ipsecscale1000tnl-ip4base-tnl-aes-gcm-pdrdisc
@@ -264,7 +262,6 @@
 | | ...
 | | [Tags] | IMIX | 1T1C | STHREAD | PDRDISC | SKIP_PATCH
 | | ...
-| | ${n_tunnels}= | Set Variable | ${1000}
 | | ${framesize}= | Set Variable | IMIX_v4_1
 | | ${imix_size}= | Get Frame Size | ${framesize}
 | | ${min_rate}= | Set Variable | ${10000}
@@ -289,7 +286,7 @@
 | | ... | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${laddr_ip4} | ${raddr_ip4}
 | | ... | ${addr_range}
 | | Then Find PDR using binary search and pps | ${framesize}
-| | ... | ${binary_min} | ${binary_max} | 3-node-IPv4-dst-${n_tunnels}
+| | ... | ${binary_min} | ${binary_max} | ${traffic_profile}
 | | ... | ${min_rate} | ${max_rate} | ${threshold} | ${perf_pdr_loss_acceptance}
 | | ... | ${perf_pdr_loss_acceptance_type}
 
@@ -302,7 +299,6 @@
 | | ...
 | | [Tags] | 64B | 2T2C | MTHREAD | NDRDISC
 | | ...
-| | ${n_tunnels}= | Set Variable | ${1000}
 | | ${framesize}= | Set Variable | ${64}
 | | ${min_rate}= | Set Variable | ${10000}
 | | ${max_rate}= | Set Variable | ${s_18.75Mpps}
@@ -326,7 +322,7 @@
 | | ... | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${laddr_ip4} | ${raddr_ip4}
 | | ... | ${addr_range}
 | | Then Find NDR using binary search and pps | ${framesize}
-| | ... | ${binary_min} | ${binary_max} | 3-node-IPv4-dst-${n_tunnels}
+| | ... | ${binary_min} | ${binary_max} | ${traffic_profile}
 | | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc08-64B-2t2c-ethip4ipsecscale1000tnl-ip4base-tnl-aes-gcm-pdrdisc
@@ -338,7 +334,6 @@
 | | ...
 | | [Tags] | 64B | 2T2C | MTHREAD | PDRDISC | SKIP_PATCH
 | | ...
-| | ${n_tunnels}= | Set Variable | ${1000}
 | | ${framesize}= | Set Variable | ${64}
 | | ${min_rate}= | Set Variable | ${10000}
 | | ${max_rate}= | Set Variable | ${s_18.75Mpps}
@@ -362,6 +357,6 @@
 | | ... | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${laddr_ip4} | ${raddr_ip4}
 | | ... | ${addr_range}
 | | Then Find PDR using binary search and pps | ${framesize}
-| | ... | ${binary_min} | ${binary_max} | 3-node-IPv4-dst-${n_tunnels}
+| | ... | ${binary_min} | ${binary_max} | ${traffic_profile}
 | | ... | ${min_rate} | ${max_rate} | ${threshold} | ${perf_pdr_loss_acceptance}
 | | ... | ${perf_pdr_loss_acceptance_type}
diff --git a/tests/perf/40ge2p1xl710-ethip4ipsecscale1000tnl-ip4base-tnl-cbc-sha1-ndrpdrdisc.robot b/tests/perf/40ge2p1xl710-ethip4ipsecscale1000tnl-ip4base-tnl-cbc-sha1-ndrpdrdisc.robot
index 873f729514..d1468d60d3 100644
--- a/tests/perf/40ge2p1xl710-ethip4ipsecscale1000tnl-ip4base-tnl-cbc-sha1-ndrpdrdisc.robot
+++ b/tests/perf/40ge2p1xl710-ethip4ipsecscale1000tnl-ip4base-tnl-cbc-sha1-ndrpdrdisc.robot
@@ -26,7 +26,7 @@
 | ...
 | Test Setup | Performance test setup
 | Test Teardown | Performance test teardown | ${min_rate}pps | ${framesize}
-| ... | 3-node-IPv4-dst-${n_tunnels}
+| ... | ${traffic_profile}
 | ...
 | Documentation | *IPv4 IPsec tunnel mode performance test suite.*
 | ...
@@ -68,6 +68,9 @@
 | ${laddr_ip4}= | 10.0.0.0
 | ${addr_range}= | ${32}
 | ${ipsec_overhead}= | ${58}
+| ${n_tunnels}= | ${1000}
+# Traffic profile:
+| ${traffic_profile} | trex-sl-3n-ethip4-ip4dst${n_tunnels}
 
 *** Test Cases ***
 | tc01-64B-1t1c-ethip4ipsecscale1000tnl-ip4base-tnl-cbc-sha1-ndrdisc
@@ -79,7 +82,6 @@
 | | ...
 | | [Tags] | 64B | 1T1C | STHREAD | NDRDISC
 | | ...
-| | ${n_tunnels}= | Set Variable | ${1000}
 | | ${framesize}= | Set Variable | ${64}
 | | ${min_rate}= | Set Variable | ${10000}
 | | ${max_rate}= | Set Variable | ${s_18.75Mpps}
@@ -103,7 +105,7 @@
 | | ... | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${laddr_ip4} | ${raddr_ip4}
 | | ... | ${addr_range}
 | | Then Find NDR using binary search and pps | ${framesize}
-| | ... | ${binary_min} | ${binary_max} | 3-node-IPv4-dst-${n_tunnels}
+| | ... | ${binary_min} | ${binary_max} | ${traffic_profile}
 | | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc02-64B-1t1c-ethip4ipsecscale1000tnl-ip4base-tnl-cbc-sha1-pdrdisc
@@ -115,7 +117,6 @@
 | | ...
 | | [Tags] | 64B | 1T1C | STHREAD | PDRDISC | SKIP_PATCH
 | | ...
-| | ${n_tunnels}= | Set Variable | ${1000}
 | | ${framesize}= | Set Variable | ${64}
 | | ${min_rate}= | Set Variable | ${10000}
 | | ${max_rate}= | Set Variable | ${s_18.75Mpps}
@@ -139,7 +140,7 @@
 | | ... | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${laddr_ip4} | ${raddr_ip4}
 | | ... | ${addr_range}
 | | Then Find PDR using binary search and pps | ${framesize}
-| | ... | ${binary_min} | ${binary_max} | 3-node-IPv4-dst-${n_tunnels}
+| | ... | ${binary_min} | ${binary_max} | ${traffic_profile}
 | | ... | ${min_rate} | ${max_rate} | ${threshold} | ${perf_pdr_loss_acceptance}
 | | ... | ${perf_pdr_loss_acceptance_type}
 
@@ -152,7 +153,6 @@
 | | ...
 | | [Tags] | 1518B | 1T1C | STHREAD | NDRDISC
 | | ...
-| | ${n_tunnels}= | Set Variable | ${1000}
 | | ${framesize}= | Set Variable | ${1518}
 | | ${min_rate}= | Set Variable | ${10000}
 | | ${max_rate}= | Calculate pps | ${s_24.5G} | ${framesize + ${ipsec_overhead}}
@@ -175,7 +175,7 @@
 | | ... | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${laddr_ip4} | ${raddr_ip4}
 | | ... | ${addr_range}
 | | Then Find NDR using binary search and pps | ${framesize}
-| | ... | ${binary_min} | ${binary_max} | 3-node-IPv4-dst-${n_tunnels}
+| | ... | ${binary_min} | ${binary_max} | ${traffic_profile}
 | | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc04-1518B-1t1c-ethip4ipsecscale1000tnl-ip4base-tnl-cbc-sha1-pdrdisc
@@ -187,7 +187,6 @@
 | | ...
 | | [Tags] | 1518B | 1T1C | STHREAD | PDRDISC | SKIP_PATCH
 | | ...
-| | ${n_tunnels}= | Set Variable | ${1000}
 | | ${framesize}= | Set Variable | ${1518}
 | | ${min_rate}= | Set Variable | ${10000}
 | | ${max_rate}= | Calculate pps | ${s_24.5G} | ${framesize + ${ipsec_overhead}}
@@ -210,7 +209,7 @@
 | | ... | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${laddr_ip4} | ${raddr_ip4}
 | | ... | ${addr_range}
 | | Then Find PDR using binary search and pps | ${framesize}
-| | ... | ${binary_min} | ${binary_max} | 3-node-IPv4-dst-${n_tunnels}
+| | ... | ${binary_min} | ${binary_max} | ${traffic_profile}
 | | ... | ${min_rate} | ${max_rate} | ${threshold} | ${perf_pdr_loss_acceptance}
 | | ... | ${perf_pdr_loss_acceptance_type}
 
@@ -224,7 +223,6 @@
 | | ...
 | | [Tags] | IMIX | 1T1C | STHREAD | NDRDISC
 | | ...
-| | ${n_tunnels}= | Set Variable | ${1000}
 | | ${framesize}= | Set Variable | IMIX_v4_1
 | | ${imix_size}= | Get Frame Size | ${framesize}
 | | ${min_rate}= | Set Variable | ${10000}
@@ -248,7 +246,7 @@
 | | ... | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${laddr_ip4} | ${raddr_ip4}
 | | ... | ${addr_range}
 | | Then Find NDR using binary search and pps | ${framesize}
-| | ... | ${binary_min} | ${binary_max} | 3-node-IPv4-dst-${n_tunnels}
+| | ... | ${binary_min} | ${binary_max} | ${traffic_profile}
 | | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc06-IMIX-1t1c-ethip4ipsecscale1000tnl-ip4base-tnl-cbc-sha1-pdrdisc
@@ -261,7 +259,6 @@
 | | ...
 | | [Tags] | IMIX | 1T1C | STHREAD | PDRDISC | SKIP_PATCH
 | | ...
-| | ${n_tunnels}= | Set Variable | ${1000}
 | | ${framesize}= | Set Variable | IMIX_v4_1
 | | ${imix_size}= | Get Frame Size | ${framesize}
 | | ${min_rate}= | Set Variable | ${10000}
@@ -285,7 +282,7 @@
 | | ... | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${laddr_ip4} | ${raddr_ip4}
 | | ... | ${addr_range}
 | | Then Find PDR using binary search and pps | ${framesize}
-| | ... | ${binary_min} | ${binary_max} | 3-node-IPv4-dst-${n_tunnels}
+| | ... | ${binary_min} | ${binary_max} | ${traffic_profile}
 | | ... | ${min_rate} | ${max_rate} | ${threshold} | ${perf_pdr_loss_acceptance}
 | | ... | ${perf_pdr_loss_acceptance_type}
 
@@ -298,7 +295,6 @@
 | | ...
 | | [Tags] | 64B | 2T2C | MTHREAD | NDRDISC
 | | ...
-| | ${n_tunnels}= | Set Variable | ${1000}
 | | ${framesize}= | Set Variable | ${64}
 | | ${min_rate}= | Set Variable | ${10000}
 | | ${max_rate}= | Set Variable | ${s_18.75Mpps}
@@ -322,7 +318,7 @@
 | | ... | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${laddr_ip4} | ${raddr_ip4}
 | | ... | ${addr_range}
 | | Then Find NDR using binary search and pps | ${framesize}
-| | ... | ${binary_min} | ${binary_max} | 3-node-IPv4-dst-${n_tunnels}
+| | ... | ${binary_min} | ${binary_max} | ${traffic_profile}
 | | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc08-64B-2t2c-ethip4ipsecscale1000tnl-ip4base-tnl-cbc-sha1-pdrdisc
@@ -334,7 +330,6 @@
 | | ...
 | | [Tags] | 64B | 2T2C | MTHREAD | PDRDISC | SKIP_PATCH
 | | ...
-| | ${n_tunnels}= | Set Variable | ${1000}
 | | ${framesize}= | Set Variable | ${64}
 | | ${min_rate}= | Set Variable | ${10000}
 | | ${max_rate}= | Set Variable | ${s_18.75Mpps}
@@ -358,6 +353,6 @@
 | | ... | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${laddr_ip4} | ${raddr_ip4}
 | | ... | ${addr_range}
 | | Then Find PDR using binary search and pps | ${framesize}
-| | ... | ${binary_min} | ${binary_max} | 3-node-IPv4-dst-${n_tunnels}
+| | ... | ${binary_min} | ${binary_max} | ${traffic_profile}
 | | ... | ${min_rate} | ${max_rate} | ${threshold} | ${perf_pdr_loss_acceptance}
 | | ... | ${perf_pdr_loss_acceptance_type}
diff --git a/tests/perf/40ge2p1xl710-ethip4ipsectptlispgpe-ip4base-cbc-sha1-ndrpdrdisc.robot b/tests/perf/40ge2p1xl710-ethip4ipsectptlispgpe-ip4base-cbc-sha1-ndrpdrdisc.robot
index f674148ff6..35b38258cb 100644
--- a/tests/perf/40ge2p1xl710-ethip4ipsectptlispgpe-ip4base-cbc-sha1-ndrpdrdisc.robot
+++ b/tests/perf/40ge2p1xl710-ethip4ipsectptlispgpe-ip4base-cbc-sha1-ndrpdrdisc.robot
@@ -29,7 +29,7 @@
 | ...
 | Test Setup | Performance test setup
 | Test Teardown | Performance test teardown | ${min_rate}pps | ${framesize}
-| ... | 3-node-IPv4
+| ... | ${traffic_profile}
 | ...
 | Documentation | *IPv4 IPsec transport mode performance test suite.*
 | ...
@@ -67,6 +67,8 @@
 | ${dut1_spi}= | ${1001}
 | ${ESP_PROTO}= | ${50}
 | ${ipsec_overhead}= | ${54}
+# Traffic profile:
+| ${traffic_profile} | trex-sl-3n-ethip4-ip4src253
 
 *** Test Cases ***
 | tc01-64B-1t1c-ethip4ipsectptlispgpe-ip4base-cbc-sha1-ndrdisc
@@ -96,7 +98,8 @@
 | | When Lisp GPE IPv4 over IPsec initialized in a 3-node circular topology
 | | ... | ${encr_alg} | ${auth_alg}
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | 3-node-IPv4 | ${min_rate} | ${max_rate} | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc02-64B-1t1c-ethip4ipsectptlispgpe-ip4base-cbc-sha1-pdrdisc
 | | [Documentation]
@@ -125,7 +128,8 @@
 | | When Lisp GPE IPv4 over IPsec initialized in a 3-node circular topology
 | | ... | ${encr_alg} | ${auth_alg}
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | 3-node-IPv4 | ${min_rate} | ${max_rate} | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 | | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
 
 | tc03-1518B-1t1c-ethip4ipsectptlispgpe-ip4base-cbc-sha1-ndrdisc
@@ -154,7 +158,8 @@
 | | When Lisp GPE IPv4 over IPsec initialized in a 3-node circular topology
 | | ... | ${encr_alg} | ${auth_alg}
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | 3-node-IPv4 | ${min_rate} | ${max_rate} | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc04-1518B-1t1c-ethip4ipsectptlispgpe-ip4base-cbc-sha1-pdrdisc
 | | [Documentation]
@@ -182,7 +187,8 @@
 | | When Lisp GPE IPv4 over IPsec initialized in a 3-node circular topology
 | | ... | ${encr_alg} | ${auth_alg}
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | 3-node-IPv4 | ${min_rate} | ${max_rate} | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 | | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
 
 | tc05-IMIX-1t1c-ethip4ipsectptlispgpe-ip4base-cbc-sha1-ndrdisc
@@ -212,7 +218,8 @@
 | | When Lisp GPE IPv4 over IPsec initialized in a 3-node circular topology
 | | ... | ${encr_alg} | ${auth_alg}
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | 3-node-IPv4 | ${min_rate} | ${max_rate} | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc06-IMIX-1t1c-ethip4ipsectptlispgpe-ip4base-cbc-sha1-pdrdisc
 | | [Documentation]
@@ -241,7 +248,8 @@
 | | When Lisp GPE IPv4 over IPsec initialized in a 3-node circular topology
 | | ... | ${encr_alg} | ${auth_alg}
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | 3-node-IPv4 | ${min_rate} | ${max_rate} | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 | | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
 
 | tc07-64B-2t2c-ethip4ipsectptlispgpe-ip4base-cbc-sha1-ndrdisc
@@ -271,7 +279,8 @@
 | | When Lisp GPE IPv4 over IPsec initialized in a 3-node circular topology
 | | ... | ${encr_alg} | ${auth_alg}
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | 3-node-IPv4 | ${min_rate} | ${max_rate} | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc08-64B-2t2c-ethip4ipsectptlispgpe-ip4base-cbc-sha1-pdrdisc
 | | [Documentation]
@@ -300,7 +309,8 @@
 | | When Lisp GPE IPv4 over IPsec initialized in a 3-node circular topology
 | | ... | ${encr_alg} | ${auth_alg}
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | 3-node-IPv4 | ${min_rate} | ${max_rate} | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 | | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
 
 | tc13-64B-4t4c-ethip4ipsectptlispgpe-ip4base-cbc-sha1-ndrdisc
@@ -330,7 +340,8 @@
 | | When Lisp GPE IPv4 over IPsec initialized in a 3-node circular topology
 | | ... | ${encr_alg} | ${auth_alg}
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | 3-node-IPv4 | ${min_rate} | ${max_rate} | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc14-64B-4t4c-ethip4ipsectptlispgpe-ip4base-cbc-sha1-pdrdisc
 | | [Documentation]
@@ -359,5 +370,6 @@
 | | When Lisp GPE IPv4 over IPsec initialized in a 3-node circular topology
 | | ... | ${encr_alg} | ${auth_alg}
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
-| | ... | ${binary_max} | 3-node-IPv4 | ${min_rate} | ${max_rate} | ${threshold}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 | | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
diff --git a/tests/perf/40ge2p1xl710-ethip6-ip6base-ndrpdrdisc.robot b/tests/perf/40ge2p1xl710-ethip6-ip6base-ndrpdrdisc.robot
index ec28ee2789..0b84e01e21 100644
--- a/tests/perf/40ge2p1xl710-ethip6-ip6base-ndrpdrdisc.robot
+++ b/tests/perf/40ge2p1xl710-ethip6-ip6base-ndrpdrdisc.robot
@@ -23,7 +23,7 @@
 | ...
 | Test Setup | Performance test setup
 | Test Teardown | Performance test teardown | ${min_rate}pps | ${framesize}
-| ... | 3-node-IPv6
+| ... | ${traffic_profile}
 | ...
 | Documentation | *RFC2544: Pkt throughput IPv6 routing test cases*
 | ...
@@ -51,6 +51,8 @@
 | ${s_24.5G} | ${24500000000}
 # XL710-DA2 Mpps limit 37.5Mpps/2=18.75Mpps
 | ${s_18.75Mpps} | ${18750000}
+# Traffic profile:
+| ${traffic_profile} | trex-sl-3n-ethip6-ip6src253
 
 *** Test Cases ***
 | tc01-78B-1t1c-ethip6-ip6base-ndrdisc
@@ -66,14 +68,13 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | 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
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | 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}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc03-1518B-1t1c-ethip6-ip6base-ndrdisc
 | | [Documentation]
@@ -88,14 +89,13 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | 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
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | 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}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc07-78B-2t2c-ethip6-ip6base-ndrdisc
 | | [Documentation]
@@ -110,14 +110,13 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | 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
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | 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}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc09-1518B-2t2c-ethip6-ip6base-ndrdisc
 | | [Documentation]
@@ -132,14 +131,13 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | 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
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | 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}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc13-78B-4t4c-ethip6-ip6base-ndrdisc
 | | [Documentation]
@@ -154,14 +152,13 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | 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
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | 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}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}
 
 | tc15-1518B-4t4c-ethip6-ip6base-ndrdisc
 | | [Documentation]
@@ -176,11 +173,10 @@
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
 | | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | 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
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | 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}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold}