X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=tests%2Fperf%2F10ge2p1x520-ethip4-ip4base-copwhtlistbase-ndrdisc.robot;h=b6afedc54798bd5044d41a083a42416b72e9d6fb;hb=81fc408c0dfcce0e093733810d80598abf25866a;hp=4a81e5de4443ecc0f93229d4922e0d17b5fec1bd;hpb=3ef4ce6c9cc006d728a8acea20bc18aadc88acdc;p=csit.git

diff --git a/tests/perf/10ge2p1x520-ethip4-ip4base-copwhtlistbase-ndrdisc.robot b/tests/perf/10ge2p1x520-ethip4-ip4base-copwhtlistbase-ndrdisc.robot
index 4a81e5de44..b6afedc547 100644
--- a/tests/perf/10ge2p1x520-ethip4-ip4base-copwhtlistbase-ndrdisc.robot
+++ b/tests/perf/10ge2p1x520-ethip4-ip4base-copwhtlistbase-ndrdisc.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,21 +14,22 @@
 *** Settings ***
 | Resource | resources/libraries/robot/performance.robot
 | Library | resources.libraries.python.Cop
-| Library | resources.libraries.python.IPv4Setup.Dut | ${nodes['DUT1']} | WITH NAME | dut1_v4
-| Library | resources.libraries.python.IPv4Setup.Dut | ${nodes['DUT2']} | WITH NAME | dut2_v4
+| Library | resources.libraries.python.IPv4Setup.Dut | ${nodes['DUT1']}
+| ... | WITH NAME | dut1_v4
+| Library | resources.libraries.python.IPv4Setup.Dut | ${nodes['DUT2']}
+| ... | WITH NAME | dut2_v4
+| ...
 | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDRDISC
-| ...        | NIC_Intel-X520-DA2 | ETH | IP4FWD | FEATURE | COPWHLIST
+| ... | NIC_Intel-X520-DA2 | ETH | IP4FWD | FEATURE | COPWHLIST
+| ...
 | Suite Setup | 3-node Performance Suite Setup with DUT's NIC model
 | ... | L3 | Intel-X520-DA2
 | Suite Teardown | 3-node Performance Suite Teardown
-| Test Setup | Setup all DUTs before test
-| Test Teardown | Run Keywords
-| ...           | Run Keyword If Test Failed
-| ...           | Traffic should pass with no loss | 10
-| ...           | ${min_rate}pps | ${framesize} | 3-node-IPv4
-| ...           | fail_on_loss=${False}
-| ...           | AND | Remove startup configuration of VPP from all DUTs
-| ...           | AND | Show vpp trace dump on all DUTs
+| ...
+| Test Setup | Performance test setup
+| Test Teardown | Performance test teardown | ${min_rate}pps | ${framesize}
+| ... | 3-node-IPv4
+| ...
 | Documentation | *RFC2544: Pkt throughput IPv4 whitelist test cases*
 | ...
 | ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology
@@ -53,11 +54,11 @@
 | ... | *[Ref] Applicable standard specifications:* RFC2544.
 
 *** Variables ***
-#X520-DA2 bandwidth limit
+# X520-DA2 bandwidth limit
 | ${s_limit} | ${10000000000}
 
 *** Test Cases ***
-| TC01: 64B NDR binary search - DUT IPv4 whitelist - 1thread 1core 1rxq
+| tc01-64B-1t1c-ethip4-ip4base-copwhtlistbase-ndrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv4 routing and whitelist filters config with \
 | | ... | 1 thread, 1 phy core, 1 receive queue per NIC port. [Ver] Find NDR
@@ -86,7 +87,7 @@
 | | ...                                       | ${min_rate} | ${max_rate}
 | | ...                                       | ${threshold}
 
-| TC02: 64B PDR binary search - DUT IPv4 whitelist - 1thread 1core 1rxq
+| tc02-64B-1t1c-ethip4-ip4base-copwhtlistbase-pdrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv4 routing and whitelist filters config with \
 | | ... | 1 thread, 1 phy core, 1 receive queue per NIC port. [Ver] Find PDR
@@ -114,10 +115,10 @@
 | | ...                                       | ${binary_max} | 3-node-IPv4
 | | ...                                       | ${min_rate} | ${max_rate}
 | | ...                                       | ${threshold}
-| | ...                                       | ${glob_loss_acceptance}
-| | ...                                       | ${glob_loss_acceptance_type}
+| | ...                                       | ${perf_pdr_loss_acceptance}
+| | ...                                       | ${perf_pdr_loss_acceptance_type}
 
-| TC03: 1518B NDR binary search - DUT IPv4 whitelist - 1thread 1core 1rxq
+| tc03-1518B-1t1c-ethip4-ip4base-copwhtlistbase-ndrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv4 routing and whitelist filters config with \
 | | ... | 1 thread, 1 phy core, 1 receive queue per NIC port. [Ver] Find NDR
@@ -146,7 +147,7 @@
 | | ...                                       | ${min_rate} | ${max_rate}
 | | ...                                       | ${threshold}
 
