X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=tests%2Fperf%2F10ge2p1x520-ethip6-ip6base-ndrdisc.robot;h=38cd52b5a54b33a6e59337f1e65b532ef2376469;hb=86f35c2c60a680b58fca27d9298dd53d02e0138f;hp=ca0c5a80ebcf97b4311fcb867ffd37ac2bf0a225;hpb=3ef4ce6c9cc006d728a8acea20bc18aadc88acdc;p=csit.git

diff --git a/tests/perf/10ge2p1x520-ethip6-ip6base-ndrdisc.robot b/tests/perf/10ge2p1x520-ethip6-ip6base-ndrdisc.robot
index ca0c5a80eb..38cd52b5a5 100644
--- a/tests/perf/10ge2p1x520-ethip6-ip6base-ndrdisc.robot
+++ b/tests/perf/10ge2p1x520-ethip6-ip6base-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:
@@ -13,19 +13,18 @@
 
 *** Settings ***
 | Resource | resources/libraries/robot/performance.robot
+| ...
 | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDRDISC
-| ...        | NIC_Intel-X520-DA2 | ETH | IP6FWD | BASE
+| ... | NIC_Intel-X520-DA2 | ETH | IP6FWD | BASE
+| ...
 | 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-IPv6
-| ...           | 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-IPv6
+| ...
 | Documentation | *RFC2544: Pkt throughput IPv6 routing test cases*
 | ...
 | ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology
@@ -48,11 +47,11 @@
 | ... | *[Ref] Applicable standard specifications:* RFC2544.
 
 *** Variables ***
-#X520-DA2 bandwidth limit
+# X520-DA2 bandwidth limit
 | ${s_limit} | ${10000000000}
 
 *** Test Cases ***
-| TC01: 78B NDR binary search - DUT IPv6 - 1thread 1core 1rxq
+| tc01-78B-1t1c-ethip6-ip6base-ndrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 routing config with 1 thread, 1 phy core, \
 | | ... | 1 receive queue per NIC port. [Ver] Find NDR for 78 Byte frames
@@ -74,7 +73,7 @@
 | | ...                                       | ${min_rate} | ${max_rate}
 | | ...                                       | ${threshold}
 
-| TC02: 78B PDR binary search - DUT IPv6 - 1thread 1core 1rxq
+| tc02-78B-1t1c-ethip6-ip6base-pdrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 routing config with 1 thread, 1 phy core, \
 | | ... | 1 receive queue per NIC port. [Ver] Find PDR for 78 Byte frames
