X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=tests%2Fperf%2F10ge2p1x520-eth-l2bdbasemaclrn-ndrchk.robot;h=9b4e66cde3af3464fa586c93d6024e76934424a9;hp=e8aa347cd7965f9e06da14f1c38ea9e9b4b2679f;hb=430afafb4cadf503ccee99c09f6de7402f5404c7;hpb=1c9b487b0d3652e477490eb1237c5870296dc497

diff --git a/tests/perf/10ge2p1x520-eth-l2bdbasemaclrn-ndrchk.robot b/tests/perf/10ge2p1x520-eth-l2bdbasemaclrn-ndrchk.robot
index e8aa347cd7..9b4e66cde3 100644
--- a/tests/perf/10ge2p1x520-eth-l2bdbasemaclrn-ndrchk.robot
+++ b/tests/perf/10ge2p1x520-eth-l2bdbasemaclrn-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
 | Library | resources.libraries.python.NodePath
+| ...
 | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRCHK
-| ...        | NIC_Intel-X520-DA2 | ETH | L2BDMACLRN | BASE
-| Suite Setup | 3-node Performance Suite Setup with DUT's NIC model
+| ... | NIC_Intel-X520-DA2 | ETH | L2BDMACLRN | BASE | L2BDBASE
+| ...
+| Suite Setup | Set up 3-node performance topology 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
+| Suite Teardown | Tear down 3-node performance topology
+| ...
+| Test Setup | Set up performance test
+| Test Teardown | Tear down performance ndrchk test
+| ...
 | Documentation | *Reference NDR throughput L2BD verify test cases*
 | ...
 | ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology
@@ -42,153 +45,148 @@
 | ... | TG node interfaces.
 | ... | *[Ref] Applicable standard specifications:* RFC2544.
 
