X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=tests%2Fperf%2F10ge2p1x520-ethip6-ip6base-copwhtlistbase-ndrchk.robot;h=0dcb36f7618f363a822634cd977a2399e04195a3;hb=b9edc2d34cf5148684b9a8d49b965756c289fcdb;hp=0410d8085b29a7be0da7524bc8d61f99e8392a51;hpb=fe29ca4b7e6c412c69f1c56404513a33236aa617;p=csit.git

diff --git a/tests/perf/10ge2p1x520-ethip6-ip6base-copwhtlistbase-ndrchk.robot b/tests/perf/10ge2p1x520-ethip6-ip6base-copwhtlistbase-ndrchk.robot
index 0410d8085b..0dcb36f761 100644
--- a/tests/perf/10ge2p1x520-ethip6-ip6base-copwhtlistbase-ndrchk.robot
+++ b/tests/perf/10ge2p1x520-ethip6-ip6base-copwhtlistbase-ndrchk.robot
@@ -12,18 +12,18 @@
 # limitations under the License.
 
 *** Settings ***
-| Resource | resources/libraries/robot/performance.robot
+| Resource | resources/libraries/robot/performance_setup.robot
 | Library | resources.libraries.python.Cop
 | ...
 | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRCHK
 | ... | NIC_Intel-X520-DA2 | ETH | IP6FWD | FEATURE | COPWHLIST
 | ...
-| 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 IPv6 whitelist verify test cases*
 | ...
@@ -46,21 +46,25 @@
 | ... | interfaces.
 | ... | *[Ref] Applicable standard specifications:* RFC2544.
 
+*** Variables ***
+# Traffic profile:
+| ${traffic_profile} | trex-sl-3n-ethip6-ip6src253
+
 *** Test Cases ***
 | tc01-78B-1t1c-ethip6-ip6base-copwhtlistbase-ndrchk
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 routing and whitelist filters config with \
 | | ... | 1 thread, 1 phy core, 1 receive queue per NIC port. [Ver] Verify
 | | ... | ref-NDR for 78 Byte frames using single trial throughput test
-| | ... | at 2x 2.8mpps.
-| | [Tags] | 1T1C | STHREAD
-| | ${framesize}= | Set Variable | 78
-| | ${rate}= | Set Variable | 2.8mpps
-| | 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
+| | ... | at 2x 3.1mpps.
+| | [Tags] | 78B | 1T1C | STHREAD
+| | ${framesize}= | Set Variable | ${78}
+| | ${rate}= | Set Variable | 3.1mpps
+| | 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 IPv6 forwarding initialized in a 3-node circular topology
+| | When Initialize IPv6 forwarding in 3-node circular topology
 | | And Add fib table | ${dut1} | 2001:1:: | 64 | 1 | local
 | | And Add fib table | ${dut2} | 2001:2:: | 64 | 1 | local
 | | And COP Add whitelist Entry | ${dut1} | ${dut1_if1} | ip6 | 1
@@ -68,7 +72,7 @@
 | | And COP interface enable or disable | ${dut1} | ${dut1_if1} | enable
 | | And COP interface enable or disable | ${dut2} | ${dut2_if2} | enable
 | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv6
+| | ... | ${framesize} | ${traffic_profile}
 
 | tc02-1518B-1t1c-ethip6-ip6base-copwhtlistbase-ndrchk
 | | [Documentation]
@@ -76,14 +80,14 @@
 | | ... | 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
-| | ${framesize}= | Set Variable | 1518
+| | [Tags] | 1518B | 1T1C | STHREAD
+| | ${framesize}= | Set Variable | ${1518}
 | | ${rate}= | Set Variable | 812743pps
-| | 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 IPv6 forwarding initialized in a 3-node circular topology
+| | When Initialize IPv6 forwarding in 3-node circular topology
 | | And Add fib table | ${dut1} | 2001:1:: | 64 | 1 | local
 | | And Add fib table | ${dut2} | 2001:2:: | 64 | 1 | local
 | | And COP Add whitelist Entry | ${dut1} | ${dut1_if1} | ip6 | 1
@@ -91,7 +95,7 @@
 | | And COP interface enable or disable | ${dut1} | ${dut1_if1} | enable
 | | And COP interface enable or disable | ${dut2} | ${dut2_if2} | enable
 | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv6
+| | ... | ${framesize} | ${traffic_profile}
 
 | tc03-9000B-1t1c-ethip6-ip6base-copwhtlistbase-ndrchk
 | | [Documentation]
