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

diff --git a/tests/perf/10ge2p1x520-dot1q-l2xcbase-ndrchk.robot b/tests/perf/10ge2p1x520-dot1q-l2xcbase-ndrchk.robot
index cf1fddff23..a38bff667e 100644
--- a/tests/perf/10ge2p1x520-dot1q-l2xcbase-ndrchk.robot
+++ b/tests/perf/10ge2p1x520-dot1q-l2xcbase-ndrchk.robot
@@ -12,18 +12,18 @@
 # limitations under the License.
 
 *** Settings ***
-| Resource | resources/libraries/robot/performance.robot
+| Resource | resources/libraries/robot/performance_setup.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
 | ...
-| 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-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 L2XC with 802.1q verify test cases*
 | ...
@@ -60,17 +60,17 @@
 | | [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
+| | 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 VPP interfaces in path are up in a 3-node circular topology
-| | When VLAN dot1q subinterfaces initialized on 3-node topology
+| | And Set interfaces in path in 3-node circular topology up
+| | When Initialize VLAN dot1q sub-interfaces in 3-node circular topology
 | | ... | ${dut1} | ${dut1_if2} | ${dut2} | ${dut2_if1} | ${subid}
-| | And L2 tag rewrite method setup on interfaces
+| | And Configure L2 tag rewrite method on interfaces
 | | ... | ${dut1} | ${subif_index_1} | ${dut2} | ${subif_index_2}
 | | ... | ${tag_rewrite}
-| | And Interfaces and VLAN sub-interfaces inter-connected using L2-xconnect
+| | And Connect interfaces and VLAN sub-interfaces using L2XC
 | | ... | ${dut1} | ${dut1_if1} | ${subif_index_1}
 | | ... | ${dut2} | ${dut2_if2} | ${subif_index_2}
 | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
@@ -84,17 +84,17 @@
 | | [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
+| | 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 VPP interfaces in path are up in a 3-node circular topology
-| | When VLAN dot1q subinterfaces initialized on 3-node topology
+| | And Set interfaces in path in 3-node circular topology up
+| | When Initialize VLAN dot1q sub-interfaces in 3-node circular topology
 | | ... | ${dut1} | ${dut1_if2} | ${dut2} | ${dut2_if1} | ${subid}
-| | And L2 tag rewrite method setup on interfaces
+| | And Configure L2 tag rewrite method on interfaces
 | | ... | ${dut1} | ${subif_index_1} | ${dut2} | ${subif_index_2}
 | | ... | ${tag_rewrite}
-| | And Interfaces and VLAN sub-interfaces inter-connected using L2-xconnect
+| | And Connect interfaces and VLAN sub-interfaces using L2XC
 | | ... | ${dut1} | ${dut1_if1} | ${subif_index_1}
 | | ... | ${dut2} | ${dut2_if2} | ${subif_index_2}
 | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
@@ -108,16 +108,16 @@
 | | [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
+| | 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 VPP interfaces in path are up in a 3-node circular topology
-| | When VLAN dot1q subinterfaces initialized on 3-node topology
+| | And Set interfaces in path in 3-node circular topology up
+| | When Initialize VLAN dot1q sub-interfaces in 3-node circular topology
 | | ... | ${dut1} | ${dut1_if2} | ${dut2} | ${dut2_if1} | ${subid}
-| | And L2 tag rewrite method setup on interfaces
+| | And Configure L2 tag rewrite method on interfaces
 | | ... | ${dut1} | ${subif_index_1} | ${dut2} | ${subif_index_2}
 | | ... | ${tag_rewrite}
-| | And Interfaces and VLAN sub-interfaces inter-connected using L2-xconnect
+| | And Connect interfaces and VLAN sub-interfaces using L2XC
 | | ... | ${dut1} | ${dut1_if1} | ${subif_index_1}
 | | ... | ${dut2} | ${dut2_if2} | ${subif_index_2}
 | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
@@ -131,17 +131,17 @@
 | | [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
+| | 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 VPP interfaces in path are up in a 3-node circular topology
-| | When VLAN dot1q subinterfaces initialized on 3-node topology
+| | And Set interfaces in path in 3-node circular topology up
+| | When Initialize VLAN dot1q sub-interfaces in 3-node circular topology
 | | ... | ${dut1} | ${dut1_if2} | ${dut2} | ${dut2_if1} | ${subid}
-| | And L2 tag rewrite method setup on interfaces
+| | And Configure L2 tag rewrite method on interfaces
 | | ... | ${dut1} | ${subif_index_1} | ${dut2} | ${subif_index_2}
 | | ... | ${tag_rewrite}
-| | And Interfaces and VLAN sub-interfaces inter-connected using L2-xconnect
+| | And Connect interfaces and VLAN sub-interfaces using L2XC
 | | ... | ${dut1} | ${dut1_if1} | ${subif_index_1}
 | | ... | ${dut2} | ${dut2_if2} | ${subif_index_2}
 | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
@@ -155,17 +155,17 @@
 | | [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
+| | 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 VPP interfaces in path are up in a 3-node circular topology
-| | When VLAN dot1q subinterfaces initialized on 3-node topology
+| | And Set interfaces in path in 3-node circular topology up
+| | When Initialize VLAN dot1q sub-interfaces in 3-node circular topology
 | | ... | ${dut1} | ${dut1_if2} | ${dut2} | ${dut2_if1} | ${subid}
-| | And L2 tag rewrite method setup on interfaces
+| | And Configure L2 tag rewrite method on interfaces
 | | ... | ${dut1} | ${subif_index_1} | ${dut2} | ${subif_index_2}
 | | ... | ${tag_rewrite}
-| | And Interfaces and VLAN sub-interfaces inter-connected using L2-xconnect
+| | And Connect interfaces and VLAN sub-interfaces using L2XC
 | | ... | ${dut1} | ${dut1_if1} | ${subif_index_1}
 | | ... | ${dut2} | ${dut2_if2} | ${subif_index_2}
 | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
@@ -179,16 +179,16 @@
 | | [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
+| | 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 VPP interfaces in path are up in a 3-node circular topology
-| | When VLAN dot1q subinterfaces initialized on 3-node topology
+| | And Set interfaces in path in 3-node circular topology up
+| | When Initialize VLAN dot1q sub-interfaces in 3-node circular topology
 | | ... | ${dut1} | ${dut1_if2} | ${dut2} | ${dut2_if1} | ${subid}
-| | And L2 tag rewrite method setup on interfaces
+| | And Configure L2 tag rewrite method on interfaces
 | | ... | ${dut1} | ${subif_index_1} | ${dut2} | ${subif_index_2}
 | | ... | ${tag_rewrite}
-| | And Interfaces and VLAN sub-interfaces inter-connected using L2-xconnect
+| | And Connect interfaces and VLAN sub-interfaces using L2XC
 | | ... | ${dut1} | ${dut1_if1} | ${subif_index_1}
 | | ... | ${dut2} | ${dut2_if2} | ${subif_index_2}
 | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
@@ -202,17 +202,17 @@
 | | [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
+| | 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 VPP interfaces in path are up in a 3-node circular topology
-| | When VLAN dot1q subinterfaces initialized on 3-node topology
+| | And Set interfaces in path in 3-node circular topology up
+| | When Initialize VLAN dot1q sub-interfaces in 3-node circular topology
 | | ... | ${dut1} | ${dut1_if2} | ${dut2} | ${dut2_if1} | ${subid}
-| | And L2 tag rewrite method setup on interfaces
+| | And Configure L2 tag rewrite method on interfaces
 | | ... | ${dut1} | ${subif_index_1} | ${dut2} | ${subif_index_2}
 | | ... | ${tag_rewrite}
-| | And Interfaces and VLAN sub-interfaces inter-connected using L2-xconnect
+| | And Connect interfaces and VLAN sub-interfaces using L2XC
 | | ... | ${dut1} | ${dut1_if1} | ${subif_index_1}
 | | ... | ${dut2} | ${dut2_if2} | ${subif_index_2}
 | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
@@ -226,17 +226,17 @@
 | | [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
+| | 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 VPP interfaces in path are up in a 3-node circular topology
-| | When VLAN dot1q subinterfaces initialized on 3-node topology
+| | And Set interfaces in path in 3-node circular topology up
+| | When Initialize VLAN dot1q sub-interfaces in 3-node circular topology
 | | ... | ${dut1} | ${dut1_if2} | ${dut2} | ${dut2_if1} | ${subid}
-| | And L2 tag rewrite method setup on interfaces
+| | And Configure L2 tag rewrite method on interfaces
 | | ... | ${dut1} | ${subif_index_1} | ${dut2} | ${subif_index_2}
 | | ... | ${tag_rewrite}
-| | And Interfaces and VLAN sub-interfaces inter-connected using L2-xconnect
+| | And Connect interfaces and VLAN sub-interfaces using L2XC
 | | ... | ${dut1} | ${dut1_if1} | ${subif_index_1}
 | | ... | ${dut2} | ${dut2_if2} | ${subif_index_2}
 | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
@@ -250,16 +250,16 @@
 | | [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
+| | 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 VPP interfaces in path are up in a 3-node circular topology
-| | When VLAN dot1q subinterfaces initialized on 3-node topology
+| | And Set interfaces in path in 3-node circular topology up
+| | When Initialize VLAN dot1q sub-interfaces in 3-node circular topology
 | | ... | ${dut1} | ${dut1_if2} | ${dut2} | ${dut2_if1} | ${subid}
-| | And L2 tag rewrite method setup on interfaces
+| | And Configure L2 tag rewrite method on interfaces
 | | ... | ${dut1} | ${subif_index_1} | ${dut2} | ${subif_index_2}
 | | ... | ${tag_rewrite}
-| | And Interfaces and VLAN sub-interfaces inter-connected using L2-xconnect
+| | And Connect interfaces and VLAN sub-interfaces using L2XC
 | | ... | ${dut1} | ${dut1_if1} | ${subif_index_1}
 | | ... | ${dut2} | ${dut2_if2} | ${subif_index_2}
 | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}