X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=tests%2Fperf%2F10ge2p1x520-ethip6lispip6-ip6base-ndrdisc.robot;h=2cc52af33090e2e3dbc5840f43c13925389a3617;hb=5a6730f9ce36b4d09b121d401209d89288da301b;hp=1d5c5d2e65001a0af2f5de54173e78cd2e4b132d;hpb=3ef4ce6c9cc006d728a8acea20bc18aadc88acdc;p=csit.git

diff --git a/tests/perf/10ge2p1x520-ethip6lispip6-ip6base-ndrdisc.robot b/tests/perf/10ge2p1x520-ethip6lispip6-ip6base-ndrdisc.robot
index 1d5c5d2e65..2cc52af330 100644
--- a/tests/perf/10ge2p1x520-ethip6lispip6-ip6base-ndrdisc.robot
+++ b/tests/perf/10ge2p1x520-ethip6lispip6-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:
@@ -14,20 +14,19 @@
 *** Settings ***
 | Resource | resources/libraries/robot/performance.robot
 | Resource | resources/libraries/robot/lisp/lisp_static_adjacency.robot
-# import additional Lisp settings from resource file
 | Variables | resources/test_data/lisp/performance/lisp_static_adjacency.py
+| ...
 | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDRDISC
 | ... | NIC_Intel-X520-DA2 | IP6FWD | ENCAP | LISP | IP6UNRLAY | IP6OVRLAY
+| ...
 | 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
+| ...
+| Test Setup | Performance test setup
+| Test Teardown | Performance test teardown | ${min_rate}pps | ${framesize}
+| ... | 3-node-IPv6
+| ...
 | Documentation | *RFC6830: Pkt throughput Lisp test cases*
 | ...
 | ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology\
@@ -46,11 +45,11 @@
 | ... | *[Ref] Applicable standard specifications:* RFC6830.
 
 *** Variables ***
-#X520-DA2 bandwidth limit
+# X520-DA2 bandwidth limit
 | ${s_limit} | ${10000000000}
 
 *** Test Cases ***
-| TC01: 78B NDR binary search - DUT IPv6 over LISPoIPv6 tunnel - 1thread 1core 1rxq
+| tc01-78B-1t1c-ethip6lispip6-ip6base-ndrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 LISP remote static mappings and whitelist\
 | | ... | filters config with 1 thread, 1 phy core, 1 receive queue per NIC\
@@ -81,7 +80,7 @@
 | | ...                                       | ${min_rate} | ${max_rate}
 | | ...                                       | ${threshold}
 
-| TC02: 78B PDR binary search - DUT IPv6 over LISPoIPv6 tunnel - 1thread 1core 1rxq
+| tc02-78B-1t1c-ethip6lispip6-ip6base-pdrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 LISP remote static mappings and whitelist\
 | | ... | filters config with 1 thread, 1 phy core, 1 receive queue per NIC\
@@ -111,10 +110,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: 1460B NDR binary search - DUT IPv6 over LISPoIPv6 tunnel - 1thread 1core 1rxq
+| tc03-1460B-1t1c-ethip6lispip6-ip6base-ndrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 LISP remote static mappings and whitelist\
 | | ... | filters config with 1 thread, 1 phy core, 1 receive queue per NIC\
@@ -145,7 +144,7 @@
 | | ...                                       | ${min_rate} | ${max_rate}
 | | ...                                       | ${threshold}
 
-| TC04: 1460B PDR binary search - DUT IPv6 over LISPoIPv6 tunnel - 1thread 1core 1rxq
+| tc04-1460B-1t1c-ethip6lispip6-ip6base-pdrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 LISP remote static mappings and whitelist\
 | | ... | filters config with 1 thread, 1 phy core, 1 receive queue per NIC\
@@ -175,10 +174,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 over LISPoIPv6 tunnel - 1thread 1core 1rxq
+| tc05-9000B-1t1c-ethip6lispip6-ip6base-ndrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 LISP remote static mappings and whitelist\
 | | ... | filters config with 1 thread, 1 phy core, 1 receive queue per NIC\
@@ -208,7 +207,7 @@
 | | ...                                       | ${min_rate} | ${max_rate}
 | | ...                                       | ${threshold}
 
-| TC06: 9000B PDR binary search - DUT IPv6 over LISPoIPv6 tunnel - 1thread 1core 1rxq
+| tc06-9000B-1t1c-ethip6lispip6-ip6base-pdrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 LISP remote static mappings and whitelist\
 | | ... | filters config with 1 thread, 1 phy core, 1 receive queue per NIC\
@@ -237,10 +236,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 over LISPoIPv6 tunnel - 2thread 2core 1rxq
+| tc07-78B-2t2c-ethip6lispip6-ip6base-ndrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 LISP remote static mappings and whitelist\
 | | ... | filters config with 2 threads, 2 phy cores, 1 receive queue per NIC\