@@ -99,13 +103,13 @@
 | | ... | 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
-| | ${framesize}= | Set Variable | 9000
+| | [Tags] | 9000B | 1T1C | STHREAD
+| | ${framesize}= | Set Variable | ${9000}
 | | ${rate}= | Set Variable | 138580pps
-| | 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
-| | When IPv6 forwarding initialized in a 3-node circular topology
+| | When Initialize IPv6 forwarding in 3-node circular topology
 | | And Add fib table | ${dut1} | 2001:1:: | 64 | 1 | local
 | | And Add fib table | ${dut2} | 2001:2:: | 64 | 1 | local
 | | And COP Add whitelist Entry | ${dut1} | ${dut1_if1} | ip6 | 1
@@ -113,22 +117,22 @@
 | | And COP interface enable or disable | ${dut1} | ${dut1_if1} | enable
 | | And COP interface enable or disable | ${dut2} | ${dut2_if2} | enable
 | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv6
+| | ... | ${framesize} | ${traffic_profile}
 
 | tc04-78B-2t2c-ethip6-ip6base-copwhtlistbase-ndrchk
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 routing and whitelist filters config with \
 | | ... | 2 threads, 2 phy cores, 1 receive queue per NIC port. [Ver] Verify
 | | ... | ref-NDR for 78 Byte frames using single trial throughput test
-| | ... | at 2x 4.9mpps.
-| | [Tags] | 2T2C | MTHREAD
-| | ${framesize}= | Set Variable | 78
-| | ${rate}= | Set Variable | 4.9mpps
-| | 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
+| | ... | at 2x 5.9mpps.
+| | [Tags] | 78B | 2T2C | MTHREAD
+| | ${framesize}= | Set Variable | ${78}
+| | ${rate}= | Set Variable | 5.9mpps
+| | 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
-| | When IPv6 forwarding initialized in a 3-node circular topology
+| | When Initialize IPv6 forwarding in 3-node circular topology
 | | And Add fib table | ${dut1} | 2001:1:: | 64 | 1 | local
 | | And Add fib table | ${dut2} | 2001:2:: | 64 | 1 | local
 | | And COP Add whitelist Entry | ${dut1} | ${dut1_if1} | ip6 | 1
@@ -136,7 +140,7 @@
 | | And COP interface enable or disable | ${dut1} | ${dut1_if1} | enable
 | | And COP interface enable or disable | ${dut2} | ${dut2_if2} | enable
 | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv6
+| | ... | ${framesize} | ${traffic_profile}
 
 | tc05-1518B-2t2c-ethip6-ip6base-copwhtlistbase-ndrchk
 | | [Documentation]
@@ -144,14 +148,14 @@
 | | ... | 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
-| | ${framesize}= | Set Variable | 1518
+| | [Tags] | 1518B | 2T2C | MTHREAD
+| | ${framesize}= | Set Variable | ${1518}
 | | ${rate}= | Set Variable | 812743pps
-| | 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
-| | When IPv6 forwarding initialized in a 3-node circular topology
+| | When Initialize IPv6 forwarding in 3-node circular topology
 | | And Add fib table | ${dut1} | 2001:1:: | 64 | 1 | local
 | | And Add fib table | ${dut2} | 2001:2:: | 64 | 1 | local
 | | And COP Add whitelist Entry | ${dut1} | ${dut1_if1} | ip6 | 1
@@ -159,7 +163,7 @@
 | | And COP interface enable or disable | ${dut1} | ${dut1_if1} | enable
 | | And COP interface enable or disable | ${dut2} | ${dut2_if2} | enable
 | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv6
+| | ... | ${framesize} | ${traffic_profile}
 
 | tc06-9000B-2t2c-ethip6-ip6base-copwhtlistbase-ndrchk
 | | [Documentation]
@@ -167,13 +171,13 @@
 | | ... | 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
-| | ${framesize}= | Set Variable | 9000
+| | [Tags] | 9000B | 2T2C | MTHREAD
+| | ${framesize}= | Set Variable | ${9000}
 | | ${rate}= | Set Variable | 138580pps
-| | 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
-| | When IPv6 forwarding initialized in a 3-node circular topology
+| | When Initialize IPv6 forwarding in 3-node circular topology
 | | And Add fib table | ${dut1} | 2001:1:: | 64 | 1 | local
 | | And Add fib table | ${dut2} | 2001:2:: | 64 | 1 | local
 | | And COP Add whitelist Entry | ${dut1} | ${dut1_if1} | ip6 | 1
