X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=tests%2Fperf%2F10ge2p1x710-eth-l2bdbasemaclrn-ndrpdrdisc.robot;h=033414fa06a5590618b9752c0af69dbee8aa2501;hp=9ff8368eb4291c807d0e3f504c6a833af1365618;hb=086f3a5065d744e00fe10289eb2f090b7bde208e;hpb=974897e8bcff8f3baeadf09b87840f530d8f41c1

diff --git a/tests/perf/10ge2p1x710-eth-l2bdbasemaclrn-ndrpdrdisc.robot b/tests/perf/10ge2p1x710-eth-l2bdbasemaclrn-ndrpdrdisc.robot
index 9ff8368eb4..033414fa06 100644
--- a/tests/perf/10ge2p1x710-eth-l2bdbasemaclrn-ndrpdrdisc.robot
+++ b/tests/perf/10ge2p1x710-eth-l2bdbasemaclrn-ndrpdrdisc.robot
@@ -12,18 +12,19 @@
 # limitations under the License.
 
 *** Settings ***
-| Resource | resources/libraries/robot/performance.robot
+| Resource | resources/libraries/robot/performance_setup.robot
 | ...
 | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDRDISC
 | ... | NIC_Intel-X710 | ETH | L2BDMACLRN | BASE
 | ...
-| Suite Setup | 3-node Performance Suite Setup with DUT's NIC model
+| Suite Setup | Set up 3-node performance topology with DUT's NIC model
 | ... | L2 | Intel-X710
-| Suite Teardown | 3-node Performance Suite Teardown
+| Suite Teardown | Tear down 3-node performance topology
 | ...
-| Test Setup | Performance test setup
-| Test Teardown | Performance test teardown | ${min_rate}pps | ${framesize}
-| ... | 3-node-bridge
+| Test Setup | Set up performance test
+| ...
+| Test Teardown | Tear down performance discovery test | ${min_rate}pps
+| ... | ${framesize} | ${traffic_profile}
 | ...
 | Documentation | *RFC2544: Pkt throughput L2BD test cases*
 | ...
@@ -50,6 +51,8 @@
 *** Variables ***
 # X710 bandwidth limit
 | ${s_limit} | ${10000000000}
+# Traffic profile:
+| ${traffic_profile} | trex-sl-3n-ethip4-ip4src254
 
 *** Keywords ***
 | L2 Bridge Domain NDR Binary Search
@@ -60,14 +63,14 @@
 | | ${binary_min}= | Set Variable | ${min_rate}
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
-| | Add '${wt}' worker threads and rxqueues '${rxq}' in 3-node single-link topo
-| | Add PCI devices to DUTs from 3-node single link topology
+| | Add '${wt}' worker threads and '${rxq}' rxqueues in 3-node single-link circular topology
+| | Add PCI devices to DUTs in 3-node single link topology
 | | ${get_framesize}= | Get Frame Size | ${framesize}
-| | Run Keyword If | ${get_framesize} < ${1522} | Add No Multi Seg to all DUTs
+| | Run Keyword If | ${get_framesize} < ${1522} | Add no multi seg to all DUTs
 | | Apply startup configuration on all VPP DUTs
-| | L2 bridge domain initialized in a 3-node circular topology
+| | Initialize L2 bridge domain in 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
@@ -78,21 +81,21 @@
 | | ${binary_min}= | Set Variable | ${min_rate}
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
-| | Add '${wt}' worker threads and rxqueues '${rxq}' in 3-node single-link topo
-| | Add PCI devices to DUTs from 3-node single link topology
+| | Add '${wt}' worker threads and '${rxq}' rxqueues in 3-node single-link circular topology
+| | Add PCI devices to DUTs in 3-node single link topology
 | | ${get_framesize}= | Get Frame Size | ${framesize}
-| | Run Keyword If | ${get_framesize} < ${1522} | Add No Multi Seg to all DUTs
+| | Run Keyword If | ${get_framesize} < ${1522} | Add no multi seg to all DUTs
 | | Apply startup configuration on all VPP DUTs
