X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=tests%2Fperf%2F10ge2p1x520-ethip4-ip4base-ipolicemarkbase-ndrchk.robot;h=0ab575137f3066a597fd55f75d1fbb850d0eac5b;hp=2800c9e1b22ebdaa76d9eeb8626a071ad4e9de77;hb=086f3a5065d744e00fe10289eb2f090b7bde208e;hpb=e5fb9d5dd1b50f10ffd847e8c7acb75c0fd46477

diff --git a/tests/perf/10ge2p1x520-ethip4-ip4base-ipolicemarkbase-ndrchk.robot b/tests/perf/10ge2p1x520-ethip4-ip4base-ipolicemarkbase-ndrchk.robot
index 2800c9e1b2..0ab575137f 100644
--- a/tests/perf/10ge2p1x520-ethip4-ip4base-ipolicemarkbase-ndrchk.robot
+++ b/tests/perf/10ge2p1x520-ethip4-ip4base-ipolicemarkbase-ndrchk.robot
@@ -12,7 +12,7 @@
 # limitations under the License.
 
 *** Settings ***
-| Resource | resources/libraries/robot/performance.robot
+| Resource | resources/libraries/robot/performance_setup.robot
 | Library | resources.libraries.python.Policer
 | Library | resources.libraries.python.IPv4Setup.Dut | ${nodes['DUT1']}
 | ... | WITH NAME | dut1_v4
@@ -22,12 +22,12 @@
 | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRCHK
 | ... | NIC_Intel-X520-DA2 | IP4FWD | BASE | DOT1Q
 | ...
-| 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
 | ... | L3 | Intel-X520-DA2
-| Suite Teardown | 3-node Performance Suite Teardown
+| Suite Teardown | Tear down 3-node performance topology
 | ...
-| Test Setup | Performance test setup
-| Test Teardown | Performance ndrchk test teardown
+| Test Setup | Set up performance test
+| Test Teardown | Tear down performance ndrchk test
 | ...
 | Documentation | *Reference NDR throughput IPv4 policer verify test cases*
 | ...
@@ -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
@@ -60,165 +62,165 @@
 | | ... | [Cfg] DUT runs IPv4 routing and policer config with 1 thread, 1 phy \
 | | ... | core, 1 receive queue per NIC port. [Ver] Verify ref-NDR for 64 \
 | | ... | Byte frames using single trial throughput test at 2x 3.6mpps.
-| | [Tags] | 1T1C | STHREAD
+| | [Tags] | 64B | 1T1C | STHREAD
 | | ${framesize}= | Set Variable | ${64}
 | | ${rate}= | Set Variable | 3.6mpps
 | | 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
+| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology
+| | And Add PCI devices to DUTs in 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 IPv4 policer 2r3c-'ca' initialized in a 3-node circular topology
+| | And Initialize IPv4 forwarding in 3-node circular topology
+| | And Initialize IPv4 policer 2r3c-'ca' in 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]
 | | ... | [Cfg] DUT runs IPv4 routing and policer config with 1 thread, 1 phy \
 | | ... | core, 1 receive queue per NIC port. [Ver] Verify ref-NDR for 1518 \
 | | ... | Byte frames using single trial throughput test at 2x 812743pps.
-| | [Tags] | 1T1C | STHREAD
+| | [Tags] | 1518B | 1T1C | STHREAD
 | | ${framesize}= | Set Variable | ${1518}
 | | ${rate}= | Set Variable | 812743pps
 | | 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
+| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology
+| | And Add PCI devices to DUTs in 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
+| | When Initialize IPv4 forwarding in 3-node circular topology
+| | And Initialize IPv4 policer 2r3c-'ca' in 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]
 | | ... | [Cfg] DUT runs IPv4 routing and policer config with 1 thread, 1 phy \
 | | ... | core, 1 receive queue per NIC port. [Ver] Verify ref-NDR for 9000 \
 | | ... | Byte frames using single trial throughput test at 2x 138580pps.
-| | [Tags] | 1T1C | STHREAD
+| | [Tags] | 9000B | 1T1C | STHREAD
 | | ${framesize}= | Set Variable | ${9000}
 | | ${rate}= | Set Variable | 138580pps
 | | 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
+| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology
+| | And Add PCI devices to DUTs in 3-node single link topology
 | | And Apply startup configuration on all VPP DUTs
-| | And IPv4 forwarding initialized in a 3-node circular topology
-| | And IPv4 policer 2r3c-'ca' initialized in a 3-node circular topology
+| | And Initialize IPv4 forwarding in 3-node circular topology
+| | And Initialize IPv4 policer 2r3c-'ca' in 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]
 | | ... | [Cfg] DUT runs IPv4 routing and policer config with 2 threads, 2 \
 | | ... | phy cores, 1 receive queue per NIC port. [Ver] Verify ref-NDR for \
 | | ... | 64 Byte frames using single trial throughput test at 2x 6.2mpps.
