X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=tests%2Fperf%2F10ge2p1x520-dot1q-l2xcbase-ndrchk.robot;h=cf1fddff2362e41bfa44c89487f029ffb695e64b;hp=1577b0a9cd2ff6e153564b156eaf8ae93f0dd76c;hb=b92b5be7d4bbbf523812f774bb2e539ab2081cf6;hpb=3ef4ce6c9cc006d728a8acea20bc18aadc88acdc

diff --git a/tests/perf/10ge2p1x520-dot1q-l2xcbase-ndrchk.robot b/tests/perf/10ge2p1x520-dot1q-l2xcbase-ndrchk.robot
index 1577b0a9cd..cf1fddff23 100644
--- a/tests/perf/10ge2p1x520-dot1q-l2xcbase-ndrchk.robot
+++ b/tests/perf/10ge2p1x520-dot1q-l2xcbase-ndrchk.robot
@@ -1,4 +1,4 @@
-# Copyright (c) 2016 Cisco and/or its affiliates.
+# Copyright (c) 2017 Cisco and/or its affiliates.
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at:
@@ -14,14 +14,17 @@
 *** Settings ***
 | Resource | resources/libraries/robot/performance.robot
 | Resource | resources/libraries/robot/tagging.robot
+| ...
 | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRCHK
-| ...        | NIC_Intel-X520-DA2 | L2XCFWD | BASE | DOT1Q
+| ... | NIC_Intel-X520-DA2 | L2XCFWD | BASE | DOT1Q
+| ...
 | Suite Setup | 3-node Performance Suite Setup with DUT's NIC model
 | ... | L2 | Intel-X520-DA2
 | Suite Teardown | 3-node Performance Suite Teardown
-| Test Setup | Setup all DUTs before test
-| Test Teardown | Run Keywords | Remove startup configuration of VPP from all DUTs
-| ...           | AND          | Show vpp trace dump on all DUTs
+| ...
+| Test Setup | Performance test setup
+| Test Teardown | Performance ndrchk test teardown
+| ...
 | Documentation | *Reference NDR throughput L2XC with 802.1q verify test cases*
 | ...
 | ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology
@@ -45,22 +48,23 @@
 *** Variables ***
 | ${subid}= | 10
 | ${tag_rewrite}= | pop-1
+# Traffic profile:
+| ${traffic_profile} | trex-sl-3n-ethip4-ip4src254
 
 *** Test Cases ***
-| TC01: Verify 64B ref-NDR at 2x 2.9Mpps - DUT 802.1q - 1thread 1core 1rxq
+| tc01-64B-1t1c-dot1q-l2xcbase-ndrchk
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2XC 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.
-| | [Tags] | 1T1C | STHREAD
-| | ${framesize}= | Set Variable | 64
-| | ${duration}= | Set Variable | 10
-| | ${rate}= | Set Variable | 2.9mpps
+| | ... | frames using single trial throughput test at 2x 4.0mpps.
+| | [Tags] | 64B | 1T1C | STHREAD
+| | ${framesize}= | Set Variable | ${64}
+| | ${rate}= | Set Variable | 4.0mpps
 | | 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   VPP interfaces in path are up in a 3-node circular topology
+| | 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 VPP interfaces in path are up in a 3-node circular topology
 | | When VLAN dot1q subinterfaces initialized on 3-node topology
 | | ... | ${dut1} | ${dut1_if2} | ${dut2} | ${dut2_if1} | ${subid}
 | | And L2 tag rewrite method setup on interfaces
@@ -69,23 +73,22 @@
 | | And Interfaces and VLAN sub-interfaces inter-connected using L2-xconnect
 | | ... | ${dut1} | ${dut1_if1} | ${subif_index_1}
 | | ... | ${dut2} | ${dut2_if2} | ${subif_index_2}
-| | Then Traffic should pass with no loss | ${duration} | ${rate}
-| | ...                                   | ${framesize} | 3-node-xconnect
+| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
+| | ... | ${framesize} | ${traffic_profile}
 