-| TC04: 1518B PDR binary search - DUT IPv4 whitelist - 1thread 1core 1rxq
+| tc04-1518B-1t1c-ethip4-ip4base-copwhtlistbase-pdrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv4 routing and whitelist filters config with \
 | | ... | 1 thread, 1 phy core, 1 receive queue per NIC port. [Ver] Find PDR
@@ -174,10 +175,10 @@
 | | ...                                       | ${binary_max} | 3-node-IPv4
 | | ...                                       | ${min_rate} | ${max_rate}
 | | ...                                       | ${threshold}
-| | ...                                       | ${glob_loss_acceptance}
-| | ...                                       | ${glob_loss_acceptance_type}
+| | ...                                       | ${perf_pdr_loss_acceptance}
+| | ...                                       | ${perf_pdr_loss_acceptance_type}
 
-| TC05: 9000B NDR binary search - DUT IPv4 whitelist - 1thread 1core 1rxq
+| tc05-9000B-1t1c-ethip4-ip4base-copwhtlistbase-ndrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv4 routing and whitelist filters config with \
 | | ... | 1 thread, 1 phy core, 1 receive queue per NIC port. [Ver] Find NDR
@@ -205,7 +206,7 @@
 | | ...                                       | ${min_rate} | ${max_rate}
 | | ...                                       | ${threshold}
 
-| TC06: 9000B PDR binary search - DUT IPv4 whitelist - 1thread 1core 1rxq
+| tc06-9000B-1t1c-ethip4-ip4base-copwhtlistbase-pdrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv4 routing and whitelist filters config with \
 | | ... | 1 thread, 1 phy core, 1 receive queue per NIC port. [Ver] Find PDR
@@ -232,10 +233,10 @@
 | | ...                                       | ${binary_max} | 3-node-IPv4
 | | ...                                       | ${min_rate} | ${max_rate}
 | | ...                                       | ${threshold}
-| | ...                                       | ${glob_loss_acceptance}
-| | ...                                       | ${glob_loss_acceptance_type}
+| | ...                                       | ${perf_pdr_loss_acceptance}
+| | ...                                       | ${perf_pdr_loss_acceptance_type}
 
-| TC07: 64B NDR binary search - DUT IPv4 whitelist - 2threads 2cores 1rxq
+| tc07-64B-2t2c-ethip4-ip4base-copwhtlistbase-ndrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv4 routing and whitelist filters config with \
 | | ... | 2 threads, 2 phy cores, 1 receive queue per NIC port. [Ver] Find NDR
@@ -264,7 +265,7 @@
 | | ...                                       | ${min_rate} | ${max_rate}
 | | ...                                       | ${threshold}
 
-| TC08: 64B PDR binary search - DUT IPv4 whitelist - 2threads 2cores 1rxq
+| tc08-64B-2t2c-ethip4-ip4base-copwhtlistbase-pdrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv4 routing and whitelist filters config with \
 | | ... | 2 threads, 2 phy cores, 1 receive queue per NIC port. [Ver] Find PDR
@@ -292,10 +293,10 @@
 | | ...                                       | ${binary_max} | 3-node-IPv4
 | | ...                                       | ${min_rate} | ${max_rate}
 | | ...                                       | ${threshold}
-| | ...                                       | ${glob_loss_acceptance}
-| | ...                                       | ${glob_loss_acceptance_type}
+| | ...                                       | ${perf_pdr_loss_acceptance}
+| | ...                                       | ${perf_pdr_loss_acceptance_type}
 
-| TC09: 1518B NDR binary search - DUT IPv4 whitelist - 2threads 2cores 1rxq
+| tc09-1518B-2t2c-ethip4-ip4base-copwhtlistbase-ndrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv4 routing and whitelist filters config with \
 | | ... | 2 threads, 2 phy cores, 1 receive queue per NIC port. [Ver] Find NDR
@@ -324,7 +325,7 @@
 | | ...                                       | ${min_rate} | ${max_rate}
 | | ...                                       | ${threshold}
 
-| TC10: 1518B PDR binary search - DUT IPv4 whitelist - 2threads 2cores 1rxq
+| tc10-1518B-2t2c-ethip4-ip4base-copwhtlistbase-pdrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv4 routing and whitelist filters config with \
 | | ... | 2 threads, 2 phy cores, 1 receive queue per NIC port. [Ver] Find PDR
@@ -352,10 +353,10 @@
 | | ...                                       | ${binary_max} | 3-node-IPv4
 | | ...                                       | ${min_rate} | ${max_rate}
 | | ...                                       | ${threshold}
-| | ...                                       | ${glob_loss_acceptance}
-| | ...                                       | ${glob_loss_acceptance_type}
+| | ...                                       | ${perf_pdr_loss_acceptance}
+| | ...                                       | ${perf_pdr_loss_acceptance_type}
 
-| TC11: 9000B NDR binary search - DUT IPv4 whitelist - 2threads 2cores 1rxq
+| tc11-9000B-2t2c-ethip4-ip4base-copwhtlistbase-ndrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv4 routing and whitelist filters config with \
 | | ... | 2 threads, 2 phy cores, 1 receive queue per NIC port. [Ver] Find NDR