-| | L2 bridge domain initialized in a 3-node circular topology
+| | Initialize L2 bridge domain in 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}
 
 *** Test Cases ***
 | tc01-64B-1t1c-eth-l2bdbasemaclrn-ndrdisc
-| | ... | ${64} | ${100000} | 1 | 1
-| | [Tags] | 1T1C | STHREAD | NDRDISC
+| | ... | framesize=${64} | min_rate=${100000} | wt=1 | rxq=1
+| | [Tags] | 64B | 1T1C | STHREAD | NDRDISC
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD switching config with with\
 | | ... | 1 thread, 1 phy core, 1 receive queue per NIC port.
@@ -101,8 +104,8 @@
 | | [Template] | L2 Bridge Domain NDR Binary Search
 
 | tc02-64B-1t1c-eth-l2bdbasemaclrn-pdrdisc
-| | ... | ${64} | ${100000} | 1 | 1
-| | [Tags] | 1T1C | STHREAD | PDRDISC | SKIP_PATCH
+| | ... | framesize=${64} | min_rate=${100000} | wt=1 | rxq=1
+| | [Tags] | 64B | 1T1C | STHREAD | PDRDISC | SKIP_PATCH
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD switching config with with\
 | | ... | 1 thread, 1 phy core, 1 receive queue per NIC port.
@@ -111,8 +114,8 @@
 | | [Template] | L2 Bridge Domain PDR Binary Search
 
 | tc03-1518B-1t1c-eth-l2bdbasemaclrn-ndrdisc
-| | ... | ${1518} | ${10000} | 1 | 1
-| | [Tags] | 1T1C | STHREAD | NDRDISC
+| | ... | framesize=${1518} | min_rate=${10000} | wt=1 | rxq=1
+| | [Tags] | 1518B | 1T1C | STHREAD | NDRDISC
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD switching config with with\
 | | ... | 1 thread, 1 phy core, 1 receive queue per NIC port.
@@ -121,8 +124,8 @@
 | | [Template] | L2 Bridge Domain NDR Binary Search
 
 | tc04-1518B-1t1c-eth-l2bdbasemaclrn-pdrdisc
-| | ... | ${1518} | ${10000} | 1 | 1
-| | [Tags] | 1T1C | STHREAD | PDRDISC | SKIP_PATCH
+| | ... | framesize=${1518} | min_rate=${10000} | wt=1 | rxq=1
+| | [Tags] | 1518B | 1T1C | STHREAD | PDRDISC | SKIP_PATCH
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD switching config with with\
 | | ... | 1 thread, 1 phy core, 1 receive queue per NIC port.
@@ -131,8 +134,8 @@
 | | [Template] | L2 Bridge Domain PDR Binary Search
 
 | tc05-9000B-1t1c-eth-l2bdbasemaclrn-ndrdisc
-| | ... | ${9000} | ${10000} | 1 | 1
-| | [Tags] | 1T1C | STHREAD | NDRDISC
+| | ... | framesize=${9000} | min_rate=${10000} | wt=1 | rxq=1
+| | [Tags] | 9000B | 1T1C | STHREAD | NDRDISC
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD switching config with with\
 | | ... | 1 thread, 1 phy core, 1 receive queue per NIC port.
@@ -141,8 +144,8 @@
 | | [Template] | L2 Bridge Domain NDR Binary Search
 
 | tc06-9000B-1t1c-eth-l2bdbasemaclrn-pdrdisc
-| | ... | ${9000} | ${10000} | 1 | 1
-| | [Tags] | 1T1C | STHREAD | PDRDISC | SKIP_PATCH
+| | ... | framesize=${9000} | min_rate=${10000} | wt=1 | rxq=1
+| | [Tags] | 9000B | 1T1C | STHREAD | PDRDISC | SKIP_PATCH
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD switching config with with\
 | | ... | 1 thread, 1 phy core, 1 receive queue per NIC port.