@@ -95,10 +94,10 @@
 | | ...                                       | ${binary_max} | 3-node-IPv6
 | | ...                                       | ${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 IPv6 - 1thread 1core 1rxq
+| tc03-1518B-1t1c-ethip6-ip6base-ndrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 routing config with 1 thread, 1 phy core, \
 | | ... | 1 receive queue per NIC port. [Ver] Find NDR for 1518 Byte frames
@@ -120,7 +119,7 @@
 | | ...                                       | ${min_rate} | ${max_rate}
 | | ...                                       | ${threshold}
 
-| TC04: 1518B PDR binary search - DUT IPv6 - 1thread 1core 1rxq
+| tc04-1518B-1t1c-ethip6-ip6base-pdrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 routing config with 1 thread, 1 phy core, \
 | | ... | 1 receive queue per NIC port. [Ver] Find PDR for 1518 Byte frames
@@ -141,10 +140,10 @@
 | | ...                                       | ${binary_max} | 3-node-IPv6
 | | ...                                       | ${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 IPv6 - 1thread 1core 1rxq
+| tc05-9000B-1t1c-ethip6-ip6base-ndrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 routing config with 1 thread, 1 phy core, \
 | | ... | 1 receive queue per NIC port. [Ver] Find NDR for 9000 Byte frames
@@ -165,7 +164,7 @@
 | | ...                                       | ${min_rate} | ${max_rate}
 | | ...                                       | ${threshold}
 
-| TC06: 9000B PDR binary search - DUT IPv6 - 1thread 1core 1rxq
+| tc06-9000B-1t1c-ethip6-ip6base-pdrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 routing config with 1 thread, 1 phy core, \
 | | ... | 1 receive queue per NIC port. [Ver] Find PDR for 9000 Byte frames
@@ -185,10 +184,10 @@
 | | ...                                       | ${binary_max} | 3-node-IPv6
 | | ...                                       | ${min_rate} | ${max_rate}
 | | ...                                       | ${threshold}
-| | ...                                       | ${glob_loss_acceptance}
-| | ...                                       | ${glob_loss_acceptance_type}
+| | ...                                       | ${perf_pdr_loss_acceptance}
+| | ...                                       | ${perf_pdr_loss_acceptance_type}
 
-| TC07: 78B NDR binary search - DUT IPv6 - 2threads 2cores 1rxq
+| tc07-78B-2t2c-ethip6-ip6base-ndrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 routing config with 2 threads, 2 phy cores, \
 | | ... | 1 receive queue per NIC port. [Ver] Find NDR for 78 Byte frames
@@ -210,7 +209,7 @@
 | | ...                                       | ${min_rate} | ${max_rate}
 | | ...                                       | ${threshold}
 
-| TC08: 78B PDR binary search - DUT IPv6 - 2threads 2cores 1rxq
+| tc08-78B-2t2c-ethip6-ip6base-pdrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 routing config with 2 threads, 2 phy cores, \
 | | ... | 1 receive queue per NIC port. [Ver] Find PDR for 78 Byte frames
@@ -231,10 +230,10 @@
 | | ...                                       | ${binary_max} | 3-node-IPv6
 | | ...                                       | ${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 IPv6 - 2threads 2cores 1rxq
+| tc09-1518B-2t2c-ethip6-ip6base-ndrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 routing config with 2 threads, 2 phy cores, \
 | | ... | 1 receive queue per NIC port. [Ver] Find NDR for 1518 Byte frames
@@ -256,7 +255,7 @@
 | | ...                                       | ${min_rate} | ${max_rate}
 | | ...                                       | ${threshold}
 
-| TC10: 1518B PDR binary search - DUT IPv6 - 2threads 2cores 1rxq
+| tc10-1518B-2t2c-ethip6-ip6base-pdrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 routing config with 2 threads, 2 phy cores, \
 | | ... | 1 receive queue per NIC port. [Ver] Find PDR for 1518 Byte frames
@@ -277,10 +276,10 @@
 | | ...                                       | ${binary_max} | 3-node-IPv6
 | | ...                                       | ${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 IPv6 - 2threads 2cores 1rxq
+| tc11-9000B-2t2c-ethip6-ip6base-ndrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 routing config with 2 threads, 2 phy cores, \
 | | ... | 1 receive queue per NIC port. [Ver] Find NDR for 9000 Byte frames
@@ -301,7 +300,7 @@
 | | ...                                       | ${min_rate} | ${max_rate}
 | | ...                                       | ${threshold}
 
-| TC12: 9000B PDR binary search - DUT IPv6 - 2threads 2cores 1rxq
+| tc12-9000B-2t2c-ethip6-ip6base-pdrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 routing config with 2 threads, 2 phy cores, \
 | | ... | 1 receive queue per NIC port. [Ver] Find PDR for 9000 Byte frames
@@ -321,10 +320,10 @@
 | | ...                                       | ${binary_max} | 3-node-IPv6
 | | ...                                       | ${min_rate} | ${max_rate}
 | | ...                                       | ${threshold}
-| | ...                                       | ${glob_loss_acceptance}
-| | ...                                       | ${glob_loss_acceptance_type}
+| | ...                                       | ${perf_pdr_loss_acceptance}
+| | ...                                       | ${perf_pdr_loss_acceptance_type}
 
-| TC13: 78B NDR binary search - DUT IPv6 - 4threads 4cores 2rxq
+| tc13-78B-4t4c-ethip6-ip6base-ndrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 routing config with 4 threads, 4 phy cores, \
 | | ... | 2 receive queues per NIC port. [Ver] Find NDR for 78 Byte frames
@@ -346,7 +345,7 @@
 | | ...                                       | ${min_rate} | ${max_rate}
 | | ...                                       | ${threshold}
 
-| TC14: 78B PDR binary search - DUT IPv6 - 4threads 4cores 2rxq
+| tc14-78B-4t4c-ethip6-ip6base-pdrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 routing config with 4 threads, 4 phy cores, \
 | | ... | 2 receive queues per NIC port. [Ver] Find PDR for 78 Byte frames
@@ -367,10 +366,10 @@
 | | ...                                       | ${binary_max} | 3-node-IPv6
 | | ...                                       | ${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 IPv6 - 4threads 4cores 2rxq
+| tc15-1518B-4t4c-ethip6-ip6base-ndrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 routing config with 4 threads, 4 phy cores, \
 | | ... | 2 receive queues per NIC port. [Ver] Find NDR for 1518 Byte frames
@@ -392,7 +391,7 @@
 | | ...                                       | ${min_rate} | ${max_rate}
 | | ...                                       | ${threshold}
 
-| TC16: 1518B PDR binary search - DUT IPv6 - 4threads 4cores 2rxq
+| tc16-1518B-4t4c-ethip6-ip6base-pdrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 routing config with 4 threads, 4 phy cores, \
 | | ... | 2 receive queues per NIC port. [Ver] Find PDR for 1518 Byte frames
@@ -413,10 +412,10 @@
 | | ...                                       | ${binary_max} | 3-node-IPv6
 | | ...                                       | ${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 IPv6 - 4threads 4cores 2rxq
+| tc17-9000B-4t4c-ethip6-ip6base-ndrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 routing config with 4 threads, 4 phy cores, \
 | | ... | 2 receive queues per NIC port. [Ver] Find NDR for 9000 Byte frames
@@ -437,7 +436,7 @@
 | | ...                                       | ${min_rate} | ${max_rate}
 | | ...                                       | ${threshold}
 
-| TC18: 9000B PDR binary search - DUT IPv6 - 4threads 4cores 2rxq
+| tc18-9000B-4t4c-ethip6-ip6base-pdrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 routing config with 4 threads, 4 phy cores, \
 | | ... | 2 receive queues per NIC port. [Ver] Find PDR for 9000 Byte frames
@@ -457,5 +456,5 @@
 | | ...                                       | ${binary_max} | 3-node-IPv6
 | | ...                                       | ${min_rate} | ${max_rate}
 | | ...                                       | ${threshold}
-| | ...                                       | ${glob_loss_acceptance}
-| | ...                                       | ${glob_loss_acceptance_type}
+| | ...                                       | ${perf_pdr_loss_acceptance}
+| | ...                                       | ${perf_pdr_loss_acceptance_type}