@@ -383,7 +384,7 @@
 | | ...                                       | ${min_rate} | ${max_rate}
 | | ...                                       | ${threshold}
 
-| TC12: 9000B PDR binary search - DUT IPv4 whitelist - 2threads 2cores 1rxq
+| tc12-9000B-2t2c-ethip4-ip4base-copwhtlistbase-pdrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv4 routing and whitelist filters config with \
 | | ... | 2 threads, 2 phy cores, 1 receive queue per NIC port. [Ver] Find PDR
@@ -410,10 +411,10 @@
 | | ...                                       | ${binary_max} | 3-node-IPv4
 | | ...                                       | ${min_rate} | ${max_rate}
 | | ...                                       | ${threshold}
-| | ...                                       | ${glob_loss_acceptance}
-| | ...                                       | ${glob_loss_acceptance_type}
+| | ...                                       | ${perf_pdr_loss_acceptance}
+| | ...                                       | ${perf_pdr_loss_acceptance_type}
 
-| TC13: 64B NDR binary search - DUT IPv4 whitelist - 4threads 4cores 2rxq
+| tc13-64B-4t4c-ethip4-ip4base-copwhtlistbase-ndrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv4 routing and whitelist filters config with \
 | | ... | 4 threads, 4 phy cores, 2 receive queue per NIC port. [Ver] Find NDR
@@ -442,7 +443,7 @@
 | | ...                                       | ${min_rate} | ${max_rate}
 | | ...                                       | ${threshold}
 
-| TC14: 64B PDR binary search - DUT IPv4 whitelist - 4threads 4cores 2rxq
+| tc14-64B-4t4c-ethip4-ip4base-copwhtlistbase-pdrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv4 routing and whitelist filters config with \
 | | ... | 4 threads, 4 phy cores, 2 receive queue per NIC port. [Ver] Find PDR
@@ -470,10 +471,10 @@
 | | ...                                       | ${binary_max} | 3-node-IPv4
 | | ...                                       | ${min_rate} | ${max_rate}
 | | ...                                       | ${threshold}
-| | ...                                       | ${glob_loss_acceptance}
-| | ...                                       | ${glob_loss_acceptance_type}
+| | ...                                       | ${perf_pdr_loss_acceptance}
+| | ...                                       | ${perf_pdr_loss_acceptance_type}
 
-| TC15: 1518B NDR binary search - DUT IPv4 whitelist - 4threads 4cores 2rxq
+| tc15-1518B-4t4c-ethip4-ip4base-copwhtlistbase-ndrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv4 routing and whitelist filters config with \
 | | ... | 4 threads, 4 phy cores, 2 receive queue per NIC port. [Ver] Find NDR
@@ -502,7 +503,7 @@
 | | ...                                       | ${min_rate} | ${max_rate}
 | | ...                                       | ${threshold}
 
-| TC16: 1518B PDR binary search - DUT IPv4 whitelist - 4threads 4cores 2rxq
+| tc16-1518B-4t4c-ethip4-ip4base-copwhtlistbase-pdrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv4 routing and whitelist filters config with \
 | | ... | 4 threads, 4 phy cores, 2 receive queue per NIC port. [Ver] Find PDR
@@ -530,10 +531,10 @@
 | | ...                                       | ${binary_max} | 3-node-IPv4
 | | ...                                       | ${min_rate} | ${max_rate}
 | | ...                                       | ${threshold}
-| | ...                                       | ${glob_loss_acceptance}
-| | ...                                       | ${glob_loss_acceptance_type}
+| | ...                                       | ${perf_pdr_loss_acceptance}
+| | ...                                       | ${perf_pdr_loss_acceptance_type}
 
-| TC17: 9000B NDR binary search - DUT IPv4 whitelist - 4threads 4cores 2rxq
+| tc17-9000B-4t4c-ethip4-ip4base-copwhtlistbase-ndrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv4 routing and whitelist filters config with \
 | | ... | 4 threads, 4 phy cores, 2 receive queue per NIC port. [Ver] Find NDR
@@ -561,7 +562,7 @@
 | | ...                                       | ${min_rate} | ${max_rate}
 | | ...                                       | ${threshold}
 
-| TC18: 9000B PDR binary search - DUT IPv4 whitelist - 4threads 4cores 2rxq
+| tc18-9000B-4t4c-ethip4-ip4base-copwhtlistbase-pdrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv4 routing and whitelist filters config with \
 | | ... | 4 threads, 4 phy cores, 2 receive queue per NIC port. [Ver] Find PDR
@@ -588,5 +589,5 @@
 | | ...                                       | ${binary_max} | 3-node-IPv4
 | | ...                                       | ${min_rate} | ${max_rate}
 | | ...                                       | ${threshold}
-| | ...                                       | ${glob_loss_acceptance}
-| | ...                                       | ${glob_loss_acceptance_type}
+| | ...                                       | ${perf_pdr_loss_acceptance}
+| | ...                                       | ${perf_pdr_loss_acceptance_type}