@@ -151,8 +154,8 @@
 | | [Template] | L2 Bridge Domain PDR Binary Search
 
 | tc07-64B-2t2c-eth-l2bdbasemaclrn-ndrdisc
-| | ... | ${64} | ${100000} | 2 | 1
-| | [Tags] | 2T2C | MTHREAD | NDRDISC
+| | ... | framesize=${64} | min_rate=${100000} | wt=2 | rxq=1
+| | [Tags] | 64B | 2T2C | MTHREAD | NDRDISC
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD switching config with with\
 | | ... | 2 threads, 2 phy cores, 1 receive queue per NIC port.
@@ -161,8 +164,8 @@
 | | [Template] | L2 Bridge Domain NDR Binary Search
 
 | tc08-64B-2t2c-eth-l2bdbasemaclrn-pdrdisc
-| | ... | ${64} | ${100000} | 2 | 1
-| | [Tags] | 2T2C | MTHREAD | PDRDISC | SKIP_PATCH
+| | ... | framesize=${64} | min_rate=${100000} | wt=2 | rxq=1
+| | [Tags] | 64B | 2T2C | MTHREAD | PDRDISC | SKIP_PATCH
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD switching config with with\
 | | ... | 2 threads, 2 phy cores, 1 receive queue per NIC port.
@@ -171,8 +174,8 @@
 | | [Template] | L2 Bridge Domain PDR Binary Search
 
 | tc09-1518B-2t2c-eth-l2bdbasemaclrn-ndrdisc
-| | ... | ${1518} | ${10000} | 2 | 1
-| | [Tags] | 2T2C | MTHREAD | NDRDISC | SKIP_PATCH
+| | ... | framesize=${1518} | min_rate=${10000} | wt=2 | rxq=1
+| | [Tags] | 1518B | 2T2C | MTHREAD | NDRDISC | SKIP_PATCH
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD switching config with with\
 | | ... | 2 threads, 2 phy cores, 1 receive queue per NIC port.
@@ -181,8 +184,8 @@
 | | [Template] | L2 Bridge Domain NDR Binary Search
 
 | tc10-1518B-2t2c-eth-l2bdbasemaclrn-pdrdisc
-| | ... | ${1518} | ${10000} | 2 | 1
-| | [Tags] | 2T2C | MTHREAD | PDRDISC | SKIP_PATCH
+| | ... | framesize=${1518} | min_rate=${10000} | wt=2 | rxq=1
+| | [Tags] | 1518B | 2T2C | MTHREAD | PDRDISC | SKIP_PATCH
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD switching config with with\
 | | ... | 2 threads, 2 phy cores, 1 receive queue per NIC port.
@@ -191,8 +194,8 @@
 | | [Template] | L2 Bridge Domain PDR Binary Search
 
 | tc11-9000B-2t2c-eth-l2bdbasemaclrn-ndrdisc
-| | ... | ${9000} | ${10000} | 2 | 1
-| | [Tags] | 2T2C | MTHREAD | NDRDISC | SKIP_PATCH
+| | ... | framesize=${9000} | min_rate=${10000} | wt=2 | rxq=1
+| | [Tags] | 9000B | 2T2C | MTHREAD | NDRDISC | SKIP_PATCH
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD switching config with with\
 | | ... | 2 threads, 2 phy cores, 1 receive queue per NIC port.
@@ -201,8 +204,8 @@
 | | [Template] | L2 Bridge Domain NDR Binary Search
 
 | tc12-9000B-2t2c-eth-l2bdbasemaclrn-pdrdisc
-| | ... | ${9000} | ${10000} | 2 | 1
-| | [Tags] | 2T2C | MTHREAD | PDRDISC | SKIP_PATCH
+| | ... | framesize=${9000} | min_rate=${10000} | wt=2 | rxq=1
+| | [Tags] | 9000B | 2T2C | MTHREAD | PDRDISC | SKIP_PATCH
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD switching config with with\
 | | ... | 2 threads, 2 phy cores, 1 receive queue per NIC port.
