X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=dpdk-tests%2Fperf%2F10ge2p1x520-eth-l2xcbase-testpmd-ndrpdrdisc.robot;h=45a67bb5bacd2c1e32a367b9ed03e54c00a9eecb;hb=859157b5db45927c7b4bb0b2d575e68805777a86;hp=7be3f972a4f02f5a04f4228bbd87cd423b0e000e;hpb=ec059708c78fe3563bc89507739a2712adc062f3;p=csit.git

diff --git a/dpdk-tests/perf/10ge2p1x520-eth-l2xcbase-testpmd-ndrpdrdisc.robot b/dpdk-tests/perf/10ge2p1x520-eth-l2xcbase-testpmd-ndrpdrdisc.robot
index 7be3f972a4..45a67bb5ba 100644
--- a/dpdk-tests/perf/10ge2p1x520-eth-l2xcbase-testpmd-ndrpdrdisc.robot
+++ b/dpdk-tests/perf/10ge2p1x520-eth-l2xcbase-testpmd-ndrpdrdisc.robot
@@ -12,7 +12,7 @@
 # limitations under the License.
 
 *** Settings ***
-| Resource | resources/libraries/robot/performance.robot
+| Resource | resources/libraries/robot/performance_setup.robot
 | Resource | resources/libraries/robot/DPDK/default.robot
 | Library | resources.libraries.python.topology.Topology
 | Library | resources.libraries.python.NodePath
@@ -20,9 +20,9 @@
 | Library | resources.libraries.python.DPDK.DPDKTools
 | Force Tags | 3_NODE_SINGLE_LINK_TOPO | HW_ENV | PERFTEST | NDRPDRDISC | 1NUMA
 | ... | NIC_Intel-X520-DA2 | DPDK | ETH | L2XCFWD | BASE
-| Suite Setup | DPDK 3-node Performance Suite Setup with DUT's NIC model
+| Suite Setup | Set up DPDK 3-node performance topology with DUT's NIC model
 | ... | L2 | Intel-X520-DA2
-| Suite Teardown | DPDK 3-node Performance Suite Teardown
+| Suite Teardown | Tear down DPDK 3-node performance topology
 | Documentation | *RFC2544: Pkt throughput IPv4 routing test cases*
 | ...
 | ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology\
@@ -48,6 +48,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-testpmd-ndrdisc
@@ -62,10 +64,10 @@
 | | ${binary_min}= | Set Variable | ${min_rate}
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
-| | Given Start L2FWD '1' worker threads and rxqueues '1' with jumbo frames 'no'
+| | Given Start L2FWD '1' worker threads and '1' rxqueues with jumbo frames 'no'
 | | 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-testpmd-pdrdisc
 | | [Documentation]
@@ -79,10 +81,10 @@
 | | ${binary_min}= | Set Variable | ${min_rate}
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
-| | Given Start L2FWD '1' worker threads and rxqueues '1' with jumbo frames 'no'
+| | Given Start L2FWD '1' worker threads and '1' rxqueues with jumbo frames 'no'
 | | 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}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold} | ${perf_pdr_loss_acceptance}
 | | ... | ${perf_pdr_loss_acceptance_type}
 
 | tc03-1518B-1t1c-eth-l2xcbase-testpmd-ndrdisc
@@ -97,10 +99,10 @@
 | | ${binary_min}= | Set Variable | ${min_rate}
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
-| | Given Start L2FWD '1' worker threads and rxqueues '1' with jumbo frames 'no'
+| | Given Start L2FWD '1' worker threads and '1' rxqueues with jumbo frames 'no'
 | | 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-testpmd-pdrdisc
 | | [Documentation]
@@ -114,10 +116,10 @@
 | | ${binary_min}= | Set Variable | ${min_rate}
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
-| | Given Start L2FWD '1' worker threads and rxqueues '1' with jumbo frames 'no'
+| | Given Start L2FWD '1' worker threads and '1' rxqueues with jumbo frames 'no'
 | | 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}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold} | ${perf_pdr_loss_acceptance}
 | | ... | ${perf_pdr_loss_acceptance_type}
 
 | tc05-9000B-1t1c-eth-l2xcbase-testpmd-ndrdisc
@@ -132,10 +134,10 @@
 | | ${binary_min}= | Set Variable | ${min_rate}
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
-| | Given Start L2FWD '1' worker threads and rxqueues '1' with jumbo frames 'yes'
+| | Given Start L2FWD '1' worker threads and '1' rxqueues with jumbo frames 'yes'
 | | 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-testpmd-pdrdisc
 | | [Documentation]
@@ -149,10 +151,10 @@
 | | ${binary_min}= | Set Variable | ${min_rate}
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
-| | Given Start L2FWD '1' worker threads and rxqueues '1' with jumbo frames 'yes'
+| | Given Start L2FWD '1' worker threads and '1' rxqueues with jumbo frames 'yes'
 | | 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}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold} | ${perf_pdr_loss_acceptance}
 | | ... | ${perf_pdr_loss_acceptance_type}
 
 | tc07-64B-2t2c-eth-l2xcbase-testpmd-ndrdisc
@@ -167,10 +169,10 @@
 | | ${binary_min}= | Set Variable | ${min_rate}
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
-| | Given Start L2FWD '2' worker threads and rxqueues '1' with jumbo frames 'no'
+| | Given Start L2FWD '2' worker threads and '1' rxqueues with jumbo frames 'no'
 | | 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-testpmd-pdrdisc
 | | [Documentation]