-| | [Tags] | 2T2C | MTHREAD
+| | [Tags] | 64B | 2T2C | MTHREAD
 | | ${framesize}= | Set Variable | ${64}
 | | ${rate}= | Set Variable | 6.2mpps
 | | 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
+| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology
+| | And Add PCI devices to DUTs in 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 IPv4 policer 2r3c-'ca' initialized in a 3-node circular topology
+| | And Initialize IPv4 forwarding in 3-node circular topology
+| | And Initialize IPv4 policer 2r3c-'ca' in 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]
 | | ... | [Cfg] DUT runs IPv4 routing and policer config with 2 threads, 2 \
 | | ... | phy cores, 1 receive queue per NIC port. [Ver] Verify ref-NDR for \
 | | ... | 1518 Byte frames using single trial throughput test at 2x 812743pps.
-| | [Tags] | 2T2C | MTHREAD
+| | [Tags] | 1518B | 2T2C | MTHREAD
 | | ${framesize}= | Set Variable | ${1518}
 | | ${rate}= | Set Variable | 812743pps
 | | 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
+| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology
+| | And Add PCI devices to DUTs in 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 IPv4 policer 2r3c-'ca' initialized in a 3-node circular topology
+| | And Initialize IPv4 forwarding in 3-node circular topology
+| | And Initialize IPv4 policer 2r3c-'ca' in 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]
 | | ... | [Cfg] DUT runs IPv4 routing and policer config with 2 threads, 2 \
 | | ... | phy cores, 1 receive queue per NIC port. [Ver] Verify ref-NDR for \
 | | ... | 9000 Byte frames using single trial throughput test at 2x 138580pps.
-| | [Tags] | 2T2C | MTHREAD
+| | [Tags] | 9000B | 2T2C | MTHREAD
 | | ${framesize}= | Set Variable | ${9000}
 | | ${rate}= | Set Variable | 138580pps
 | | 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
+| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology
+| | And Add PCI devices to DUTs in 3-node single link topology
 | | And Apply startup configuration on all VPP DUTs
-| | And IPv4 forwarding initialized in a 3-node circular topology
-| | And IPv4 policer 2r3c-'ca' initialized in a 3-node circular topology
+| | And Initialize IPv4 forwarding in 3-node circular topology
+| | And Initialize IPv4 policer 2r3c-'ca' in 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]
 | | ... | [Cfg] DUT runs IPv4 routing and policer config with 4 thread, 4 \
 | | ... | phy core, 2 receive queue per NIC port. [Ver] Verify ref-NDR for 64 \
 | | ... | Byte frames using single trial throughput test at 2x 10.4mpps.
-| | [Tags] | 4T4C | MTHREAD
+| | [Tags] | 64B | 4T4C | MTHREAD
 | | ${framesize}= | Set Variable | ${64}
 | | ${rate}= | Set Variable | 10.4mpps
 | | 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
+| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology
+| | And Add PCI devices to DUTs in 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 IPv4 policer 2r3c-'ca' initialized in a 3-node circular topology
+| | And Initialize IPv4 forwarding in 3-node circular topology
+| | And Initialize IPv4 policer 2r3c-'ca' in 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]
 | | ... | [Cfg] DUT runs IPv4 routing and policer config with 4 thread, 4 \
 | | ... | phy core, 2 receive queue per NIC port. [Ver] Verify ref-NDR for \
 | | ... | 1518 Byte frames using single trial throughput test at 2x 812743pps.
-| | [Tags] | 4T4C | MTHREAD
+| | [Tags] | 1518B | 4T4C | MTHREAD
 | | ${framesize}= | Set Variable | ${1518}
 | | ${rate}= | Set Variable | 812743pps
 | | 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
+| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology
+| | And Add PCI devices to DUTs in 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 IPv4 policer 2r3c-'ca' initialized in a 3-node circular topology
+| | And Initialize IPv4 forwarding in 3-node circular topology
+| | And Initialize IPv4 policer 2r3c-'ca' in 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]
 | | ... | [Cfg] DUT runs IPv4 routing and policer config with 4 thread, 4 \
 | | ... | phy core, 2 receive queue per NIC port. [Ver] Verify ref-NDR for \
 | | ... | 9000 Byte frames using single trial throughput test at 2x 138580pps.
-| | [Tags] | 4T4C | MTHREAD
+| | [Tags] | 9000B | 4T4C | MTHREAD
 | | ${framesize}= | Set Variable | ${9000}
 | | ${rate}= | Set Variable | 138580pps
 | | 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
+| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology
+| | And Add PCI devices to DUTs in 3-node single link topology
 | | And Apply startup configuration on all VPP DUTs
-| | And IPv4 forwarding initialized in a 3-node circular topology
-| | And IPv4 policer 2r3c-'ca' initialized in a 3-node circular topology
+| | And Initialize IPv4 forwarding in 3-node circular topology
+| | And Initialize IPv4 policer 2r3c-'ca' in 3-node circular topology
 | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv4
+| | ... | ${framesize} | ${traffic_profile}