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>

1 files changed, 162 insertions, 159 deletions

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}