@@ -181,22 +185,22 @@
 | | And COP interface enable or disable | ${dut1} | ${dut1_if1} | enable
 | | And COP interface enable or disable | ${dut2} | ${dut2_if2} | enable
 | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv6
+| | ... | ${framesize} | ${traffic_profile}
 
 | tc07-78B-4t4c-ethip6-ip6base-copwhtlistbase-ndrchk
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 routing and whitelist filters config with \
-| | ... | 4 thread, 4 phy core, 2 receive queue per NIC port. [Ver] Verify
+| | ... | 4 threads, 4 phy cores, 2 receive queue per NIC port. [Ver] Verify
 | | ... | ref-NDR for 78 Byte frames using single trial throughput test
-| | ... | at 2x 10.1mpps.
-| | [Tags] | 4T4C | MTHREAD
-| | ${framesize}= | Set Variable | 78
-| | ${rate}= | Set Variable | 10.1mpps
-| | 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
+| | ... | at 2x 9.4mpps.
+| | [Tags] | 78B | 4T4C | MTHREAD
+| | ${framesize}= | Set Variable | ${78}
+| | ${rate}= | Set Variable | 9.4mpps
+| | 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
-| | When IPv6 forwarding initialized in a 3-node circular topology
+| | When Initialize IPv6 forwarding in 3-node circular topology
 | | And Add fib table | ${dut1} | 2001:1:: | 64 | 1 | local
 | | And Add fib table | ${dut2} | 2001:2:: | 64 | 1 | local
 | | And COP Add whitelist Entry | ${dut1} | ${dut1_if1} | ip6 | 1
@@ -204,22 +208,22 @@
 | | And COP interface enable or disable | ${dut1} | ${dut1_if1} | enable
 | | And COP interface enable or disable | ${dut2} | ${dut2_if2} | enable
 | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv6
+| | ... | ${framesize} | ${traffic_profile}
 
 | tc08-1518B-4t4c-ethip6-ip6base-copwhtlistbase-ndrchk
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 routing and whitelist filters config with \
-| | ... | 4 thread, 4 phy core, 2 receive queue per NIC port. [Ver] Verify
+| | ... | 4 threads, 4 phy cores, 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
-| | ${framesize}= | Set Variable | 1518
+| | [Tags] | 1518B | 4T4C | MTHREAD
+| | ${framesize}= | Set Variable | ${1518}
 | | ${rate}= | Set Variable | 812743pps
-| | 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
-| | When IPv6 forwarding initialized in a 3-node circular topology
+| | When Initialize IPv6 forwarding in 3-node circular topology
 | | And Add fib table | ${dut1} | 2001:1:: | 64 | 1 | local
 | | And Add fib table | ${dut2} | 2001:2:: | 64 | 1 | local
 | | And COP Add whitelist Entry | ${dut1} | ${dut1_if1} | ip6 | 1
@@ -227,21 +231,21 @@
 | | And COP interface enable or disable | ${dut1} | ${dut1_if1} | enable
 | | And COP interface enable or disable | ${dut2} | ${dut2_if2} | enable
 | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv6
+| | ... | ${framesize} | ${traffic_profile}
 
 | tc09-9000B-4t4c-ethip6-ip6base-copwhtlistbase-ndrchk
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 routing and whitelist filters config with \
-| | ... | 4 thread, 4 phy core, 2 receive queue per NIC port. [Ver] Verify
+| | ... | 4 threads, 4 phy cores, 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
-| | ${framesize}= | Set Variable | 9000
+| | [Tags] | 9000B | 4T4C | MTHREAD
+| | ${framesize}= | Set Variable | ${9000}
 | | ${rate}= | Set Variable | 138580pps
-| | 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
-| | When IPv6 forwarding initialized in a 3-node circular topology
+| | When Initialize IPv6 forwarding in 3-node circular topology
 | | And Add fib table | ${dut1} | 2001:1:: | 64 | 1 | local
 | | And Add fib table | ${dut2} | 2001:2:: | 64 | 1 | local
 | | And COP Add whitelist Entry | ${dut1} | ${dut1_if1} | ip6 | 1
@@ -249,4 +253,4 @@
 | | And COP interface enable or disable | ${dut1} | ${dut1_if1} | enable
 | | And COP interface enable or disable | ${dut2} | ${dut2_if2} | enable
 | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | 3-node-IPv6
+| | ... | ${framesize} | ${traffic_profile}