@@ -185,10 +187,10 @@
 | | ${binary_min}= | Set Variable | ${min_rate}
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
-| | Given Start L2FWD '2' worker threads and rxqueues '1' with jumbo frames 'no'
+| | Given Start L2FWD '2' worker threads and '1' rxqueues with jumbo frames 'no'
 | | 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}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold} | ${perf_pdr_loss_acceptance}
 | | ... | ${perf_pdr_loss_acceptance_type}
 
 | tc09-1518B-2t2c-eth-l2xcbase-testpmd-ndrdisc
@@ -203,10 +205,10 @@
 | | ${binary_min}= | Set Variable | ${min_rate}
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
-| | Given Start L2FWD '2' worker threads and rxqueues '1' with jumbo frames 'no'
+| | Given Start L2FWD '2' worker threads and '1' rxqueues with jumbo frames 'no'
 | | 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-testpmd-pdrdisc
 | | [Documentation]
@@ -221,10 +223,10 @@
 | | ${binary_min}= | Set Variable | ${min_rate}
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
-| | Given Start L2FWD '2' worker threads and rxqueues '1' with jumbo frames 'no'
+| | Given Start L2FWD '2' worker threads and '1' rxqueues with jumbo frames 'no'
 | | 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}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold} | ${perf_pdr_loss_acceptance}
 | | ... | ${perf_pdr_loss_acceptance_type}
 
 | tc11-9000B-2t2c-eth-l2xcbase-testpmd-ndrdisc
@@ -239,10 +241,10 @@
 | | ${binary_min}= | Set Variable | ${min_rate}
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
-| | Given Start L2FWD '2' worker threads and rxqueues '1' with jumbo frames 'yes'
+| | Given Start L2FWD '2' worker threads and '1' rxqueues with jumbo frames 'yes'
 | | 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-testpmd-pdrdisc
 | | [Documentation]
@@ -257,10 +259,10 @@
 | | ${binary_min}= | Set Variable | ${min_rate}
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
-| | Given Start L2FWD '2' worker threads and rxqueues '1' with jumbo frames 'yes'
+| | Given Start L2FWD '2' worker threads and '1' rxqueues with jumbo frames 'yes'
 | | 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}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold} | ${perf_pdr_loss_acceptance}
 | | ... | ${perf_pdr_loss_acceptance_type}
 
 | tc13-64B-4t4c-eth-l2xcbase-testpmd-ndrdisc
@@ -275,10 +277,10 @@
 | | ${binary_min}= | Set Variable | ${min_rate}
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
-| | Given Start L2FWD '4' worker threads and rxqueues '2' with jumbo frames 'no'
+| | Given Start L2FWD '4' worker threads and '2' rxqueues with jumbo frames 'no'
 | | 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-testpmd-pdrdisc
 | | [Documentation]
@@ -293,10 +295,10 @@
 | | ${binary_min}= | Set Variable | ${min_rate}
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
-| | Given Start L2FWD '4' worker threads and rxqueues '2' with jumbo frames 'no'
+| | Given Start L2FWD '4' worker threads and '2' rxqueues with jumbo frames 'no'
 | | 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}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold} | ${perf_pdr_loss_acceptance}
 | | ... | ${perf_pdr_loss_acceptance_type}
 
 | tc15-1518B-4t4c-eth-l2xcbase-testpmd-ndrdisc
@@ -311,10 +313,10 @@
 | | ${binary_min}= | Set Variable | ${min_rate}
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
-| | Given Start L2FWD '4' worker threads and rxqueues '2' with jumbo frames 'no'
+| | Given Start L2FWD '4' worker threads and '2' rxqueues with jumbo frames 'no'
 | | 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-testpmd-pdrdisc
 | | [Documentation]
@@ -329,10 +331,10 @@
 | | ${binary_min}= | Set Variable | ${min_rate}
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
-| | Given Start L2FWD '4' worker threads and rxqueues '2' with jumbo frames 'no'
+| | Given Start L2FWD '4' worker threads and '2' rxqueues with jumbo frames 'no'
 | | 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}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold} | ${perf_pdr_loss_acceptance}
 | | ... | ${perf_pdr_loss_acceptance_type}
 
 | tc17-9000B-4t4c-eth-l2xcbase-testpmd-ndrdisc
@@ -347,10 +349,10 @@
 | | ${binary_min}= | Set Variable | ${min_rate}
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
-| | Given Start L2FWD '4' worker threads and rxqueues '2' with jumbo frames 'yes'
+| | Given Start L2FWD '4' worker threads and '2' rxqueues with jumbo frames 'yes'
 | | 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-testpmd-pdrdisc
 | | [Documentation]
@@ -365,8 +367,8 @@
 | | ${binary_min}= | Set Variable | ${min_rate}
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
-| | Given Start L2FWD '4' worker threads and rxqueues '2' with jumbo frames 'yes'
+| | Given Start L2FWD '4' worker threads and '2' rxqueues with jumbo frames 'yes'
 | | 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}
+| | ... | ${binary_max} | ${traffic_profile}
+| | ... | ${min_rate} | ${max_rate} | ${threshold} | ${perf_pdr_loss_acceptance}
 | | ... | ${perf_pdr_loss_acceptance_type}