@@ -271,7 +270,7 @@
 | | ...                                       | ${min_rate} | ${max_rate}
 | | ...                                       | ${threshold}
 
-| TC08: 78B PDR binary search - DUT IPv6 over LISPoIPv6 tunnel - 2thread 2core 1rxq
+| tc08-78B-2t2c-ethip6lispip6-ip6base-pdrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 LISP remote static mappings and whitelist\
 | | ... | filters config with 2 threads, 2 phy cores, 1 receive queue per NIC\
@@ -301,10 +300,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: 1460B NDR binary search - DUT IPv6 over LISPoIPv6 tunnel - 2thread 2core 1rxq
+| tc09-1460B-2t2c-ethip6lispip6-ip6base-ndrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 LISP remote static mappings and whitelist\
 | | ... | filters config with 2 threads, 2 phy cores, 1 receive queue per NIC\
@@ -335,7 +334,7 @@
 | | ...                                       | ${min_rate} | ${max_rate}
 | | ...                                       | ${threshold}
 
-| TC10: 1460B PDR binary search - DUT IPv6 over LISPoIPv6 tunnel - 2thread 2core 1rxq
+| tc10-1460B-2t2c-ethip6lispip6-ip6base-pdrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 LISP remote static mappings and whitelist\
 | | ... | filters config with 2 threads, 2 phy cores, 1 receive queue per NIC\
@@ -365,10 +364,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 over LISPoIPv6 tunnel - 2thread 2core 1rxq
+| tc11-9000B-2t2c-ethip6lispip6-ip6base-ndrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 LISP remote static mappings and whitelist\
 | | ... | filters config with 2 threads, 2 phy cores, 1 receive queue per NIC\
@@ -398,7 +397,7 @@
 | | ...                                       | ${min_rate} | ${max_rate}
 | | ...                                       | ${threshold}
 
-| TC12: 9000B PDR binary search - DUT IPv6 over LISPoIPv6 tunnel - 2thread 2core 1rxq
+| tc12-9000B-2t2c-ethip6lispip6-ip6base-pdrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 LISP remote static mappings and whitelist\
 | | ... | filters config with 2 threads, 2 phy cores, 1 receive queue per NIC\
@@ -427,10 +426,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 over LISPoIPv6 tunnel - 4thread 4core 2rxq
+| tc13-78B-4t4c-ethip6lispip6-ip6base-ndrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 LISP remote static mappings and whitelist\
 | | ... | filters config with 4 threads, 4 phy cores, 2 receive queues per NIC\
@@ -461,7 +460,7 @@
 | | ...                                       | ${min_rate} | ${max_rate}
 | | ...                                       | ${threshold}
 
-| TC14: 78B PDR binary search - DUT IPv6 over LISPoIPv6 tunnel - 4thread 4core 2rxq
+| tc14-78B-4t4c-ethip6lispip6-ip6base-pdrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 LISP remote static mappings and whitelist\
 | | ... | filters config with 4 threads, 4 phy cores, 2 receive queues per NIC\
@@ -491,10 +490,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: 1460B NDR binary search - DUT IPv6 over LISPoIPv6 tunnel - 4thread 4core 2rxq
+| tc15-1460B-4t4c-ethip6lispip6-ip6base-ndrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 LISP remote static mappings and whitelist\
 | | ... | filters config with 4 threads, 4 phy cores, 2 receive queues per NIC\
@@ -525,7 +524,7 @@
 | | ...                                       | ${min_rate} | ${max_rate}
 | | ...                                       | ${threshold}
 
-| TC16: 1460B PDR binary search - DUT IPv6 over LISPoIPv6 tunnel - 4thread 4core 2rxq
+| tc16-1460B-4t4c-ethip6lispip6-ip6base-pdrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 LISP remote static mappings and whitelist\
 | | ... | filters config with 4 threads, 4 phy cores, 2 receive queues per NIC\
@@ -555,10 +554,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 over LISPoIPv6 tunnel - 4thread 4core 2rxq
+| tc17-9000B-4t4c-ethip6lispip6-ip6base-ndrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 LISP remote static mappings and whitelist\
 | | ... | filters config with 4 threads, 4 phy cores, 2 receive queues per NIC\
@@ -588,7 +587,7 @@
 | | ...                                       | ${min_rate} | ${max_rate}
 | | ...                                       | ${threshold}
 
-| TC18: 9000B PDR binary search - DUT IPv6 over LISPoIPv6 tunnel - 4thread 4core 2rxq
+| tc18-9000B-4t4c-ethip6lispip6-ip6base-pdrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 LISP remote static mappings and whitelist\
 | | ... | filters config with 4 threads, 4 phy cores, 2 receive queues per NIC\
@@ -617,5 +616,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}