@@ -211,8 +214,8 @@
 | | [Template] | L2 Bridge Domain PDR Binary Search
 
 | tc13-64B-4t4c-eth-l2bdbasemaclrn-ndrdisc
-| | ... | ${64} | ${100000} | 4 | 2
-| | [Tags] | 4T4C | MTHREAD | NDRDISC
+| | ... | framesize=${64} | min_rate=${100000} | wt=4 | rxq=2
+| | [Tags] | 64B | 4T4C | MTHREAD | NDRDISC
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD switching config with with\
 | | ... | 4 threads, 4 phy cores, 2 receive queues per NIC port.
@@ -221,8 +224,8 @@
 | | [Template] | L2 Bridge Domain NDR Binary Search
 
 | tc14-64B-4t4c-eth-l2bdbasemaclrn-pdrdisc
-| | ... | ${64} | ${100000} | 4 | 2
-| | [Tags] | 4T4C | MTHREAD | PDRDISC | SKIP_PATCH
+| | ... | framesize=${64} | min_rate=${100000} | wt=4 | rxq=2
+| | [Tags] | 64B | 4T4C | MTHREAD | PDRDISC | SKIP_PATCH
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD switching config with with\
 | | ... | 4 threads, 4 phy cores, 2 receive queues per NIC port.
@@ -231,8 +234,8 @@
 | | [Template] | L2 Bridge Domain PDR Binary Search
 
 | tc15-1518B-4t4c-eth-l2bdbasemaclrn-ndrdisc
-| | ... | ${1518} | ${10000} | 4 | 2
-| | [Tags] | 4T4C | MTHREAD | NDRDISC | SKIP_PATCH
+| | ... | framesize=${1518} | min_rate=${10000} | wt=4 | rxq=2
+| | [Tags] | 1518B | 4T4C | MTHREAD | NDRDISC | SKIP_PATCH
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD switching config with with\
 | | ... | 4 threads, 4 phy cores, 2 receive queues per NIC port.
@@ -241,8 +244,8 @@
 | | [Template] | L2 Bridge Domain NDR Binary Search
 
 | tc16-1518B-4t4c-eth-l2bdbasemaclrn-pdrdisc
-| | ... | ${1518} | ${10000} | 4 | 2
-| | [Tags] | 4T4C | MTHREAD | PDRDISC | SKIP_PATCH
+| | ... | framesize=${1518} | min_rate=${10000} | wt=4 | rxq=2
+| | [Tags] | 1518B | 4T4C | MTHREAD | PDRDISC | SKIP_PATCH
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD switching config with with\
 | | ... | 4 threads, 4 phy cores, 2 receive queues per NIC port.
@@ -251,8 +254,8 @@
 | | [Template] | L2 Bridge Domain PDR Binary Search
 
 | tc17-9000B-4t4c-eth-l2bdbasemaclrn-ndrdisc
-| | ... | ${9000} | ${10000} | 4 | 2
-| | [Tags] | 4T4C | MTHREAD | NDRDISC | SKIP_PATCH
+| | ... | framesize=${9000} | min_rate=${10000} | wt=4 | rxq=2
+| | [Tags] | 9000B | 4T4C | MTHREAD | NDRDISC | SKIP_PATCH
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD switching config with with\
 | | ... | 4 threads, 4 phy cores, 2 receive queues per NIC port.
@@ -261,8 +264,8 @@
 | | [Template] | L2 Bridge Domain NDR Binary Search
 
 | tc18-9000B-4t4c-eth-l2bdbasemaclrn-pdrdisc
-| | ... | ${9000} | ${10000} | 4 | 2
-| | [Tags] | 4T4C | MTHREAD | PDRDISC | SKIP_PATCH
+| | ... | framesize=${9000} | min_rate=${10000} | wt=4 | rxq=2
+| | [Tags] | 9000B | 4T4C | MTHREAD | PDRDISC | SKIP_PATCH
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD switching config with with\
 | | ... | 4 threads, 4 phy cores, 2 receive queues per NIC port.