-| TC02: Verify 1518B ref-NDR at 2x 720kpps - DUT 802.1q - 1thread 1core 1rxq
+| tc02-1518B-1t1c-dot1q-l2xcbase-ndrchk
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2XC 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.
-| | [Tags] | 1T1C | STHREAD
-| | ${framesize}= | Set Variable | 1518
-| | ${duration}= | Set Variable | 10
+| | ... | frames using single trial throughput test at 2x 720000pps.
+| | [Tags] | 1518B | 1T1C | STHREAD
+| | ${framesize}= | Set Variable | ${1518}
 | | ${rate}= | Set Variable | 720000pps
 | | 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   VPP interfaces in path are up in a 3-node circular topology
+| | 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 VPP interfaces in path are up in a 3-node circular topology
 | | When VLAN dot1q subinterfaces initialized on 3-node topology
 | | ... | ${dut1} | ${dut1_if2} | ${dut2} | ${dut2_if1} | ${subid}
 | | And L2 tag rewrite method setup on interfaces
@@ -94,22 +97,21 @@
 | | And Interfaces and VLAN sub-interfaces inter-connected using L2-xconnect
 | | ... | ${dut1} | ${dut1_if1} | ${subif_index_1}
 | | ... | ${dut2} | ${dut2_if2} | ${subif_index_2}
-| | Then Traffic should pass with no loss | ${duration} | ${rate}
-| | ...                                   | ${framesize} | 3-node-xconnect
+| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
+| | ... | ${framesize} | ${traffic_profile}
 
-| TC03: Verify 9000B ref-NDR at 2x 120kpps - DUT 802.1q - 1thread 1core 1rxq
+| tc03-9000B-1t1c-dot1q-l2xcbase-ndrchk
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2XC 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.
-| | [Tags] | 1T1C | STHREAD
-| | ${framesize}= | Set Variable | 9000
-| | ${duration}= | Set Variable | 10
+| | ... | frames using single trial throughput test at 2x 120000pps.
+| | [Tags] | 9000B | 1T1C | STHREAD
+| | ${framesize}= | Set Variable | ${9000}
 | | ${rate}= | Set Variable | 120000pps
 | | 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   VPP interfaces in path are up in a 3-node circular topology
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Apply startup configuration on all VPP DUTs
+| | And VPP interfaces in path are up in a 3-node circular topology
 | | When VLAN dot1q subinterfaces initialized on 3-node topology
 | | ... | ${dut1} | ${dut1_if2} | ${dut2} | ${dut2_if1} | ${subid}
 | | And L2 tag rewrite method setup on interfaces
@@ -118,23 +120,22 @@
 | | And Interfaces and VLAN sub-interfaces inter-connected using L2-xconnect
 | | ... | ${dut1} | ${dut1_if1} | ${subif_index_1}
 | | ... | ${dut2} | ${dut2_if2} | ${subif_index_2}
-| | Then Traffic should pass with no loss | ${duration} | ${rate}
-| | ...                                   | ${framesize} | 3-node-xconnect
+| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
+| | ... | ${framesize} | ${traffic_profile}
 
-| TC04: Verify 64B ref-NDR at 2x 7Mpps - DUT 802.1q - 2thread 2core 1rxq
+| tc04-64B-2t2c-dot1q-l2xcbase-ndrchk
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2XC 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.
-| | [Tags] | 2T2C | MTHREAD
-| | ${framesize}= | Set Variable | 64
-| | ${duration}= | Set Variable | 10
-| | ${rate}= | Set Variable | 7.0mpps
+| | ... | frames using single trial throughput test at 2x 8.7mpps.
+| | [Tags] | 64B | 2T2C | MTHREAD
+| | ${framesize}= | Set Variable | ${64}
+| | ${rate}= | Set Variable | 8.7mpps
 | | 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   VPP interfaces in path are up in a 3-node circular topology
+| | 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 VPP interfaces in path are up in a 3-node circular topology
 | | When VLAN dot1q subinterfaces initialized on 3-node topology
 | | ... | ${dut1} | ${dut1_if2} | ${dut2} | ${dut2_if1} | ${subid}
 | | And L2 tag rewrite method setup on interfaces
@@ -143,23 +144,22 @@
 | | And Interfaces and VLAN sub-interfaces inter-connected using L2-xconnect
 | | ... | ${dut1} | ${dut1_if1} | ${subif_index_1}
 | | ... | ${dut2} | ${dut2_if2} | ${subif_index_2}