+*** Variables ***
+# Traffic profile:
+| ${traffic_profile} | trex-sl-3n-ethip4-ip4src254
+
 *** Test Cases ***
 | tc01-64B-1t1c-eth-l2bdbasemaclrn-ndrchk
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD 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.2mpps.
-| | [Tags] | 1T1C | STHREAD
-| | ${framesize}= | Set Variable | 64
-| | ${duration}= | Set Variable | 10
-| | ${rate}= | Set Variable | 3.2mpps
-| | 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   L2 bridge domain initialized in a 3-node circular topology
-| | Then  Traffic should pass with no loss | ${duration} | ${rate}
-| | ...                                    | ${framesize} | 3-node-bridge
+| | ... | frames using single trial throughput test at 2x 4.9mpps.
+| | [Tags] | 64B | 1T1C | STHREAD
+| | ${framesize}= | Set Variable | ${64}
+| | ${rate}= | Set Variable | 4.9mpps
+| | 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 Initialize L2 bridge domain in 3-node circular topology
+| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
+| | ... | ${framesize} | ${traffic_profile}
 
 | tc02-1518B-1t1c-eth-l2bdbasemaclrn-ndrchk
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD 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
-| | ${framesize}= | Set Variable | 1518
-| | ${duration}= | Set Variable | 10
+| | [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
-| | And   Apply startup configuration on all VPP DUTs
-| | And   L2 bridge domain initialized in a 3-node circular topology
-| | Then Traffic should pass with no loss | ${duration} | ${rate}
-| | ...                                   | ${framesize} | 3-node-bridge
+| | 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 Initialize L2 bridge domain in 3-node circular topology
+| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
+| | ... | ${framesize} | ${traffic_profile}
 
 | tc03-9000B-1t1c-eth-l2bdbasemaclrn-ndrchk
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD 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
-| | ${framesize}= | Set Variable | 9000
-| | ${duration}= | Set Variable | 10
+| | [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
-| | And   Apply startup configuration on all VPP DUTs
-| | And   L2 bridge domain initialized in a 3-node circular topology
-| | Then Traffic should pass with no loss | ${duration} | ${rate}
-| | ...                                   | ${framesize} | 3-node-bridge
+| | 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 Initialize L2 bridge domain in 3-node circular topology
+| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
+| | ... | ${framesize} | ${traffic_profile}
 
 | tc04-64B-2t2c-eth-l2bdbasemaclrn-ndrchk
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD 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.9mpps.
-| | [Tags] | 2T2C | MTHREAD
-| | ${framesize}= | Set Variable | 64
-| | ${duration}= | Set Variable | 10
-| | ${rate}= | Set Variable | 6.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
-| | And   Apply startup configuration on all VPP DUTs
-| | And   L2 bridge domain initialized in a 3-node circular topology
-| | Then Traffic should pass with no loss | ${duration} | ${rate}
-| | ...                                   | ${framesize} | 3-node-bridge
+| | ... | frames using single trial throughput test at 2x 10.4mpps.
+| | [Tags] | 64B | 2T2C | MTHREAD
+| | ${framesize}= | Set Variable | ${64}
+| | ${rate}= | Set Variable | 10.4mpps
+| | 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 Initialize L2 bridge domain in 3-node circular topology
+| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
+| | ... | ${framesize} | ${traffic_profile}
 
 | tc05-1518B-2t2c-eth-l2bdbasemaclrn-ndrchk
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD 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
-| | ${framesize}= | Set Variable | 1518
-| | ${duration}= | Set Variable | 10
+| | [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
-| | And   Apply startup configuration on all VPP DUTs
-| | And   L2 bridge domain initialized in a 3-node circular topology
-| | Then Traffic should pass with no loss | ${duration} | ${rate}
-| | ...                                   | ${framesize} | 3-node-bridge
+| | 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 Initialize L2 bridge domain in 3-node circular topology
+| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
+| | ... | ${framesize} | ${traffic_profile}
 
 | tc06-9000B-2t2c-eth-l2bdbasemaclrn-ndrchk
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD 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
-| | ${framesize}= | Set Variable | 9000
-| | ${duration}= | Set Variable | 10
+| | [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
-| | And   Apply startup configuration on all VPP DUTs
-| | And   L2 bridge domain initialized in a 3-node circular topology
-| | Then Traffic should pass with no loss | ${duration} | ${rate}
-| | ...                                   | ${framesize} | 3-node-bridge
+| | 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 Initialize L2 bridge domain in 3-node circular topology
+| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
+| | ... | ${framesize} | ${traffic_profile}
 
 | tc07-64B-4t4c-eth-l2bdbasemaclrn-ndrchk
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD 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 at 2x 7.4mpps.
-| | [Tags] | 4T4C | MTHREAD
-| | ${framesize}= | Set Variable | 64
-| | ${duration}= | Set Variable | 10
-| | ${rate}= | Set Variable | 7.4mpps
-| | 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   L2 bridge domain initialized in a 3-node circular topology
-| | Then Traffic should pass with no loss | ${duration} | ${rate}
-| | ...                                   | ${framesize} | 3-node-bridge
+| | ... | frames using single trial throughput test at 2x 10.4mpps.
+| | [Tags] | 64B | 4T4C | MTHREAD
+| | ${framesize}= | Set Variable | ${64}
+| | ${rate}= | Set Variable | 10.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
+| | And Initialize L2 bridge domain in 3-node circular topology
+| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
+| | ... | ${framesize} | ${traffic_profile}
 
 | tc08-1518B-4t4c-eth-l2bdbasemaclrn-ndrchk
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD 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 at 2x 812743pps.
-| | [Tags] | 4T4C | MTHREAD
-| | ${framesize}= | Set Variable | 1518
-| | ${duration}= | Set Variable | 10
+| | [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
-| | And   Apply startup configuration on all VPP DUTs
-| | And   L2 bridge domain initialized in a 3-node circular topology
-| | Then Traffic should pass with no loss | ${duration} | ${rate}
-| | ...                                   | ${framesize} | 3-node-bridge
+| | 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 Initialize L2 bridge domain in 3-node circular topology
+| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
+| | ... | ${framesize} | ${traffic_profile}
 
 | tc09-9000B-4t4c-eth-l2bdbasemaclrn-ndrchk
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2BD 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 at 2x 138580pps.
-| | [Tags] | 4T4C | MTHREAD
-| | ${framesize}= | Set Variable | 9000
-| | ${duration}= | Set Variable | 10
+| | [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
-| | And   Apply startup configuration on all VPP DUTs
-| | And   L2 bridge domain initialized in a 3-node circular topology
-| | Then Traffic should pass with no loss | ${duration} | ${rate}
-| | ...                                   | ${framesize} | 3-node-bridge
+| | 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 Initialize L2 bridge domain in 3-node circular topology
+| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
+| | ... | ${framesize} | ${traffic_profile}