From b92b5be7d4bbbf523812f774bb2e539ab2081cf6 Mon Sep 17 00:00:00 2001
From: Tibor Frank <tifrank@cisco.com>
Date: Tue, 4 Apr 2017 10:06:00 +0200
Subject: 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>
---
 ...0ge2p1x520-ethip6-ip6scale200k-ndrpdrdisc.robot | 307 +++++++++------------
 1 file changed, 132 insertions(+), 175 deletions(-)

(limited to 'tests/perf/10ge2p1x520-ethip6-ip6scale200k-ndrpdrdisc.robot')

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}
-- 
cgit 1.2.3-korg