-| | Then Traffic should pass with no loss | ${duration} | ${rate}
-| | ...                                   | ${framesize} | 3-node-xconnect
+| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
+| | ... | ${framesize} | ${traffic_profile}
 
-| TC05: Verify 1518B ref-NDR at 2x 720kpps - DUT 802.1q - 2thread 2core 1rxq
+| tc05-1518B-2t2c-dot1q-l2xcbase-ndrchk
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2XC 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.
-| | [Tags] | 2T2C | MTHREAD
-| | ${framesize}= | Set Variable | 1518
-| | ${duration}= | Set Variable | 10
+| | ... | frames using single trial throughput test at 2x 720000pps.
+| | [Tags] | 1518B | 2T2C | MTHREAD
+| | ${framesize}= | Set Variable | ${1518}
 | | ${rate}= | Set Variable | 720000pps
 | | 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   VPP interfaces in path are up in a 3-node circular topology
+| | 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 VPP interfaces in path are up in a 3-node circular topology
 | | When VLAN dot1q subinterfaces initialized on 3-node topology
 | | ... | ${dut1} | ${dut1_if2} | ${dut2} | ${dut2_if1} | ${subid}
 | | And L2 tag rewrite method setup on interfaces
@@ -168,22 +168,21 @@
 | | And Interfaces and VLAN sub-interfaces inter-connected using L2-xconnect
 | | ... | ${dut1} | ${dut1_if1} | ${subif_index_1}
 | | ... | ${dut2} | ${dut2_if2} | ${subif_index_2}
-| | Then Traffic should pass with no loss | ${duration} | ${rate}
-| | ...                                   | ${framesize} | 3-node-xconnect
+| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
+| | ... | ${framesize} | ${traffic_profile}
 
-| TC06: Verify 9000B ref-NDR at 2x 120kpps - DUT 802.1q - 2thread 2core 1rxq
+| tc06-9000B-2t2c-dot1q-l2xcbase-ndrchk
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2XC 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.
-| | [Tags] | 2T2C | MTHREAD
-| | ${framesize}= | Set Variable | 9000
-| | ${duration}= | Set Variable | 10
+| | ... | frames using single trial throughput test at 2x 120000pps.
+| | [Tags] | 9000B | 2T2C | MTHREAD
+| | ${framesize}= | Set Variable | ${9000}
 | | ${rate}= | Set Variable | 120000pps
 | | 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   VPP interfaces in path are up in a 3-node circular topology
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Apply startup configuration on all VPP DUTs
+| | And VPP interfaces in path are up in a 3-node circular topology
 | | When VLAN dot1q subinterfaces initialized on 3-node topology
 | | ... | ${dut1} | ${dut1_if2} | ${dut2} | ${dut2_if1} | ${subid}
 | | And L2 tag rewrite method setup on interfaces
@@ -192,23 +191,22 @@
 | | And Interfaces and VLAN sub-interfaces inter-connected using L2-xconnect
 | | ... | ${dut1} | ${dut1_if1} | ${subif_index_1}
 | | ... | ${dut2} | ${dut2_if2} | ${subif_index_2}
-| | Then Traffic should pass with no loss | ${duration} | ${rate}
-| | ...                                   | ${framesize} | 3-node-xconnect
+| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
+| | ... | ${framesize} | ${traffic_profile}
 
-| TC07: Verify 64B ref-NDR at 2x 11Mpps - DUT 802.1q - 4thread 4core 2rxq
+| tc07-64B-4t4c-dot1q-l2xcbase-ndrchk
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2XC config with 4 threads, 4 phy cores, \
 | | ... | 2 receive queues per NIC port. [Ver] Verify ref-NDR for 64 Byte
-| | ... | frames using single trial throughput test.
-| | [Tags] | 4T4C | MTHREAD
-| | ${framesize}= | Set Variable | 64
-| | ${duration}= | Set Variable | 10
-| | ${rate}= | Set Variable | 11.0mpps
+| | ... | frames using single trial throughput test at 2x 10.3mpps.
+| | [Tags] | 64B | 4T4C | MTHREAD
+| | ${framesize}= | Set Variable | ${64}
+| | ${rate}= | Set Variable | 10.3mpps
 | | 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   VPP interfaces in path are up in a 3-node circular topology
+| | 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 VPP interfaces in path are up in a 3-node circular topology
 | | When VLAN dot1q subinterfaces initialized on 3-node topology
 | | ... | ${dut1} | ${dut1_if2} | ${dut2} | ${dut2_if1} | ${subid}
 | | And L2 tag rewrite method setup on interfaces
@@ -217,23 +215,22 @@
 | | And Interfaces and VLAN sub-interfaces inter-connected using L2-xconnect
 | | ... | ${dut1} | ${dut1_if1} | ${subif_index_1}
 | | ... | ${dut2} | ${dut2_if2} | ${subif_index_2}
-| | Then Traffic should pass with no loss | ${duration} | ${rate}
-| | ...                                   | ${framesize} | 3-node-xconnect
+| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
+| | ... | ${framesize} | ${traffic_profile}
 
-| TC08: Verify 1518B ref-NDR at 2x 720kpps - DUT 802.1q - 4thread 4core 2rxq
+| tc08-1518B-4t4c-dot1q-l2xcbase-ndrchk
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2XC config with 4 threads, 4 phy cores, \
 | | ... | 2 receive queues per NIC port. [Ver] Verify ref-NDR for 1518 Byte
-| | ... | frames using single trial throughput test.
-| | [Tags] | 4T4C | MTHREAD
-| | ${framesize}= | Set Variable | 1518
-| | ${duration}= | Set Variable | 10
+| | ... | frames using single trial throughput test at 2x 720000pps.
+| | [Tags] | 1518B | 4T4C | MTHREAD
+| | ${framesize}= | Set Variable | ${1518}
 | | ${rate}= | Set Variable | 720000pps
 | | 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   VPP interfaces in path are up in a 3-node circular topology
+| | 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 VPP interfaces in path are up in a 3-node circular topology
 | | When VLAN dot1q subinterfaces initialized on 3-node topology
 | | ... | ${dut1} | ${dut1_if2} | ${dut2} | ${dut2_if1} | ${subid}
 | | And L2 tag rewrite method setup on interfaces
@@ -242,22 +239,21 @@
 | | And Interfaces and VLAN sub-interfaces inter-connected using L2-xconnect
 | | ... | ${dut1} | ${dut1_if1} | ${subif_index_1}
 | | ... | ${dut2} | ${dut2_if2} | ${subif_index_2}
-| | Then Traffic should pass with no loss | ${duration} | ${rate}
-| | ...                                   | ${framesize} | 3-node-xconnect
+| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
+| | ... | ${framesize} | ${traffic_profile}
 
-| TC09: Verify 9000B ref-NDR at 2x 120kpps - DUT 802.1q - 4thread 4core 2rxq
+| tc09-9000B-4t4c-dot1q-l2xcbase-ndrchk
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2XC config with 4 threads, 4 phy cores, \
 | | ... | 2 receive queues per NIC port. [Ver] Verify ref-NDR for 9000 Byte
-| | ... | frames using single trial throughput test.
-| | [Tags] | 4T4C | MTHREAD
-| | ${framesize}= | Set Variable | 9000
-| | ${duration}= | Set Variable | 10
+| | ... | frames using single trial throughput test at 2x 120000pps.
+| | [Tags] | 9000B | 4T4C | MTHREAD
+| | ${framesize}= | Set Variable | ${9000}
 | | ${rate}= | Set Variable | 120000pps
 | | 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   VPP interfaces in path are up in a 3-node circular topology
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Apply startup configuration on all VPP DUTs
+| | And VPP interfaces in path are up in a 3-node circular topology
 | | When VLAN dot1q subinterfaces initialized on 3-node topology
 | | ... | ${dut1} | ${dut1_if2} | ${dut2} | ${dut2_if1} | ${subid}
 | | And L2 tag rewrite method setup on interfaces
@@ -266,5 +262,5 @@
 | | And Interfaces and VLAN sub-interfaces inter-connected using L2-xconnect
 | | ... | ${dut1} | ${dut1_if1} | ${subif_index_1}
 | | ... | ${dut2} | ${dut2_if2} | ${subif_index_2}
-| | Then Traffic should pass with no loss | ${duration} | ${rate}
-| | ...                                   | ${framesize} | 3-node-xconnect
+| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
+| | ... | ${framesize} | ${traffic_profile}