aboutsummaryrefslogtreecommitdiffstats
path: root/tests/vpp/perf
diff options
context:
space:
mode:
authorPeter Mikus <pmikus@cisco.com>2018-04-24 14:00:04 +0200
committerPeter Mikus <pmikus@cisco.com>2018-05-02 05:37:23 +0000
commit2d15316360dbf0b57318801b51decbbf842a8660 (patch)
tree779be3800c50ef28d04a6cd79674275139285ecf /tests/vpp/perf
parent39cc1ccaacb7599130bb99ea781b8cc41a7c1f8b (diff)
Remove obsolete NDRPDR checks
Change-Id: If495493f4dce8d2eecfb8c06bcd587f315b70b1d Signed-off-by: Peter Mikus <pmikus@cisco.com>
Diffstat (limited to 'tests/vpp/perf')
-rw-r--r--tests/vpp/perf/ip4/10ge2p1x520-ethip4-ip4base-copwhtlistbase-ndrchk.robot183
-rw-r--r--tests/vpp/perf/ip4/10ge2p1x520-ethip4-ip4base-iacldstbase-ndrchk.robot188
-rw-r--r--tests/vpp/perf/ip4/10ge2p1x520-ethip4-ip4base-ipolicemarkbase-ndrchk.robot171
-rw-r--r--tests/vpp/perf/ip4/10ge2p1x520-ethip4-ip4base-ndrchk.robot164
-rw-r--r--tests/vpp/perf/ip4/10ge2p1x520-ethip4-ip4base-pdrchk.robot183
-rw-r--r--tests/vpp/perf/ip4/10ge2p1x520-ethip4-ip4scale200k-ndrchk.robot201
-rw-r--r--tests/vpp/perf/ip4/10ge2p1x520-ethip4-ip4scale20k-ndrchk.robot210
-rw-r--r--tests/vpp/perf/ip4/10ge2p1x520-ethip4-ip4scale2m-ndrchk.robot210
-rw-r--r--tests/vpp/perf/ip4/10ge2p1x520-ethip4-ip4scale2m-pdrchk.robot185
-rw-r--r--tests/vpp/perf/ip4_tunnels/10ge2p1x520-ethip4lispip4-ip4base-ndrchk.robot266
-rw-r--r--tests/vpp/perf/ip4_tunnels/10ge2p1x520-ethip4lispip4-ip4base-pdrchk.robot193
-rw-r--r--tests/vpp/perf/ip4_tunnels/10ge2p1x520-ethip4lispip6-ip4base-ndrchk.robot266
-rw-r--r--tests/vpp/perf/ip4_tunnels/10ge2p1x520-ethip4lispip6-ip4base-pdrchk.robot193
-rw-r--r--tests/vpp/perf/ip4_tunnels/10ge2p1x520-ethip4vxlan-l2bdbasemaclrn-pdrchk.robot186
-rw-r--r--tests/vpp/perf/ip4_tunnels/10ge2p1x520-ethip4vxlan-l2xcbase-ndrchk.robot190
-rw-r--r--tests/vpp/perf/ip4_tunnels/10ge2p1x520-ethip4vxlan-l2xcbase-pdrchk.robot186
-rw-r--r--tests/vpp/perf/ip6/10ge2p1x520-ethip6-ip6base-copwhtlistbase-ndrchk.robot274
-rw-r--r--tests/vpp/perf/ip6/10ge2p1x520-ethip6-ip6base-iacldstbase-ndrchk.robot209
-rw-r--r--tests/vpp/perf/ip6/10ge2p1x520-ethip6-ip6base-ndrchk.robot191
-rw-r--r--tests/vpp/perf/ip6/10ge2p1x520-ethip6-ip6base-pdrchk.robot183
-rw-r--r--tests/vpp/perf/ip6/10ge2p1x520-ethip6-ip6scale200k-ndrchk.robot201
-rw-r--r--tests/vpp/perf/ip6/10ge2p1x520-ethip6-ip6scale20k-ndrchk.robot201
-rw-r--r--tests/vpp/perf/ip6/10ge2p1x520-ethip6-ip6scale2m-ndrchk.robot210
-rw-r--r--tests/vpp/perf/ip6/10ge2p1x520-ethip6-ip6scale2m-pdrchk.robot185
-rw-r--r--tests/vpp/perf/ip6_tunnels/10ge2p1x520-ethip6lispip4-ip6base-ndrchk.robot266
-rw-r--r--tests/vpp/perf/ip6_tunnels/10ge2p1x520-ethip6lispip4-ip6base-pdrchk.robot193
-rw-r--r--tests/vpp/perf/ip6_tunnels/10ge2p1x520-ethip6lispip6-ip6base-ndrchk.robot266
-rw-r--r--tests/vpp/perf/ip6_tunnels/10ge2p1x520-ethip6lispip6-ip6base-pdrchk.robot193
-rw-r--r--tests/vpp/perf/l2/10ge2p1x520-dot1ad-l2xcbase-ndrchk.robot279
-rw-r--r--tests/vpp/perf/l2/10ge2p1x520-dot1q-l2xcbase-ndrchk.robot266
-rw-r--r--tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-ndrchk.robot192
-rw-r--r--tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-pdrchk.robot184
-rw-r--r--tests/vpp/perf/l2/10ge2p1x520-eth-l2xcbase-ndrchk.robot192
-rw-r--r--tests/vpp/perf/l2/10ge2p1x520-eth-l2xcbase-pdrchk.robot184
-rw-r--r--tests/vpp/perf/vm_vhost/10ge2p1x520-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-pdrchk.robot213
-rw-r--r--tests/vpp/perf/vm_vhost/10ge2p1x520-dot1q-l2xcbase-eth-2vhostvr1024-1vm-pdrchk.robot210
-rw-r--r--tests/vpp/perf/vm_vhost/10ge2p1x520-eth-l2xcbase-eth-2vhostvr1024-1vm-pdrchk.robot209
-rw-r--r--tests/vpp/perf/vm_vhost/10ge2p1x520-ethip4-ip4base-eth-2vhostvr1024-1vm-pdrchk.robot210
38 files changed, 0 insertions, 7886 deletions
diff --git a/tests/vpp/perf/ip4/10ge2p1x520-ethip4-ip4base-copwhtlistbase-ndrchk.robot b/tests/vpp/perf/ip4/10ge2p1x520-ethip4-ip4base-copwhtlistbase-ndrchk.robot
deleted file mode 100644
index 68ce215a9b..0000000000
--- a/tests/vpp/perf/ip4/10ge2p1x520-ethip4-ip4base-copwhtlistbase-ndrchk.robot
+++ /dev/null
@@ -1,183 +0,0 @@
-# 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:
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-*** Settings ***
-| Resource | resources/libraries/robot/performance/performance_setup.robot
-| Library | resources.libraries.python.Cop
-| ...
-| Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRCHK
-| ... | NIC_Intel-X520-DA2 | ETH | IP4FWD | FEATURE | COPWHLIST
-| ...
-| Suite Setup | Set up 3-node performance topology with DUT's NIC model
-| ... | L3 | Intel-X520-DA2
-| 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 IPv4 whitelist verify test cases*
-| ...
-| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology
-| ... | with single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for IPv4 routing.
-| ... | *[Cfg] DUT configuration:* DUT1 and DUT2 are configured with IPv4
-| ... | routing, two static IPv4 /24 routes and IPv4 COP security whitelist
-| ... | ingress /24 filter entries applied on links TG - DUT1 and DUT2 - TG.
-| ... | DUT1 and DUT2 tested with 2p10GE NIC X520 Niantic by Intel.
-| ... | *[Ver] TG verification:* In short performance tests, TG verifies
-| ... | DUTs' throughput at ref-NDR (reference Non Drop Rate) with zero packet
-| ... | loss tolerance. Ref-NDR value is periodically updated acording to
-| ... | formula: ref-NDR = 0.9x NDR, where NDR is found in RFC2544 long
-| ... | performance tests for the same DUT configuration. Test packets are
-| ... | generated by TG on links to DUTs. TG traffic profile contains two L3
-| ... | flow-groups (flow-group per direction, 253 flows per flow-group) with
-| ... | all packets containing Ethernet header, IPv4 header with IP protocol=61
-| ... | and static payload. MAC addresses are matching MAC addresses of the
-| ... | TG node interfaces.
-| ... | *[Ref] Applicable standard specifications:* RFC2544.
-
-*** Variables ***
-# Traffic profile:
-| ${traffic_profile} | trex-sl-3n-ethip4-ip4src253
-
-*** Keywords ***
-| Check NDR for ethip4-ip4base-copwhtlistbase
-| | [Documentation]
-| | ... | [Cfg] DUT runs IPv4 routing config with ${wt} thread(s), ${wt}\
-| | ... | phy core(s), ${rxq} receive queue(s) per NIC port.
-| | ... | [Ver] Verify ref-NDR for ${framesize} frames using single trial\
-| | ... | throughput test at 2x ${rate}.
-| | ...
-| | [Arguments] | ${framesize} | ${rate} | ${wt} | ${rxq}
-| | ...
-| | # Test Variables required for test teardown
-| | Set Test Variable | ${framesize}
-| | Set Test Variable | ${rate}
-| | ${get_framesize}= | Get Frame Size | ${framesize}
-| | ...
-| | Given Add '${wt}' worker threads and '${rxq}' rxqueues in 3-node single-link circular topology
-| | And Add PCI devices to DUTs in 3-node single link topology
-| | And Run Keyword If | ${get_framesize} < ${1522}
-| | ... | Add no multi seg to all DUTs
-| | And Apply startup configuration on all VPP DUTs
-| | And Initialize IPv4 forwarding in 3-node circular topology
-| | And Add Fib Table | ${dut1} | 1
-| | And Vpp Route Add | ${dut1} | 10.10.10.0 | 24 | vrf=1 | local=${TRUE}
-| | And Add Fib Table | ${dut2} | 1
-| | And Vpp Route Add | ${dut2} | 20.20.20.0 | 24 | vrf=1 | local=${TRUE}
-| | And COP Add whitelist Entry | ${dut1} | ${dut1_if1} | ip4 | 1
-| | And COP Add whitelist Entry | ${dut2} | ${dut2_if2} | ip4 | 1
-| | And COP interface enable or disable | ${dut1} | ${dut1_if1} | enable
-| | And COP interface enable or disable | ${dut2} | ${dut2_if2} | enable
-| | Then Traffic should pass with no loss | ${perf_trial_duration}
-| | ... | ${rate} | ${framesize} | ${traffic_profile}
-
-*** Test Cases ***
-| tc01-64B-1t1c-ethip4-ip4base-copwhtlistbase-ndrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs IPv4 routing and whitelist filters 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 4.0mpps.
-| | [Tags] | 64B | 1T1C | STHREAD
-| | ...
-| | [Template] | Check NDR for ethip4-ip4base-copwhtlistbase
-| | framesize=${64} | rate=4.0mpps | wt=1 | rxq=1
-
-| tc02-1518B-1t1c-ethip4-ip4base-copwhtlistbase-ndrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs IPv4 routing and whitelist filters 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] | 1518B | 1T1C | STHREAD
-| | ...
-| | [Template] | Check NDR for ethip4-ip4base-copwhtlistbase
-| | framesize=${1518} | rate=812743pps | wt=1 | rxq=1
-
-| tc03-9000B-1t1c-ethip4-ip4base-copwhtlistbase-ndrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs IPv4 routing and whitelist filters 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] | 9000B | 1T1C | STHREAD
-| | ...
-| | [Template] | Check NDR for ethip4-ip4base-copwhtlistbase
-| | framesize=${9000} | rate=138580pps | wt=1 | rxq=1
-
-| tc04-64B-2t2c-ethip4-ip4base-copwhtlistbase-ndrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs IPv4 routing and whitelist filters 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 7.2mpps.
-| | [Tags] | 64B | 2T2C | MTHREAD
-| | ...
-| | [Template] | Check NDR for ethip4-ip4base-copwhtlistbase
-| | framesize=${64} | rate=7.2mpps | wt=2 | rxq=1
-
-| tc05-1518B-2t2c-ethip4-ip4base-copwhtlistbase-ndrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs IPv4 routing and whitelist filters 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] | 1518B | 2T2C | MTHREAD
-| | ...
-| | [Template] | Check NDR for ethip4-ip4base-copwhtlistbase
-| | framesize=${1518} | rate=812743pps | wt=2 | rxq=1
-
-| tc06-9000B-2t2c-ethip4-ip4base-copwhtlistbase-ndrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs IPv4 routing and whitelist filters 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] | 9000B | 2T2C | MTHREAD
-| | ...
-| | [Template] | Check NDR for ethip4-ip4base-copwhtlistbase
-| | framesize=${9000} | rate=138580pps | wt=2 | rxq=1
-
-| tc07-64B-4t4c-ethip4-ip4base-copwhtlistbase-ndrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs IPv4 routing and whitelist filters config with \
-| | ... | 4 thread, 4 phy core, 2 receive queue per NIC port. [Ver] Verify
-| | ... | ref-NDR for 64 Byte frames using single trial throughput test
-| | ... | at 2x 10.4mpps.
-| | [Tags] | 64B | 4T4C | MTHREAD
-| | ...
-| | [Template] | Check NDR for ethip4-ip4base-copwhtlistbase
-| | framesize=${64} | rate=10.4mpps | wt=4 | rxq=2
-
-| tc08-1518B-4t4c-ethip4-ip4base-copwhtlistbase-ndrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs IPv4 routing and whitelist filters config with \
-| | ... | 4 thread, 4 phy core, 2 receive queue per NIC port. [Ver] Verify
-| | ... | ref-NDR for 1518 Byte frames using single trial throughput test
-| | ... | at 2x 812743pps.
-| | [Tags] | 1518B | 4T4C | MTHREAD
-| | ...
-| | [Template] | Check NDR for ethip4-ip4base-copwhtlistbase
-| | framesize=${1518} | rate=812743pps | wt=4 | rxq=2
-
-| tc09-9000B-4t4c-ethip4-ip4base-copwhtlistbase-ndrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs IPv4 routing and whitelist filters config with \
-| | ... | 4 thread, 4 phy core, 2 receive queue per NIC port. [Ver] Verify
-| | ... | ref-NDR for 9000 Byte frames using single trial throughput test
-| | ... | at 2x 138580pps.
-| | [Tags] | 9000B | 4T4C | MTHREAD
-| | ...
-| | [Template] | Check NDR for ethip4-ip4base-copwhtlistbase
-| | framesize=${9000} | rate=138580pps | wt=4 | rxq=2
diff --git a/tests/vpp/perf/ip4/10ge2p1x520-ethip4-ip4base-iacldstbase-ndrchk.robot b/tests/vpp/perf/ip4/10ge2p1x520-ethip4-ip4base-iacldstbase-ndrchk.robot
deleted file mode 100644
index d061928f36..0000000000
--- a/tests/vpp/perf/ip4/10ge2p1x520-ethip4-ip4base-iacldstbase-ndrchk.robot
+++ /dev/null
@@ -1,188 +0,0 @@
-# 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:
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-*** Settings ***
-| Resource | resources/libraries/robot/performance/performance_setup.robot
-| ...
-| Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRCHK
-| ... | NIC_Intel-X520-DA2 | ETH | IP4FWD | FEATURE | IACLDST
-| ...
-| Suite Setup | Set up 3-node performance topology with DUT's NIC model
-| ... | L3 | Intel-X520-DA2
-| 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 IPv4 whitelist verify test cases*
-| ...
-| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology
-| ... | with single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for IPv4 routing.
-| ... | *[Cfg] DUT configuration:* DUT1 and DUT2 are configured with IPv4
-| ... | routing, two static IPv4 /24 routes and IPv4 iAcl security whitelist
-| ... | ingress /24 filter entries applied on links TG - DUT1 and DUT2 - TG.
-| ... | DUT1 and DUT2 tested with 2p10GE NIC X520 Niantic by Intel.
-| ... | *[Ver] TG verification:* In short performance tests, TG verifies
-| ... | DUTs' throughput at ref-NDR (reference Non Drop Rate) with zero packet
-| ... | loss tolerance. Ref-NDR value is periodically updated acording to
-| ... | formula: ref-NDR = 0.9x NDR, where NDR is found in RFC2544 long
-| ... | performance tests for the same DUT configuration. Test packets are
-| ... | generated by TG on links to DUTs. TG traffic profile contains two L3
-| ... | flow-groups (flow-group per direction, 253 flows per flow-group) with
-| ... | all packets containing Ethernet header, IPv4 header with IP protocol=61
-| ... | and static payload. MAC addresses are matching MAC addresses of the
-| ... | TG node interfaces.
-| ... | *[Ref] Applicable standard specifications:* RFC2544.
-
-*** Variables ***
-# Traffic profile:
-| ${traffic_profile} | trex-sl-3n-ethip4-ip4src253
-
-*** Keywords ***
-| Check NDR for ethip4-ip4base-iacldstbase
-| | [Documentation]
-| | ... | [Cfg] DUT runs IPv4 routing config with ${wt} thread(s), ${wt}\
-| | ... | phy core(s), ${rxq} receive queue(s) per NIC port.
-| | ... | [Ver] Verify ref-NDR for ${framesize} frames using single trial\
-| | ... | throughput test at 2x ${rate}.
-| | ...
-| | [Arguments] | ${framesize} | ${rate} | ${wt} | ${rxq}
-| | ...
-| | # Test Variables required for test teardown
-| | Set Test Variable | ${framesize}
-| | Set Test Variable | ${rate}
-| | ${get_framesize}= | Get Frame Size | ${framesize}
-| | ...
-| | Given Add '${wt}' worker threads and '${rxq}' rxqueues in 3-node single-link circular topology
-| | And Add PCI devices to DUTs in 3-node single link topology
-| | And Run Keyword If | ${get_framesize} < ${1522}
-| | ... | Add no multi seg to all DUTs
-| | And Apply startup configuration on all VPP DUTs
-| | When Initialize IPv4 forwarding in 3-node circular topology
-| | ${table_idx} | ${skip_n} | ${match_n}= | And Vpp Creates Classify Table L3
-| | ... | ${dut1} | ip4 | dst
-| | And Vpp Configures Classify Session L3
-| | ... | ${dut1} | permit | ${table_idx} | ${skip_n} | ${match_n}
-| | ... | ip4 | dst | 20.20.20.2
-| | And Vpp Enable Input Acl Interface
-| | ... | ${dut1} | ${dut1_if1} | ip4 | ${table_idx}
-| | ${table_idx} | ${skip_n} | ${match_n}= | And Vpp Creates Classify Table L3
-| | ... | ${dut2} | ip4 | dst
-| | And Vpp Configures Classify Session L3
-| | ... | ${dut2} | permit | ${table_idx} | ${skip_n} | ${match_n}
-| | ... | ip4 | dst | 10.10.10.2
-| | And Vpp Enable Input Acl Interface
-| | ... | ${dut2} | ${dut2_if2} | ip4 | ${table_idx}
-| | Then Traffic should pass with no loss | ${perf_trial_duration}
-| | ... | ${rate} | ${framesize} | ${traffic_profile}
-
-*** Test Cases ***
-| tc01-64B-1t1c-ethip4-ip4base-iacldstbase-ndrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs IPv4 routing and whitelist filters 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.6mpps.
-| | [Tags] | 64B | 1T1C | STHREAD
-| | ...
-| | [Template] | Check NDR for ethip4-ip4base-iacldstbase
-| | framesize=${64} | rate=3.6mpps | wt=1 | rxq=1
-
-| tc02-1518B-1t1c-ethip4-ip4base-iacldstbase-ndrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs IPv4 routing and whitelist filters 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] | 1518B | 1T1C | STHREAD
-| | ...
-| | [Template] | Check NDR for ethip4-ip4base-iacldstbase
-| | framesize=${1518} | rate=812743pps | wt=1 | rxq=1
-
-| tc03-9000B-1t1c-ethip4-ip4base-iacldstbase-ndrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs IPv4 routing and whitelist filters 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] | 9000B | 1T1C | STHREAD
-| | ...
-| | [Template] | Check NDR for ethip4-ip4base-iacldstbase
-| | framesize=${9000} | rate=138580pps | wt=1 | rxq=1
-
-| tc04-64B-2t2c-ethip4-ip4base-iacldstbase-ndrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs IPv4 routing and whitelist filters 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.3mpps.
-| | [Tags] | 64B | 2T2C | MTHREAD
-| | ...
-| | [Template] | Check NDR for ethip4-ip4base-iacldstbase
-| | framesize=${64} | rate=6.3mpps | wt=2 | rxq=1
-
-| tc05-1518B-2t2c-ethip4-ip4base-iacldstbase-ndrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs IPv4 routing and whitelist filters 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] | 1518B | 2T2C | MTHREAD
-| | ...
-| | [Template] | Check NDR for ethip4-ip4base-iacldstbase
-| | framesize=${1518} | rate=812743pps | wt=2 | rxq=1
-
-| tc06-9000B-2t2c-ethip4-ip4base-iacldstbase-ndrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs IPv4 routing and whitelist filters 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] | 9000B | 2T2C | MTHREAD
-| | ...
-| | [Template] | Check NDR for ethip4-ip4base-iacldstbase
-| | framesize=${9000} | rate=138580pps | wt=2 | rxq=1
-
-| tc07-64B-4t4c-ethip4-ip4base-iacldstbase-ndrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs IPv4 routing and whitelist filters config with \
-| | ... | 4 thread, 4 phy core, 2 receive queue per NIC port. [Ver] Verify
-| | ... | ref-NDR for 64 Byte frames using single trial throughput test
-| | ... | at 2x 9.7mpps.
-| | [Tags] | 64B | 4T4C | MTHREAD
-| | ...
-| | [Template] | Check NDR for ethip4-ip4base-iacldstbase
-| | framesize=${64} | rate=9.7mpps | wt=4 | rxq=2
-
-| tc08-1518B-4t4c-ethip4-ip4base-iacldstbase-ndrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs IPv4 routing and whitelist filters config with \
-| | ... | 4 thread, 4 phy core, 2 receive queue per NIC port. [Ver] Verify
-| | ... | ref-NDR for 1518 Byte frames using single trial throughput test
-| | ... | at 2x 812743pps.
-| | [Tags] | 1518B | 4T4C | MTHREAD
-| | ...
-| | [Template] | Check NDR for ethip4-ip4base-iacldstbase
-| | framesize=${1518} | rate=812743pps | wt=4 | rxq=2
-
-| tc09-9000B-4t4c-ethip4-ip4base-iacldstbase-ndrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs IPv4 routing and whitelist filters config with \
-| | ... | 4 thread, 4 phy core, 2 receive queue per NIC port. [Ver] Verify
-| | ... | ref-NDR for 9000 Byte frames using single trial throughput test
-| | ... | at 2x 138580pps.
-| | [Tags] | 9000B | 4T4C | MTHREAD
-| | ...
-| | [Template] | Check NDR for ethip4-ip4base-iacldstbase
-| | framesize=${9000} | rate=138580pps | wt=4 | rxq=2
diff --git a/tests/vpp/perf/ip4/10ge2p1x520-ethip4-ip4base-ipolicemarkbase-ndrchk.robot b/tests/vpp/perf/ip4/10ge2p1x520-ethip4-ip4base-ipolicemarkbase-ndrchk.robot
deleted file mode 100644
index df67cc7aeb..0000000000
--- a/tests/vpp/perf/ip4/10ge2p1x520-ethip4-ip4base-ipolicemarkbase-ndrchk.robot
+++ /dev/null
@@ -1,171 +0,0 @@
-# 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:
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-*** Settings ***
-| Resource | resources/libraries/robot/performance/performance_setup.robot
-| Library | resources.libraries.python.Policer
-| ...
-| Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRCHK
-| ... | NIC_Intel-X520-DA2 | IP4FWD | BASE | DOT1Q
-| ...
-| Suite Setup | Set up 3-node performance topology with DUT's NIC model
-| ... | L3 | Intel-X520-DA2
-| 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 IPv4 policer verify test cases*
-| ...
-| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology
-| ... | with single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for IPv4 routing.
-| ... | *[Cfg] DUT configuration:* DUT1 and DUT2 are configured with IPv4
-| ... | routing and two static IPv4 /24 route entries and policer with 2R3C
-| ... | color-aware configuration. Policer is applied on links TG - DUT1 and
-| ... | DUT2 - TG. DUT1 and DUT2 tested with 2p10GE NIC X520 Niantic by Intel.
-| ... | *[Ver] TG verification:* In short performance tests, TG verifies
-| ... | DUTs' throughput at ref-NDR (reference Non Drop Rate) with zero packet
-| ... | loss tolerance. Ref-NDR value is periodically updated acording to
-| ... | formula: ref-NDR = 0.9x NDR, where NDR is found in RFC2544 long
-| ... | performance tests for the same DUT configuration. Test packets are
-| ... | generated by TG on links to DUTs. TG traffic profile contains two L3
-| ... | flow-groups (flow-group per direction, 253 flows per flow-group) with
-| ... | all packets containing Ethernet header, IPv4 header with IP protocol=61
-| ... | and static payload. MAC addresses are matching MAC addresses of the
-| ... | TG node interfaces.
-| ... | *[Ref] Applicable standard specifications:* RFC2544, RFC2698.
-
-*** Variables ***
-| ${cir}= | ${100}
-| ${eir}= | ${150}
-# Traffic profile:
-| ${traffic_profile} | trex-sl-3n-ethip4-ip4src253
-
-*** Keywords ***
-| Check NDR for ethip4-ip4base-ipolicemarkbase
-| | [Documentation]
-| | ... | [Cfg] DUT runs IPv4 routing config with ${wt} thread(s), ${wt}\
-| | ... | phy core(s), ${rxq} receive queue(s) per NIC port.
-| | ... | [Ver] Verify ref-NDR for ${framesize} frames using single trial\
-| | ... | throughput test at 2x ${rate}.
-| | ...
-| | [Arguments] | ${framesize} | ${rate} | ${wt} | ${rxq}
-| | ...
-| | # Test Variables required for test teardown
-| | Set Test Variable | ${framesize}
-| | Set Test Variable | ${rate}
-| | Set Test Variable | ${cb} | ${framesize}
-| | Set Test Variable | ${eb} | ${framesize}
-| | ${get_framesize}= | Get Frame Size | ${framesize}
-| | ...
-| | Given Add '${wt}' worker threads and '${rxq}' rxqueues in 3-node single-link circular topology
-| | And Add PCI devices to DUTs in 3-node single link topology
-| | And Run Keyword If | ${get_framesize} < ${1522}
-| | ... | Add no multi seg to all DUTs
-| | And Apply startup configuration on all VPP DUTs
-| | And Initialize IPv4 forwarding in 3-node circular topology
-| | And Initialize IPv4 policer 2r3c-'ca' in 3-node circular topology
-| | Then Traffic should pass with no loss | ${perf_trial_duration}
-| | ... | ${rate} | ${framesize} | ${traffic_profile}
-
-*** Test Cases ***
-| tc01-64B-1t1c-ethip4-ip4base-ipolicemarkbase-ndrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs IPv4 routing and policer 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.6mpps.
-| | [Tags] | 64B | 1T1C | STHREAD
-| | ...
-| | [Template] | Check NDR for ethip4-ip4base-ipolicemarkbase
-| | framesize=${64} | rate=3.6mpps | wt=1 | rxq=1
-
-| tc02-1518B-1t1c-ethip4-ip4base-ipolicemarkbase-ndrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs IPv4 routing and policer 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] | 1518B | 1T1C | STHREAD
-| | ...
-| | [Template] | Check NDR for ethip4-ip4base-ipolicemarkbase
-| | framesize=${1518} | rate=812743pps | wt=1 | rxq=1
-
-| tc03-9000B-1t1c-ethip4-ip4base-ipolicemarkbase-ndrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs IPv4 routing and policer 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] | 9000B | 1T1C | STHREAD
-| | ...
-| | [Template] | Check NDR for ethip4-ip4base-ipolicemarkbase
-| | framesize=${9000} | rate=138580pps | wt=1 | rxq=1
-
-| tc04-64B-2t2c-ethip4-ip4base-ipolicemarkbase-ndrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs IPv4 routing and policer 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.2mpps.
-| | [Tags] | 64B | 2T2C | MTHREAD
-| | ...
-| | [Template] | Check NDR for ethip4-ip4base-ipolicemarkbase
-| | framesize=${64} | rate=6.2mpps | wt=2 | rxq=1
-
-| tc05-1518B-2t2c-ethip4-ip4base-ipolicemarkbase-ndrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs IPv4 routing and policer 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] | 1518B | 2T2C | MTHREAD
-| | ...
-| | [Template] | Check NDR for ethip4-ip4base-ipolicemarkbase
-| | framesize=${1518} | rate=812743pps | wt=2 | rxq=1
-
-| tc06-9000B-2t2c-ethip4-ip4base-ipolicemarkbase-ndrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs IPv4 routing and policer 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] | 9000B | 2T2C | MTHREAD
-| | ...
-| | [Template] | Check NDR for ethip4-ip4base-ipolicemarkbase
-| | framesize=${9000} | rate=138580pps | wt=2 | rxq=1
-
-| tc07-64B-4t4c-ethip4-ip4base-ipolicemarkbase-ndrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs IPv4 routing and policer config with 4 thread, 4 \
-| | ... | phy core, 2 receive queue per NIC port. [Ver] Verify ref-NDR for 64 \
-| | ... | Byte frames using single trial throughput test at 2x 10.4mpps.
-| | [Tags] | 64B | 4T4C | MTHREAD
-| | ...
-| | [Template] | Check NDR for ethip4-ip4base-ipolicemarkbase
-| | framesize=${64} | rate=10.4mpps | wt=4 | rxq=2
-
-| tc08-1518B-4t4c-ethip4-ip4base-ipolicemarkbase-ndrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs IPv4 routing and policer config with 4 thread, 4 \
-| | ... | phy core, 2 receive queue per NIC port. [Ver] Verify ref-NDR for \
-| | ... | 1518 Byte frames using single trial throughput test at 2x 812743pps.
-| | [Tags] | 1518B | 4T4C | MTHREAD
-| | ...
-| | [Template] | Check NDR for ethip4-ip4base-ipolicemarkbase
-| | framesize=${1518} | rate=812743pps | wt=4 | rxq=2
-
-| tc09-9000B-4t4c-ethip4-ip4base-ipolicemarkbase-ndrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs IPv4 routing and policer config with 4 thread, 4 \
-| | ... | phy core, 2 receive queue per NIC port. [Ver] Verify ref-NDR for \
-| | ... | 9000 Byte frames using single trial throughput test at 2x 138580pps.
-| | [Tags] | 9000B | 4T4C | MTHREAD
-| | ...
-| | [Template] | Check NDR for ethip4-ip4base-ipolicemarkbase
-| | framesize=${9000} | rate=138580pps | wt=4 | rxq=2
diff --git a/tests/vpp/perf/ip4/10ge2p1x520-ethip4-ip4base-ndrchk.robot b/tests/vpp/perf/ip4/10ge2p1x520-ethip4-ip4base-ndrchk.robot
deleted file mode 100644
index 0bccc2920e..0000000000
--- a/tests/vpp/perf/ip4/10ge2p1x520-ethip4-ip4base-ndrchk.robot
+++ /dev/null
@@ -1,164 +0,0 @@
-# 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:
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-*** Settings ***
-| Resource | resources/libraries/robot/performance/performance_setup.robot
-| ...
-| Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRCHK
-| ... | NIC_Intel-X520-DA2 | ETH | IP4FWD | BASE | IP4BASE
-| ...
-| Suite Setup | Set up 3-node performance topology with DUT's NIC model
-| ... | L3 | Intel-X520-DA2
-| 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 IPv4 routing verify test cases*
-| ...
-| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology
-| ... | with single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for IPv4 routing.
-| ... | *[Cfg] DUT configuration:* DUT1 and DUT2 are configured with IPv4
-| ... | routing and two static IPv4 /24 route entries. DUT1 and DUT2 tested with
-| ... | 2p10GE NIC X520 Niantic by Intel.
-| ... | *[Ver] TG verification:* In short performance tests, TG verifies
-| ... | DUTs' throughput at ref-NDR (reference Non Drop Rate) with zero packet
-| ... | loss tolerance. Ref-NDR value is periodically updated acording to
-| ... | formula: ref-NDR = 0.9x NDR, where NDR is found in RFC2544 long
-| ... | performance tests for the same DUT configuration. Test packets are
-| ... | generated by TG on links to DUTs. TG traffic profile contains two L3
-| ... | flow-groups (flow-group per direction, 253 flows per flow-group) with
-| ... | all packets containing Ethernet header, IPv4 header with IP protocol=61
-| ... | and static payload. MAC addresses are matching MAC addresses of the
-| ... | TG node interfaces.
-| ... | *[Ref] Applicable standard specifications:* RFC2544.
-
-*** Variables ***
-# Traffic profile:
-| ${traffic_profile} | trex-sl-3n-ethip4-ip4src253
-
-*** Keywords ***
-| Check NDR for ethip4-ip4base
-| | [Documentation]
-| | ... | [Cfg] DUT runs IPv4 routing config with ${wt} thread(s), ${wt}\
-| | ... | phy core(s), ${rxq} receive queue(s) per NIC port.
-| | ... | [Ver] Verify ref-NDR for ${framesize} frames using single trial\
-| | ... | throughput test at 2x ${rate}.
-| | ...
-| | [Arguments] | ${framesize} | ${rate} | ${wt} | ${rxq}
-| | ...
-| | # Test Variables required for test teardown
-| | Set Test Variable | ${framesize}
-| | Set Test Variable | ${rate}
-| | ${get_framesize}= | Get Frame Size | ${framesize}
-| | ...
-| | Given Add '${wt}' worker threads and '${rxq}' rxqueues in 3-node single-link circular topology
-| | And Add PCI devices to DUTs in 3-node single link topology
-| | And Run Keyword If | ${get_framesize} < ${1522}
-| | ... | Add no multi seg to all DUTs
-| | And Apply startup configuration on all VPP DUTs
-| | And Initialize IPv4 forwarding in 3-node circular topology
-| | Then Traffic should pass with no loss | ${perf_trial_duration}
-| | ... | ${rate} | ${framesize} | ${traffic_profile}
-
-*** Test Cases ***
-| tc01-64B-1t1c-ethip4-ip4base-ndrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs IPv4 routing 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 4.6mpps.
-| | [Tags] | 64B | 1T1C | STHREAD
-| | ...
-| | [Template] | Check NDR for ethip4-ip4base
-| | framesize=${64} | rate=4.6mpps | wt=1 | rxq=1
-
-| tc02-1518B-1t1c-ethip4-ip4base-ndrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs IPv4 routing 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] | 1518B | 1T1C | STHREAD
-| | ...
-| | [Template] | Check NDR for ethip4-ip4base
-| | framesize=${1518} | rate=812743pps | wt=1 | rxq=1
-
-| tc03-9000B-1t1c-ethip4-ip4base-ndrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs IPv4 routing 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] | 9000B | 1T1C | STHREAD
-| | ...
-| | [Template] | Check NDR for ethip4-ip4base
-| | framesize=${9000} | rate=138580pps | wt=1 | rxq=1
-
-| tc04-64B-2t2c-ethip4-ip4base-ndrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs IPv4 routing 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 9.4mpps.
-| | [Tags] | 64B | 2T2C | MTHREAD
-| | ...
-| | [Template] | Check NDR for ethip4-ip4base
-| | framesize=${64} | rate=9.4mpps | wt=2 | rxq=1
-
-| tc05-1518B-2t2c-ethip4-ip4base-ndrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs IPv4 routing 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] | 1518B | 2T2C | MTHREAD
-| | ...
-| | [Template] | Check NDR for ethip4-ip4base
-| | framesize=${1518} | rate=812743pps | wt=2 | rxq=1
-
-| tc06-9000B-2t2c-ethip4-ip4base-ndrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs IPv4 routing 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] | 9000B | 2T2C | MTHREAD
-| | ...
-| | [Template] | Check NDR for ethip4-ip4base
-| | framesize=${9000} | rate=138580pps | wt=2 | rxq=1
-
-| tc07-64B-4t4c-ethip4-ip4base-ndrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs IPv4 routing 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 10.4mpps.
-| | [Tags] | 64B | 4T4C | MTHREAD
-| | ...
-| | [Template] | Check NDR for ethip4-ip4base
-| | framesize=${64} | rate=10.4mpps | wt=4 | rxq=2
-
-| tc08-1518B-4t4c-ethip4-ip4base-ndrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs IPv4 routing 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] | 1518B | 4T4C | MTHREAD
-| | ...
-| | [Template] | Check NDR for ethip4-ip4base
-| | framesize=${1518} | rate=812743pps | wt=4 | rxq=2
-
-| tc09-9000B-4t4c-ethip4-ip4base-ndrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs IPv4 routing 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] | 9000B | 4T4C | MTHREAD
-| | ...
-| | [Template] | Check NDR for ethip4-ip4base
-| | framesize=${9000} | rate=138580pps | wt=4 | rxq=2
diff --git a/tests/vpp/perf/ip4/10ge2p1x520-ethip4-ip4base-pdrchk.robot b/tests/vpp/perf/ip4/10ge2p1x520-ethip4-ip4base-pdrchk.robot
deleted file mode 100644
index 2ae729d41e..0000000000
--- a/tests/vpp/perf/ip4/10ge2p1x520-ethip4-ip4base-pdrchk.robot
+++ /dev/null
@@ -1,183 +0,0 @@
-# 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:
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-*** Settings ***
-| Resource | resources/libraries/robot/performance/performance_setup.robot
-| ...
-| Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | PDRCHK
-| ... | NIC_Intel-X520-DA2 | ETH | IP4FWD | BASE | IP4BASE
-| ...
-| Suite Setup | Set up 3-node performance topology with DUT's NIC model
-| ... | L3 | Intel-X520-DA2
-| Suite Teardown | Tear down 3-node performance topology
-| ...
-| Test Setup | Set up performance test
-| Test Teardown | Tear down performance pdrchk test
-| ...
-| Documentation | *Reference PDR throughput IPv4 routing verify test cases*
-| ...
-| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology
-| ... | with single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for IPv4 routing.
-| ... | *[Cfg] DUT configuration:* DUT1 and DUT2 are configured with IPv4
-| ... | routing and two static IPv4 /24 route entries. DUT1 and DUT2 tested with
-| ... | 2p10GE NIC X520 Niantic by Intel.
-| ... | *[Ver] TG verification:* In short performance tests, TG verifies
-| ... | DUTs' throughput at ref-PDR (reference Non Drop Rate) with zero packet
-| ... | loss tolerance. Ref-PDR value is periodically updated acording to
-| ... | formula: ref-PDR = 0.9x PDR, where PDR is found in RFC2544 long
-| ... | performance tests for the same DUT configuration. Test packets are
-| ... | generated by TG on links to DUTs. TG traffic profile contains two L3
-| ... | flow-groups (flow-group per direction, 253 flows per flow-group) with
-| ... | all packets containing Ethernet header, IPv4 header with IP protocol=61
-| ... | and static payload. MAC addresses are matching MAC addresses of the
-| ... | TG node interfaces.
-| ... | *[Ref] Applicable standard specifications:* RFC2544.
-
-*** Variables ***
-# Traffic profile:
-| ${traffic_profile} | trex-sl-3n-ethip4-ip4src253
-
-*** Keywords ***
-| Check PDR for ethip4-ip4base
-| | [Documentation]
-| | ... | [Cfg] DUT runs IPv4 routing config with ${wt} thread(s), ${wt}\
-| | ... | phy core(s), ${rxq} receive queue(s) per NIC port.
-| | ... | [Ver] Verify ref-PDR for ${framesize} frames using single trial\
-| | ... | throughput test at 2x ${rate}.
-| | ...
-| | [Arguments] | ${framesize} | ${rate} | ${wt} | ${rxq}
-| | ...
-| | # Test Variables required for test teardown
-| | Set Test Variable | ${framesize}
-| | Set Test Variable | ${rate}
-| | ${get_framesize}= | Get Frame Size | ${framesize}
-| | ...
-| | Given Add '${wt}' worker threads and '${rxq}' rxqueues in 3-node single-link circular topology
-| | And Add PCI devices to DUTs in 3-node single link topology
-| | And Run Keyword If | ${get_framesize} < ${1522}
-| | ... | Add no multi seg to all DUTs
-| | And Apply startup configuration on all VPP DUTs
-| | And Initialize IPv4 forwarding in 3-node circular topology
-| | Then Traffic should pass with partial loss | ${perf_trial_duration}
-| | ... | ${rate} | ${framesize} | ${traffic_profile}
-| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
-
-*** Test Cases ***
-| tc01-64B-1t1c-ethip4-ip4base-pdrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs IPv4 routing config with 1 thread, 1 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Verify ref-PDR for 64 Byte\
-| | ... | frames using single trial throughput test at 2x ${rate}.
-| | ...
-| | [Tags] | 64B | 1T1C | STHREAD
-| | ...
-| | [Template] | Check PDR for ethip4-ip4base
-| | framesize=${64} | rate=4.7mpps | wt=1 | rxq=1
-
-| tc02-1518B-1t1c-ethip4-ip4base-pdrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs IPv4 routing config with 1 thread, 1 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Verify ref-PDR for 1518 Byte frames using single trial\
-| | ... | throughput test at 2x ${rate}.
-| | ...
-| | [Tags] | 1518B | 1T1C | STHREAD
-| | ...
-| | [Template] | Check PDR for ethip4-ip4base
-| | framesize=${1518} | rate=400000pps | wt=1 | rxq=1
-
-| tc03-9000B-1t1c-ethip4-ip4base-pdrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs IPv4 routing config with 1 thread, 1 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Verify ref-PDR for 9000 Byte frames using single trial\
-| | ... | throughput test at 2x ${rate}.
-| | ...
-| | [Tags] | 9000B | 1T1C | STHREAD
-| | ...
-| | [Template] | Check PDR for ethip4-ip4base
-| | framesize=${9000} | rate=60000pps | wt=1 | rxq=1
-
-| tc04-64B-2t2c-ethip4-ip4base-pdrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs IPv4 routing config with 2 thread, 2 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Verify ref-PDR for 64 Byte frames using single trial\
-| | ... | throughput test at 2x ${rate}.
-| | ...
-| | [Tags] | 64B | 2T2C | STHREAD
-| | ...
-| | [Template] | Check PDR for ethip4-ip4base
-| | framesize=${64} | rate=9.4mpps | wt=2 | rxq=1
-
-| tc05-1518B-2t2c-ethip4-ip4base-pdrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs IPv4 routing config with 2 thread, 2 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Verify ref-PDR for 1518 Byte frames using single trial\
-| | ... | throughput test at 2x ${rate}.
-| | ...
-| | [Tags] | 1518B | 2T2C | MTHREAD
-| | ...
-| | [Template] | Check PDR for ethip4-ip4base
-| | framesize=${1518} | rate=400000pps | wt=2 | rxq=1
-
-| tc06-9000B-2t2c-ethip4-ip4base-pdrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs IPv4 routing config with 2 thread, 2 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Verify ref-PDR for 9000 Byte frames using single trial\
-| | ... | throughput test at 2x ${rate}.
-| | ...
-| | [Tags] | 9000B | 2T2C | MTHREAD
-| | ...
-| | [Template] | Check PDR for ethip4-ip4base
-| | framesize=${9000} | rate=60000pps | wt=2 | rxq=1
-
-| tc07-64B-4t4c-ethip4-ip4base-pdrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs IPv4 routing config with 4 thread, 4 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Verify ref-PDR for 64 Byte frames using single trial\
-| | ... | throughput test at 2x ${rate}.
-| | ...
-| | [Tags] | 64B | 4T4C | MTHREAD
-| | ...
-| | [Template] | Check PDR for ethip4-ip4base
-| | framesize=${64} | rate=7.4mpps | wt=4 | rxq=2
-
-| tc08-1518B-4t4c-ethip4-ip4base-pdrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs IPv4 routing config with 4 thread, 4 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Verify ref-PDR for 1518 Byte frames using single trial\
-| | ... | throughput test at 2x ${rate}.
-| | ...
-| | [Tags] | 1518B | 4T4C | MTHREAD
-| | ...
-| | [Template] | Check PDR for ethip4-ip4base
-| | framesize=${1518} | rate=400000pps | wt=4 | rxq=2
-
-| tc08-9000B-4t4c-ethip4-ip4base-pdrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs IPv4 routing config with 4 thread, 4 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Verify ref-PDR for 9000 Byte frames using single trial\
-| | ... | throughput test at 2x ${rate}.
-| | ...
-| | [Tags] | 9000B | 4T4C | MTHREAD
-| | ...
-| | [Template] | Check PDR for ethip4-ip4base
-| | framesize=${9000} | rate=60000pps | wt=4 | rxq=2
diff --git a/tests/vpp/perf/ip4/10ge2p1x520-ethip4-ip4scale200k-ndrchk.robot b/tests/vpp/perf/ip4/10ge2p1x520-ethip4-ip4scale200k-ndrchk.robot
deleted file mode 100644
index abb34c2794..0000000000
--- a/tests/vpp/perf/ip4/10ge2p1x520-ethip4-ip4scale200k-ndrchk.robot
+++ /dev/null
@@ -1,201 +0,0 @@
-# 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:
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-*** Settings ***
-| Resource | resources/libraries/robot/performance/performance_setup.robot
-| ...
-| Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRCHK
-| ... | NIC_Intel-X520-DA2 | ETH | IP4FWD | SCALE | FIB_200K
-| ...
-| Suite Setup | Set up 3-node performance topology with DUT's NIC model
-| ... | L3 | Intel-X520-DA2
-| 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 IPv4 routing verify test cases*
-| ...
-| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology
-| ... | with single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for IPv4 routing.
-| ... | *[Cfg] DUT configuration:* DUT1 and DUT2 are configured with IPv4
-| ... | routing and 2x100k static IPv4 /32 route entries. DUT1 and DUT2 tested
-| ... | with 2p10GE NIC X520 Niantic by Intel.
-| ... | *[Ver] TG verification:* In short performance tests, TG verifies
-| ... | DUTs' throughput at ref-NDR (reference Non Drop Rate) with zero packet
-| ... | loss tolerance. Ref-NDR value is periodically updated acording to
-| ... | formula: ref-NDR = 0.9x NDR, where NDR is found in RFC2544 long
-| ... | performance tests for the same DUT confiiguration. Test packets are
-| ... | generated by TG on links to DUTs. TG traffic profile contains two L3
-| ... | flow-groups (flow-group per direction, 100k flows per flow-group) with
-| ... | all packets containing Ethernet header, IPv4 header with IP protocol=61
-| ... | and static payload. Incrementing of IP.dst (IPv4 destination address)
-| ... | field is applied to both streams.
-| ... | *[Ref] Applicable standard specifications:* RFC2544.
-
-*** Variables ***
-| ${rts_per_flow}= | ${100000}
-# Traffic profile:
-| ${traffic_profile} | trex-sl-3n-ethip4-ip4dst${rts_per_flow}
-
-*** Test Cases ***
-| tc01-64B-1t1c-ethip4-ip4scale200k-ndrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs IPv4 routing 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 4.3mpps.
-| | [Tags] | 64B | 1T1C | STHREAD
-| | ${framesize}= | Set Variable | ${64}
-| | ${rate}= | Set Variable | 4.3mpps
-| | 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 IPv4 forwarding with scaling in 3-node circular topology
-| | ... | ${rts_per_flow}
-| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | ${traffic_profile}
-
-| tc02-1518B-1t1c-ethip4-ip4scale200k-ndrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs IPv4 routing 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] | 1518B | 1T1C | STHREAD
-| | ${framesize}= | Set Variable | ${1518}
-| | ${rate}= | Set Variable | 812743pps
-| | 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 IPv4 forwarding with scaling in 3-node circular topology
-| | ... | ${rts_per_flow}
-| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | ${traffic_profile}
-
-| tc03-9000B-1t1c-ethip4-ip4scale200k-ndrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs IPv4 routing 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] | 9000B | 1T1C | STHREAD
-| | ${framesize}= | Set Variable | ${9000}
-| | ${rate}= | Set Variable | 138580pps
-| | 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 IPv4 forwarding with scaling in 3-node circular topology
-| | ... | ${rts_per_flow}
-| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | ${traffic_profile}
-
-| tc04-64B-2t2c-ethip4-ip4scale200k-ndrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs IPv4 routing 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 9.1mpps.
-| | [Tags] | 64B | 2T2C | MTHREAD
-| | ${framesize}= | Set Variable | ${64}
-| | ${rate}= | Set Variable | 9.1mpps
-| | 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 IPv4 forwarding with scaling in 3-node circular topology
-| | ... | ${rts_per_flow}
-| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | ${traffic_profile}
-
-| tc05-1518B-2t2c-ethip4-ip4scale200k-ndrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs IPv4 routing 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] | 1518B | 2T2C | MTHREAD
-| | ${framesize}= | Set Variable | ${1518}
-| | ${rate}= | Set Variable | 812743pps
-| | 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 IPv4 forwarding with scaling in 3-node circular topology
-| | ... | ${rts_per_flow}
-| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | ${traffic_profile}
-
-| tc06-9000B-2t2c-ethip4-ip4scale200k-ndrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs IPv4 routing 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] | 9000B | 2T2C | MTHREAD
-| | ${framesize}= | Set Variable | ${9000}
-| | ${rate}= | Set Variable | 138580pps
-| | 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 IPv4 forwarding with scaling in 3-node circular topology
-| | ... | ${rts_per_flow}
-| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | ${traffic_profile}
-
-| tc07-64B-4t4c-ethip4-ip4scale200k-ndrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs IPv4 routing 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 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 IPv4 forwarding with scaling in 3-node circular topology
-| | ... | ${rts_per_flow}
-| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | ${traffic_profile}
-
-| tc08-1518B-4t4c-ethip4-ip4scale200k-ndrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs IPv4 routing 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] | 1518B | 4T4C | MTHREAD
-| | ${framesize}= | Set Variable | ${1518}
-| | ${rate}= | Set Variable | 812743pps
-| | 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 IPv4 forwarding with scaling in 3-node circular topology
-| | ... | ${rts_per_flow}
-| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | ${traffic_profile}
-
-| tc09-9000B-4t4c-ethip4-ip4scale200k-ndrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs IPv4 routing 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] | 9000B | 4T4C | MTHREAD
-| | ${framesize}= | Set Variable | ${9000}
-| | ${rate}= | Set Variable | 138580pps
-| | 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 IPv4 forwarding with scaling in 3-node circular topology
-| | ... | ${rts_per_flow}
-| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | ${traffic_profile}
diff --git a/tests/vpp/perf/ip4/10ge2p1x520-ethip4-ip4scale20k-ndrchk.robot b/tests/vpp/perf/ip4/10ge2p1x520-ethip4-ip4scale20k-ndrchk.robot
deleted file mode 100644
index 8303a4e139..0000000000
--- a/tests/vpp/perf/ip4/10ge2p1x520-ethip4-ip4scale20k-ndrchk.robot
+++ /dev/null
@@ -1,210 +0,0 @@
-# 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:
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-*** Settings ***
-| Resource | resources/libraries/robot/performance/performance_setup.robot
-| ...
-| Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRCHK
-| ... | NIC_Intel-X520-DA2 | ETH | IP4FWD | SCALE | FIB_20K
-| ...
-| Suite Setup | Set up 3-node performance topology with DUT's NIC model
-| ... | L3 | Intel-X520-DA2
-| 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 IPv4 routing verify test cases*
-| ...
-| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology
-| ... | with single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for IPv4 routing.
-| ... | *[Cfg] DUT configuration:* DUT1 and DUT2 are configured with IPv4
-| ... | routing and 2x10k static IPv4 /32 route entries. DUT1 and DUT2 tested
-| ... | with 2p10GE NIC X520 Niantic by Intel.
-| ... | *[Ver] TG verification:* In short performance tests, TG verifies
-| ... | DUTs' throughput at ref-NDR (reference Non Drop Rate) with zero packet
-| ... | loss tolerance. Ref-NDR value is periodically updated acording to
-| ... | formula: ref-NDR = 0.9x NDR, where NDR is found in RFC2544 long
-| ... | performance tests for the same DUT confiiguration. Test packets are
-| ... | generated by TG on links to DUTs. TG traffic profile contains two L3
-| ... | flow-groups (flow-group per direction, 10k flows per flow-group) with
-| ... | all packets containing Ethernet header, IPv4 header with IP protocol=61
-| ... | and static payload. Incrementing of IP.dst (IPv4 destination address)
-| ... | field is applied to both streams.
-| ... | *[Ref] Applicable standard specifications:* RFC2544.
-
-*** Variables ***
-| ${rts_per_flow}= | ${10000}
-# Traffic profile:
-| ${traffic_profile} | trex-sl-3n-ethip4-ip4dst${rts_per_flow}
-
-*** Test Cases ***
-| tc01-64B-1t1c-ethip4-ip4scale20k-ndrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs IPv4 routing 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 4.3mpps.
-| | [Tags] | 64B | 1T1C | STHREAD
-| | ${framesize}= | Set Variable | ${64}
-| | ${rate}= | Set Variable | 4.3mpps
-| | 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 IPv4 forwarding with scaling in 3-node circular topology
-| | ... | ${rts_per_flow}
-| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize}
-| | ... | ${traffic_profile}
-
-| tc02-1518B-1t1c-ethip4-ip4scale20k-ndrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs IPv4 routing 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] | 1518B | 1T1C | STHREAD
-| | ${framesize}= | Set Variable | ${1518}
-| | ${rate}= | Set Variable | 812743pps
-| | 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 IPv4 forwarding with scaling in 3-node circular topology
-| | ... | ${rts_per_flow}
-| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize}
-| | ... | ${traffic_profile}
-
-| tc03-9000B-1t1c-ethip4-ip4scale20k-ndrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs IPv4 routing 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] | 9000B | 1T1C | STHREAD
-| | ${framesize}= | Set Variable | ${9000}
-| | ${rate}= | Set Variable | 138580pps
-| | 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 IPv4 forwarding with scaling in 3-node circular topology
-| | ... | ${rts_per_flow}
-| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize}
-| | ... | ${traffic_profile}
-
-| tc04-64B-2t2c-ethip4-ip4scale20k-ndrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs IPv4 routing 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 9.0mpps.
-| | [Tags] | 64B | 2T2C | MTHREAD
-| | ${framesize}= | Set Variable | ${64}
-| | ${rate}= | Set Variable | 9.0mpps
-| | 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 IPv4 forwarding with scaling in 3-node circular topology
-| | ... | ${rts_per_flow}
-| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize}
-| | ... | ${traffic_profile}
-
-| tc05-1518B-2t2c-ethip4-ip4scale20k-ndrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs IPv4 routing 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] | 1518B | 2T2C | MTHREAD
-| | ${framesize}= | Set Variable | ${1518}
-| | ${rate}= | Set Variable | 812743pps
-| | 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 IPv4 forwarding with scaling in 3-node circular topology
-| | ... | ${rts_per_flow}
-| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize}
-| | ... | ${traffic_profile}
-
-| tc06-9000B-2t2c-ethip4-ip4scale20k-ndrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs IPv4 routing 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] | 9000B | 2T2C | MTHREAD
-| | ${framesize}= | Set Variable | ${9000}
-| | ${rate}= | Set Variable | 138580pps
-| | 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 IPv4 forwarding with scaling in 3-node circular topology
-| | ... | ${rts_per_flow}
-| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize}
-| | ... | ${traffic_profile}
-
-| tc07-64B-4t4c-ethip4-ip4scale20k-ndrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs IPv4 routing 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 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 IPv4 forwarding with scaling in 3-node circular topology
-| | ... | ${rts_per_flow}
-| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize}
-| | ... | ${traffic_profile}
-
-| tc08-1518B-4t4c-ethip4-ip4scale20k-ndrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs IPv4 routing 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] | 1518B | 4T4C | MTHREAD
-| | ${framesize}= | Set Variable | ${1518}
-| | ${rate}= | Set Variable | 812743pps
-| | 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 IPv4 forwarding with scaling in 3-node circular topology
-| | ... | ${rts_per_flow}
-| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize}
-| | ... | ${traffic_profile}
-
-| tc09-9000B-4t4c-ethip4-ip4scale20k-ndrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs IPv4 routing 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] | 9000B | 4T4C | MTHREAD
-| | ${framesize}= | Set Variable | ${9000}
-| | ${rate}= | Set Variable | 138580pps
-| | 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 IPv4 forwarding with scaling in 3-node circular topology
-| | ... | ${rts_per_flow}
-| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize}
-| | ... | ${traffic_profile}
diff --git a/tests/vpp/perf/ip4/10ge2p1x520-ethip4-ip4scale2m-ndrchk.robot b/tests/vpp/perf/ip4/10ge2p1x520-ethip4-ip4scale2m-ndrchk.robot
deleted file mode 100644
index 84fc806d23..0000000000
--- a/tests/vpp/perf/ip4/10ge2p1x520-ethip4-ip4scale2m-ndrchk.robot
+++ /dev/null
@@ -1,210 +0,0 @@
-# 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:
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-*** Settings ***
-| Resource | resources/libraries/robot/performance/performance_setup.robot
-| ...
-| Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRCHK
-| ... | NIC_Intel-X520-DA2 | ETH | IP4FWD | SCALE | FIB_2M
-| ...
-| Suite Setup | Set up 3-node performance topology with DUT's NIC model
-| ... | L3 | Intel-X520-DA2
-| 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 IPv4 routing verify test cases*
-| ...
-| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology
-| ... | with single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for IPv4 routing.
-| ... | *[Cfg] DUT configuration:* DUT1 and DUT2 are configured with IPv4
-| ... | routing and 2x1M static IPv4 /32 route entries. DUT1 and DUT2 tested
-| ... | with 2p10GE NIC X520 Niantic by Intel.
-| ... | *[Ver] TG verification:* In short performance tests, TG verifies
-| ... | DUTs' throughput at ref-NDR (reference Non Drop Rate) with zero packet
-| ... | loss tolerance. Ref-NDR value is periodically updated acording to
-| ... | formula: ref-NDR = 0.9x NDR, where NDR is found in RFC2544 long
-| ... | performance tests for the same DUT confiiguration. Test packets are
-| ... | generated by TG on links to DUTs. TG traffic profile contains two L3
-| ... | flow-groups (flow-group per direction, 1M flows per flow-group) with
-| ... | all packets containing Ethernet header, IPv4 header with IP protocol=61
-| ... | and static payload. Incrementing of IP.dst (IPv4 destination address)
-| ... | field is applied to both streams.
-| ... | *[Ref] Applicable standard specifications:* RFC2544.
-
-*** Variables ***
-| ${rts_per_flow}= | ${1000000}
-# Traffic profile:
-| ${traffic_profile} | trex-sl-3n-ethip4-ip4dst${rts_per_flow}
-
-*** Test Cases ***
-| tc01-64B-1t1c-ethip4-ip4scale2m-ndrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs IPv4 routing 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.7mpps.
-| | [Tags] | 64B | 1T1C | STHREAD
-| | ${framesize}= | Set Variable | ${64}
-| | ${rate}= | Set Variable | 3.7mpps
-| | 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 IPv4 forwarding with scaling in 3-node circular topology
-| | ... | ${rts_per_flow}
-| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize}
-| | ... | ${traffic_profile}
-
-| tc02-1518B-1t1c-ethip4-ip4scale2m-ndrchk
-| | [Documentation]
-| | ... | Verify ref-NDR for 1518 Byte frames using single trial throughput
-| | ... | test. DUT runs IPv4 routing config with 1 thread, 1 phy core, 1
-| | ... | receive queue per NIC port at 2x 812743pps.
-| | [Tags] | 1518B | 1T1C | STHREAD
-| | ${framesize}= | Set Variable | ${1518}
-| | ${rate}= | Set Variable | 812743pps
-| | 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 IPv4 forwarding with scaling in 3-node circular topology
-| | ... | ${rts_per_flow}
-| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize}
-| | ... | ${traffic_profile}
-
-| tc03-9000B-1t1c-ethip4-ip4scale2m-ndrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs IPv4 routing 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 138580pps.
-| | [Tags] | 9000B | 1T1C | STHREAD
-| | ${framesize}= | Set Variable | ${9000}
-| | ${rate}= | Set Variable | 138580pps
-| | 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 IPv4 forwarding with scaling in 3-node circular topology
-| | ... | ${rts_per_flow}
-| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize}
-| | ... | ${traffic_profile}
-
-| tc04-64B-2t2c-ethip4-ip4scale2m-ndrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs IPv4 routing 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 7.6mpps.
-| | [Tags] | 64B | 2T2C | MTHREAD
-| | ${framesize}= | Set Variable | ${64}
-| | ${rate}= | Set Variable | 7.6mpps
-| | 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 IPv4 forwarding with scaling in 3-node circular topology
-| | ... | ${rts_per_flow}
-| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize}
-| | ... | ${traffic_profile}
-
-| tc05-1518B-2t2c-ethip4-ip4scale2m-ndrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs IPv4 routing 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] | 1518B | 2T2C | MTHREAD
-| | ${framesize}= | Set Variable | ${1518}
-| | ${rate}= | Set Variable | 812743pps
-| | 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 IPv4 forwarding with scaling in 3-node circular topology
-| | ... | ${rts_per_flow}
-| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize}
-| | ... | ${traffic_profile}
-
-| tc06-9000B-2t2c-ethip4-ip4scale2m-ndrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs IPv4 routing 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] | 9000B | 2T2C | MTHREAD
-| | ${framesize}= | Set Variable | ${9000}
-| | ${rate}= | Set Variable | 138580pps
-| | 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 IPv4 forwarding with scaling in 3-node circular topology
-| | ... | ${rts_per_flow}
-| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize}
-| | ... | ${traffic_profile}
-
-| tc07-64B-4t4c-ethip4-ip4scale2m-ndrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs IPv4 routing 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 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 IPv4 forwarding with scaling in 3-node circular topology
-| | ... | ${rts_per_flow}
-| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize}
-| | ... | ${traffic_profile}
-
-| tc08-1518B-4t4c-ethip4-ip4scale2m-ndrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs IPv4 routing 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] | 1518B | 4T4C | MTHREAD
-| | ${framesize}= | Set Variable | ${1518}
-| | ${rate}= | Set Variable | 812743pps
-| | 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 IPv4 forwarding with scaling in 3-node circular topology
-| | ... | ${rts_per_flow}
-| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize}
-| | ... | ${traffic_profile}
-
-| tc09-9000B-4t4c-ethip4-ip4scale2m-ndrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs IPv4 routing 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] | 9000B | 4T4C | MTHREAD
-| | ${framesize}= | Set Variable | ${9000}
-| | ${rate}= | Set Variable | 138580pps
-| | 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 IPv4 forwarding with scaling in 3-node circular topology
-| | ... | ${rts_per_flow}
-| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize}
-| | ... | ${traffic_profile}
diff --git a/tests/vpp/perf/ip4/10ge2p1x520-ethip4-ip4scale2m-pdrchk.robot b/tests/vpp/perf/ip4/10ge2p1x520-ethip4-ip4scale2m-pdrchk.robot
deleted file mode 100644
index 0a5133aff1..0000000000
--- a/tests/vpp/perf/ip4/10ge2p1x520-ethip4-ip4scale2m-pdrchk.robot
+++ /dev/null
@@ -1,185 +0,0 @@
-# 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:
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-*** Settings ***
-| Resource | resources/libraries/robot/performance/performance_setup.robot
-| ...
-| Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | PDRCHK
-| ... | NIC_Intel-X520-DA2 | ETH | IP4FWD | SCALE | FIB_2M
-| ...
-| Suite Setup | Set up 3-node performance topology with DUT's NIC model
-| ... | L3 | Intel-X520-DA2
-| Suite Teardown | Tear down 3-node performance topology
-| ...
-| Test Setup | Set up performance test
-| Test Teardown | Tear down performance pdrchk test
-| ...
-| Documentation | *Reference PDR throughput IPv4 routing verify test cases*
-| ...
-| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology
-| ... | with single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for IPv4 routing.
-| ... | *[Cfg] DUT configuration:* DUT1 and DUT2 are configured with IPv4
-| ... | routing and 2x1M static IPv4 /32 route entries. DUT1 and DUT2 tested
-| ... | with 2p10GE NIC X520 Niantic by Intel.
-| ... | *[Ver] TG verification:* TG verifies throughput PDR (Partial Drop
-| ... | Rate) with non-zero packet loss tolerance (LT) expressed in percentage
-| ... | of packets transmitted. Ref-PDR value is periodically updated acording
-| ... | to formula: ref-PDR = 0.9x PDR, where PDR is found in RFC2544 long
-| ... | performance tests for the same DUT configuration. Test packets are
-| ... | generated by TG on links to DUTs. TG traffic profile contains two L3
-| ... | flow-groups (flow-group per direction, 1M flows per flow-group) with
-| ... | all packets containing Ethernet header, IPv4 header with IP protocol=61
-| ... | and static payload. Incrementing of IP.dst (IPv4 destination address)
-| ... | field is applied to both streams.
-| ... | *[Ref] Applicable standard specifications:* RFC2544.
-
-*** Variables ***
-| ${rts_per_flow}= | ${1000000}
-# Traffic profile:
-| ${traffic_profile} | trex-sl-3n-ethip4-ip4dst${rts_per_flow}
-
-*** Keywords ***
-| Check PDR for IPv4 routing
-| | [Documentation]
-| | ... | [Cfg] DUT runs IPv4 routing config with ${wt} thread, ${wt} phy\
-| | ... | core, ${rxq} receive queue per NIC port.
-| | ... | [Ver] Verify ref-PDR for ${framesize} Byte frames using single trial\
-| | ... | throughput test at 2x ${rate}.
-| | ...
-| | [Arguments] | ${framesize} | ${rate} | ${wt} | ${rxq}
-| | ...
-| | # Test Variables required for test and test teardown
-| | Set Test Variable | ${framesize}
-| | Set Test Variable | ${rate}
-| | ${get_framesize}= | Get Frame Size | ${framesize}
-| | ...
-| | Given Add '${wt}' worker threads and '${rxq}' rxqueues in 3-node single-link circular topology
-| | And Add PCI devices to DUTs in 3-node single link topology
-| | And Run Keyword If | ${get_framesize} < ${1522}
-| | ... | Add no multi seg to all DUTs
-| | And Apply startup configuration on all VPP DUTs
-| | And Initialize IPv4 forwarding with scaling in 3-node circular topology
-| | ... | ${rts_per_flow}
-| | Then Traffic should pass with partial loss | ${perf_trial_duration}
-| | ... | ${rate} | ${framesize} | ${traffic_profile}
-| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
-
-*** Test Cases ***
-| tc01-64B-1t1c-ethip4-ip4scale2m-pdrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs IPv4 routing config with 1 thread, 1 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Verify ref-PDR for 64 Byte frames using single trial\
-| | ... | throughput test at 2x ${rate}.
-| | ...
-| | [Tags] | 64B | 1T1C | STHREAD
-| | ...
-| | [Template] | Check PDR for IPv4 routing
-| | framesize=${64} | rate=3.0mpps | wt=1 | rxq=1
-
-| tc02-1518B-1t1c-ethip4-ip4scale2m-pdrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs IPv4 routing config with 1 thread, 1 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Verify ref-PDR for 1518 Byte frames using single trial\
-| | ... | trial throughput test at 2x ${rate}.
-| | ...
-| | [Tags] | 1518B | 1T1C | STHREAD
-| | ...
-| | [Template] | Check PDR for IPv4 routing
-| | framesize=${1518} | rate=600000pps | wt=1 | rxq=1
-
-| tc03-9000B-1t1c-ethip4-ip4scale2m-pdrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs IPv4 routing config with 1 thread, 1 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Verify ref-PDR for 1518 Byte frames using single trial\
-| | ... | throughput test at 2x ${rate}.
-| | ...
-| | [Tags] | 9000B | 1T1C | STHREAD
-| | ...
-| | [Template] | Check PDR for IPv4 routing
-| | framesize=${9000} | rate=100000pps | wt=1 | rxq=1
-
-| tc04-64B-2t2c-ethip4-ip4scale2m-pdrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs IPv4 routing config with 2 threads, 2 phy cores,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Verify ref-PDR for 64 Byte frames using single trial\
-| | ... | throughput test at 2x ${rate}.
-| | ...
-| | [Tags] | 64B | 2T2C | MTHREAD
-| | ...
-| | [Template] | Check PDR for IPv4 routing
-| | framesize=${64} | rate=7.0mpps | wt=2 | rxq=1
-
-| tc05-1518B-2t2c-ethip4-ip4scale2m-pdrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs IPv4 routing config with 2 threads, 2 phy cores,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Verify ref-PDR for 1518 Byte frames using single trial\
-| | ... | throughput test at 2x ${rate}.
-| | ...
-| | [Tags] | 1518B | 2T2C | MTHREAD
-| | ...
-| | [Template] | Check PDR for IPv4 routing
-| | framesize=${1518} | rate=500000pps | wt=2 | rxq=1
-
-| tc06-9000B-2t2c-ethip4-ip4scale2m-pdrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs IPv4 routing config with 2 threads, 2 phy cores,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Verify ref-PDR for 9000 Byte frames using single trial\
-| | ... | throughput test at 2x ${rate}.
-| | ...
-| | [Tags] | 9000B | 2T2C | MTHREAD
-| | ...
-| | [Template] | Check PDR for IPv4 routing
-| | framesize=${9000} | rate=100000pps | wt=2 | rxq=1
-
-| tc07-64B-4t4c-ethip4-ip4scale2m-pdrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs IPv4 routing config with 4 threads, 4 phy cores,\
-| | ... | 2 receive queues per NIC port.
-| | ... | [Ver] Verify ref-PDR for 64 Byte frames using single trial\
-| | ... | throughput test at 2x ${rate}.
-| | ...
-| | [Tags] | 64B | 4T4C | MTHREAD
-| | ...
-| | [Template] | Check PDR for IPv4 routing
-| | framesize=${64} | rate=10.0mpps | wt=4 | rxq=2
-
-| tc08-1518B-4t4c-ethip4-ip4scale2m-pdrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs IPv4 routing config with 4 threads, 4 phy cores,\
-| | ... | 2 receive queues per NIC port.
-| | ... | [Ver] Verify ref-PDR for 1518 Byte frames using single trial\
-| | ... | throughput test at 2x ${rate}.
-| | ...
-| | [Tags] | 1518B | 4T4C | MTHREAD
-| | ...
-| | [Template] | Check PDR for IPv4 routing
-| | framesize=${1518} | rate=500000pps | wt=4 | rxq=2
-
-| tc09-9000B-4t4c-ethip4-ip4scale2m-pdrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs IPv4 routing config with 4 threads, 4 phy cores,\
-| | ... | 2 receive queues per NIC port.
-| | ... | [Ver] Verify ref-PDR for 9000 Byte frames using single trial\
-| | ... | throughput test at 2x ${rate}.
-| | ...
-| | [Tags] | 9000B | 4T4C | MTHREAD
-| | ...
-| | [Template] | Check PDR for IPv4 routing
-| | framesize=${9000} | rate=100000pps | wt=4 | rxq=2
diff --git a/tests/vpp/perf/ip4_tunnels/10ge2p1x520-ethip4lispip4-ip4base-ndrchk.robot b/tests/vpp/perf/ip4_tunnels/10ge2p1x520-ethip4lispip4-ip4base-ndrchk.robot
deleted file mode 100644
index 79f0bbc772..0000000000
--- a/tests/vpp/perf/ip4_tunnels/10ge2p1x520-ethip4lispip4-ip4base-ndrchk.robot
+++ /dev/null
@@ -1,266 +0,0 @@
-# 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:
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-*** Settings ***
-| Resource | resources/libraries/robot/performance/performance_setup.robot
-| Resource | resources/libraries/robot/overlay/lisp_static_adjacency.robot
-| Variables | resources/test_data/lisp/performance/lisp_static_adjacency.py
-| ...
-| Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRCHK
-| ... | NIC_Intel-X520-DA2 | IP4FWD | ENCAP | LISP | IP4UNRLAY | IP4OVRLAY
-| ...
-| Suite Setup | Set up 3-node performance topology with DUT's NIC model
-| ... | L3 | Intel-X520-DA2
-| 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 Lisp tunnel verify test cases*
-| ...
-| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology\
-| ... | with single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4-LISP-IPv4 on DUT1-DUT2\
-| ... | Eth-IPv4 on TG-DUTn for IPv4 routing over LISPoIPv4 tunnel.
-| ... | *[Cfg] DUT configuration:* DUT1 and DUT2 are configured with IPv4\
-| ... | routing and static routes. LISPoIPv4 tunnel is configured between\
-| ... | DUT1 and DUT2. DUT1 and DUT2 tested with 2p10GE NIC X520\
-| ... | Niantic by Intel.
-| ... | *[Ver] TG verification:* In short performance tests, TG verifies\
-| ... | DUTs' throughput at ref-NDR (reference Non Drop Rate) with zero packet\
-| ... | loss tolerance. Ref-NDR value is periodically updated acording to\
-| ... | formula: ref-NDR = 0.9x NDR, where NDR is found in RFC2544 long\
-| ... | performance tests for the same DUT confiiguration. Test packets are\
-| ... | generated by TG on links to DUTs. TG traffic profile contains two L3\
-| ... | flow-groups (flow-group per direction, 253 flows per flow-group) with\
-| ... | all packets containing Ethernet header, IPv4 header with\
-| ... | IP protocol=61 and generated payload.
-| ... | *[Ref] Applicable standard specifications:* RFC2544.
-
-*** Variables ***
-# Traffic profile:
-| ${traffic_profile} | trex-sl-3n-ethip4-ip4src253
-
-*** Test Cases ***
-| tc01-64B-1t1c-ethip4lispip4-ip4base-ndrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs LISP tunnel 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 1.9mpps.
-| | [Tags] | 64B | 1T1C | STHREAD
-| | ${framesize}= | Set Variable | ${64}
-| | ${rate}= | Set Variable | 1.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
-| | When Initialize LISP IPv4 forwarding in 3-node circular topology
-| | ... | ${dut1_to_dut2_ip4} | ${dut1_to_tg_ip4} | ${dut2_to_dut1_ip4}
-| | ... | ${dut2_to_tg_ip4} | ${prefix4}
-| | And Configure LISP topology in 3-node circular topology
-| | ... | ${dut1} | ${dut1_if2} | ${NONE}
-| | ... | ${dut2} | ${dut2_if1} | ${NONE}
-| | ... | ${duts_locator_set} | ${dut1_ip4_eid} | ${dut2_ip4_eid}
-| | ... | ${dut1_ip4_static_adjacency} | ${dut2_ip4_static_adjacency}
-| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | ${traffic_profile}
-
-| tc02-1480B-1t1c-ethip4lispip4-ip4base-ndrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs LISP tunnel config with 1 thread, 1 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Verify ref-NDR for 1480 Byte frames using single trial\
-| | ... | throughput test at 2x 740000pps.
-| | [Tags] | 1480B | 1T1C | STHREAD
-| | ${framesize}= | Set Variable | ${1480}
-| | ${rate}= | Set Variable | 740000pps
-| | 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
-| | When Initialize LISP IPv4 forwarding in 3-node circular topology
-| | ... | ${dut1_to_dut2_ip4} | ${dut1_to_tg_ip4} | ${dut2_to_dut1_ip4}
-| | ... | ${dut2_to_tg_ip4} | ${prefix4}
-| | And Configure LISP topology in 3-node circular topology
-| | ... | ${dut1} | ${dut1_if2} | ${NONE}
-| | ... | ${dut2} | ${dut2_if1} | ${NONE}
-| | ... | ${duts_locator_set} | ${dut1_ip4_eid} | ${dut2_ip4_eid}
-| | ... | ${dut1_ip4_static_adjacency} | ${dut2_ip4_static_adjacency}
-| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | ${traffic_profile}
-
-| tc03-9000B-1t1c-ethip4lispip4-ip4base-ndrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs LISP tunnel 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 120000pps.
-| | [Tags] | 9000B | 1T1C | STHREAD
-| | ${framesize}= | Set Variable | ${9000}
-| | ${rate}= | Set Variable | 120000pps
-| | 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
-| | When Initialize LISP IPv4 forwarding in 3-node circular topology
-| | ... | ${dut1_to_dut2_ip4} | ${dut1_to_tg_ip4} | ${dut2_to_dut1_ip4}
-| | ... | ${dut2_to_tg_ip4} | ${prefix4}
-| | And Configure LISP topology in 3-node circular topology
-| | ... | ${dut1} | ${dut1_if2} | ${NONE}
-| | ... | ${dut2} | ${dut2_if1} | ${NONE}
-| | ... | ${duts_locator_set} | ${dut1_ip4_eid} | ${dut2_ip4_eid}
-| | ... | ${dut1_ip4_static_adjacency} | ${dut2_ip4_static_adjacency}
-| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | ${traffic_profile}
-
-| tc04-64B-2t2c-ethip4lispip4-ip4base-ndrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs LISP tunnel 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 3.6mpps.
-| | [Tags] | 64B | 2T2C | MTHREAD
-| | ${framesize}= | Set Variable | ${64}
-| | ${rate}= | Set Variable | 3.6mpps
-| | 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
-| | When Initialize LISP IPv4 forwarding in 3-node circular topology
-| | ... | ${dut1_to_dut2_ip4} | ${dut1_to_tg_ip4} | ${dut2_to_dut1_ip4}
-| | ... | ${dut2_to_tg_ip4} | ${prefix4}
-| | And Configure LISP topology in 3-node circular topology
-| | ... | ${dut1} | ${dut1_if2} | ${NONE}
-| | ... | ${dut2} | ${dut2_if1} | ${NONE}
-| | ... | ${duts_locator_set} | ${dut1_ip4_eid} | ${dut2_ip4_eid}
-| | ... | ${dut1_ip4_static_adjacency} | ${dut2_ip4_static_adjacency}
-| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | ${traffic_profile}
-
-| tc05-1480B-2t2c-ethip4lispip4-ip4base-ndrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs LISP tunnel config with 2 threads, 2 phy cores,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Verify ref-NDR for 1480 Byte frames using single trial\
-| | ... | throughput test at 2x 740000pps.
-| | [Tags] | 1480B | 2T2C | MTHREAD
-| | ${framesize}= | Set Variable | ${1480}
-| | ${rate}= | Set Variable | 740000pps
-| | 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
-| | When Initialize LISP IPv4 forwarding in 3-node circular topology
-| | ... | ${dut1_to_dut2_ip4} | ${dut1_to_tg_ip4} | ${dut2_to_dut1_ip4}
-| | ... | ${dut2_to_tg_ip4} | ${prefix4}
-| | And Configure LISP topology in 3-node circular topology
-| | ... | ${dut1} | ${dut1_if2} | ${NONE}
-| | ... | ${dut2} | ${dut2_if1} | ${NONE}
-| | ... | ${duts_locator_set} | ${dut1_ip4_eid} | ${dut2_ip4_eid}
-| | ... | ${dut1_ip4_static_adjacency} | ${dut2_ip4_static_adjacency}
-| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | ${traffic_profile}
-
-| tc06-9000B-2t2c-ethip4lispip4-ip4base-ndrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs LISP tunnel 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 120000pps.
-| | [Tags] | 9000B | 2T2C | MTHREAD
-| | ${framesize}= | Set Variable | ${9000}
-| | ${rate}= | Set Variable | 120000pps
-| | 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
-| | When Initialize LISP IPv4 forwarding in 3-node circular topology
-| | ... | ${dut1_to_dut2_ip4} | ${dut1_to_tg_ip4} | ${dut2_to_dut1_ip4}
-| | ... | ${dut2_to_tg_ip4} | ${prefix4}
-| | And Configure LISP topology in 3-node circular topology
-| | ... | ${dut1} | ${dut1_if2} | ${NONE}
-| | ... | ${dut2} | ${dut2_if1} | ${NONE}
-| | ... | ${duts_locator_set} | ${dut1_ip4_eid} | ${dut2_ip4_eid}
-| | ... | ${dut1_ip4_static_adjacency} | ${dut2_ip4_static_adjacency}
-| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | ${traffic_profile}
-
-| tc07-64B-4t4c-ethip4lispip4-ip4base-ndrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs LISP tunnel 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 3.5mpps.
-| | [Tags] | 64B | 4T4C | MTHREAD
-| | ${framesize}= | Set Variable | ${64}
-| | ${rate}= | Set Variable | 3.5mpps
-| | 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
-| | When Initialize LISP IPv4 forwarding in 3-node circular topology
-| | ... | ${dut1_to_dut2_ip4} | ${dut1_to_tg_ip4} | ${dut2_to_dut1_ip4}
-| | ... | ${dut2_to_tg_ip4} | ${prefix4}
-| | And Configure LISP topology in 3-node circular topology
-| | ... | ${dut1} | ${dut1_if2} | ${NONE}
-| | ... | ${dut2} | ${dut2_if1} | ${NONE}
-| | ... | ${duts_locator_set} | ${dut1_ip4_eid} | ${dut2_ip4_eid}
-| | ... | ${dut1_ip4_static_adjacency} | ${dut2_ip4_static_adjacency}
-| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | ${traffic_profile}
-
-| tc08-1480B-4t4c-ethip4lispip4-ip4base-ndrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs LISP tunnel config with 4 threads, 4 phy cores,\
-| | ... | 2 receive queues per NIC port.
-| | ... | [Ver] Verify ref-NDR for 1480 Byte frames using single trial\
-| | ... | throughput test at 2x 740000pps.
-| | [Tags] | 1480B | 4T4C | MTHREAD
-| | ${framesize}= | Set Variable | ${1480}
-| | ${rate}= | Set Variable | 740000pps
-| | 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
-| | When Initialize LISP IPv4 forwarding in 3-node circular topology
-| | ... | ${dut1_to_dut2_ip4} | ${dut1_to_tg_ip4} | ${dut2_to_dut1_ip4}
-| | ... | ${dut2_to_tg_ip4} | ${prefix4}
-| | And Configure LISP topology in 3-node circular topology
-| | ... | ${dut1} | ${dut1_if2} | ${NONE}
-| | ... | ${dut2} | ${dut2_if1} | ${NONE}
-| | ... | ${duts_locator_set} | ${dut1_ip4_eid} | ${dut2_ip4_eid}
-| | ... | ${dut1_ip4_static_adjacency} | ${dut2_ip4_static_adjacency}
-| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | ${traffic_profile}
-
-| tc09-9000B-4t4c-ethip4lispip4-ip4base-ndrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs LISP tunnel 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 120000pps.
-| | [Tags] | 9000B | 4T4C | MTHREAD
-| | ${framesize}= | Set Variable | ${9000}
-| | ${rate}= | Set Variable | 120000pps
-| | 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
-| | When Initialize LISP IPv4 forwarding in 3-node circular topology
-| | ... | ${dut1_to_dut2_ip4} | ${dut1_to_tg_ip4} | ${dut2_to_dut1_ip4}
-| | ... | ${dut2_to_tg_ip4} | ${prefix4}
-| | And Configure LISP topology in 3-node circular topology
-| | ... | ${dut1} | ${dut1_if2} | ${NONE}
-| | ... | ${dut2} | ${dut2_if1} | ${NONE}
-| | ... | ${duts_locator_set} | ${dut1_ip4_eid} | ${dut2_ip4_eid}
-| | ... | ${dut1_ip4_static_adjacency} | ${dut2_ip4_static_adjacency}
-| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | ${traffic_profile}
diff --git a/tests/vpp/perf/ip4_tunnels/10ge2p1x520-ethip4lispip4-ip4base-pdrchk.robot b/tests/vpp/perf/ip4_tunnels/10ge2p1x520-ethip4lispip4-ip4base-pdrchk.robot
deleted file mode 100644
index bebbfbc938..0000000000
--- a/tests/vpp/perf/ip4_tunnels/10ge2p1x520-ethip4lispip4-ip4base-pdrchk.robot
+++ /dev/null
@@ -1,193 +0,0 @@
-# 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:
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-*** Settings ***
-| Resource | resources/libraries/robot/performance/performance_setup.robot
-| Resource | resources/libraries/robot/overlay/lisp_static_adjacency.robot
-| Variables | resources/test_data/lisp/performance/lisp_static_adjacency.py
-| ...
-| Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | PDRCHK
-| ... | NIC_Intel-X520-DA2 | IP4FWD | ENCAP | LISP | IP4UNRLAY | IP4OVRLAY
-| ...
-| Suite Setup | Set up 3-node performance topology with DUT's NIC model
-| ... | L3 | Intel-X520-DA2
-| Suite Teardown | Tear down 3-node performance topology
-| ...
-| Test Setup | Set up performance test
-| Test Teardown | Tear down performance pdrchk test
-| ...
-| Documentation | *Reference PDR throughput Lisp tunnel verify test cases*
-| ...
-| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology\
-| ... | with single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4-LISP-IPv4 on DUT1-DUT2\
-| ... | Eth-IPv4 on TG-DUTn for IPv4 routing over LISPoIPv4 tunnel.
-| ... | *[Cfg] DUT configuration:* DUT1 and DUT2 are configured with IPv4\
-| ... | routing and static routes. LISPoIPv4 tunnel is configured between\
-| ... | DUT1 and DUT2. DUT1 and DUT2 tested with 2p10GE NIC X520\
-| ... | Niantic by Intel.
-| ... | *[Ver] TG verification:* In short performance tests, TG verifies\
-| ... | DUTs' throughput at ref-PDR (reference Non Drop Rate) with zero packet\
-| ... | loss tolerance. Ref-PDR value is periodically updated acording to\
-| ... | formula: ref-PDR = 0.9x PDR, where PDR is found in RFC2544 long\
-| ... | performance tests for the same DUT confiiguration. Test packets are\
-| ... | generated by TG on links to DUTs. TG traffic profile contains two L3\
-| ... | flow-groups (flow-group per direction, 253 flows per flow-group) with\
-| ... | all packets containing Ethernet header, IPv4 header with\
-| ... | IP protocol=61 and generated payload.
-| ... | *[Ref] Applicable standard specifications:* RFC2544.
-
-*** Variables ***
-# Traffic profile:
-| ${traffic_profile} | trex-sl-3n-ethip4-ip4src253
-
-*** Keywords ***
-| Check PDR for Lisp IPv4 over IPv4 forwarding
-| | [Documentation]
-| | ... | [Cfg] DUT runs LISP tunnel config with ${wt} thread, ${wt} phy core,\
-| | ... | ${rxq} receive queue per NIC port.
-| | ... | [Ver] Verify ref-NDR for ${framesize} Byte frames using single trial\
-| | ... | throughput test at 2x ${rate}.
-| | ...
-| | [Arguments] | ${framesize} | ${rate} | ${wt} | ${rxq}
-| | ...
-| | # Test Variables required for test and test teardown
-| | Set Test Variable | ${framesize}
-| | Set Test Variable | ${rate}
-| | ${get_framesize}= | Get Frame Size | ${framesize}
-| | ...
-| | Given Add '${wt}' worker threads and '${rxq}' rxqueues in 3-node single-link circular topology
-| | And Add PCI devices to DUTs in 3-node single link topology
-| | And Run Keyword If | ${get_framesize} < ${1522}
-| | ... | Add no multi seg to all DUTs
-| | And Apply startup configuration on all VPP DUTs
-| | When Initialize LISP IPv4 forwarding in 3-node circular topology
-| | ... | ${dut1_to_dut2_ip4} | ${dut1_to_tg_ip4} | ${dut2_to_dut1_ip4}
-| | ... | ${dut2_to_tg_ip4} | ${prefix4}
-| | And Configure LISP topology in 3-node circular topology
-| | ... | ${dut1} | ${dut1_if2} | ${NONE}
-| | ... | ${dut2} | ${dut2_if1} | ${NONE}
-| | ... | ${duts_locator_set} | ${dut1_ip4_eid} | ${dut2_ip4_eid}
-| | ... | ${dut1_ip4_static_adjacency} | ${dut2_ip4_static_adjacency}
-| | Then Traffic should pass with partial loss | ${perf_trial_duration}
-| | ... | ${rate} | ${framesize} | ${traffic_profile}
-| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
-
-*** Test Cases ***
-| tc01-64B-1t1c-ethip4lispip4-ip4base-pdrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs LISP tunnel 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 ${rate}.
-| | ...
-| | [Tags] | 64B | 1T1C | STHREAD
-| | ...
-| | [Template] | Check PDR for Lisp IPv4 over IPv4 forwarding
-| | framesize=${64} | rate=1.9mpps | wt=1 | rxq=1
-
-| tc02-1480B-1t1c-ethip4lispip4-ip4base-pdrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs LISP tunnel config with 1 thread, 1 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Verify ref-NDR for 1480 Byte frames using single trial\
-| | ... | throughput test at 2x ${rate}.
-| | ...
-| | [Tags] | 1480B | 1T1C | STHREAD
-| | ...
-| | [Template] | Check PDR for Lisp IPv4 over IPv4 forwarding
-| | framesize=${1480} | rate=370000pps | wt=1 | rxq=1
-
-| tc03-9000B-1t1c-ethip4lispip4-ip4base-pdrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs LISP tunnel 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 ${rate}.
-| | ...
-| | [Tags] | 9000B | 1T1C | STHREAD
-| | ...
-| | [Template] | Check PDR for Lisp IPv4 over IPv4 forwarding
-| | framesize=${9000} | rate=60000pps | wt=1 | rxq=1
-
-| tc04-64B-2t2c-ethip4lispip4-ip4base-pdrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs LISP tunnel 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 ${rate}.
-| | ...
-| | [Tags] | 64B | 2T2C | MTHREAD
-| | ...
-| | [Template] | Check PDR for Lisp IPv4 over IPv4 forwarding
-| | framesize=${64} | rate=3.6mpps | wt=2 | rxq=1
-
-| tc05-1480B-2t2c-ethip4lispip4-ip4base-pdrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs LISP tunnel config with 2 threads, 2 phy cores,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Verify ref-NDR for 1480 Byte frames using single trial\
-| | ... | throughput test at 2x ${rate}.
-| | ...
-| | [Tags] | 1480B | 2T2C | MTHREAD
-| | ...
-| | [Template] | Check PDR for Lisp IPv4 over IPv4 forwarding
-| | framesize=${1480} | rate=370000pps | wt=2 | rxq=1
-
-| tc06-9000B-2t2c-ethip4lispip4-ip4base-pdrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs LISP tunnel 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 ${rate}.
-| | ...
-| | [Tags] | 9000B | 2T2C | MTHREAD
-| | ...
-| | [Template] | Check PDR for Lisp IPv4 over IPv4 forwarding
-| | framesize=${9000} | rate=60000pps | wt=2 | rxq=1
-
-| tc07-64B-4t4c-ethip4lispip4-ip4base-pdrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs LISP tunnel 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 ${rate}.
-| | ...
-| | [Tags] | 64B | 4T4C | MTHREAD
-| | ...
-| | [Template] | Check PDR for Lisp IPv4 over IPv4 forwarding
-| | framesize=${64} | rate=3.5mpps | wt=4 | rxq=2
-
-| tc08-1480B-4t4c-ethip4lispip4-ip4base-pdrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs LISP tunnel config with 4 threads, 4 phy cores,\
-| | ... | 2 receive queues per NIC port.
-| | ... | [Ver] Verify ref-NDR for 1480 Byte frames using single trial\
-| | ... | throughput test at 2x ${rate}.
-| | ...
-| | [Tags] | 1480B | 4T4C | MTHREAD
-| | ...
-| | [Template] | Check PDR for Lisp IPv4 over IPv4 forwarding
-| | framesize=${1480} | rate=370000pps | wt=4 | rxq=2
-
-| tc09-9000B-4t4c-ethip4lispip4-ip4base-pdrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs LISP tunnel 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 ${rate}.
-| | ...
-| | [Tags] | 9000B | 4T4C | MTHREAD
-| | ...
-| | [Template] | Check PDR for Lisp IPv4 over IPv4 forwarding
-| | framesize=${9000} | rate=60000pps | wt=4 | rxq=2
diff --git a/tests/vpp/perf/ip4_tunnels/10ge2p1x520-ethip4lispip6-ip4base-ndrchk.robot b/tests/vpp/perf/ip4_tunnels/10ge2p1x520-ethip4lispip6-ip4base-ndrchk.robot
deleted file mode 100644
index cdcc200b55..0000000000
--- a/tests/vpp/perf/ip4_tunnels/10ge2p1x520-ethip4lispip6-ip4base-ndrchk.robot
+++ /dev/null
@@ -1,266 +0,0 @@
-# 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:
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-*** Settings ***
-| Resource | resources/libraries/robot/performance/performance_setup.robot
-| Resource | resources/libraries/robot/overlay/lisp_static_adjacency.robot
-| Variables | resources/test_data/lisp/performance/lisp_static_adjacency.py
-| ...
-| Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRCHK
-| ... | NIC_Intel-X520-DA2 | IP4FWD | ENCAP | LISP | IP6UNRLAY | IP4OVRLAY
-| ...
-| Suite Setup | Set up 3-node performance topology with DUT's NIC model
-| ... | L3 | Intel-X520-DA2
-| 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 Lisp tunnel verify test cases*
-| ...
-| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology
-| ... | with single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4-LISP-IPv6 on DUT1-DUT2,\
-| ... | Eth-IPv4 on TG-DUTn for IPv4 routing over LISPoIPv6 tunnel.
-| ... | *[Cfg] DUT configuration:* DUT1 and DUT2 are configured with IPv4\
-| ... | routing and static routes. LISPoIPv6 tunnel is configured between\
-| ... | DUT1 and DUT2. DUT1 and DUT2 tested with 2p10GE NIC X520 Niantic\
-| ... | by Intel.
-| ... | *[Ver] TG verification:* In short performance tests, TG verifies\
-| ... | DUTs' throughput at ref-NDR (reference Non Drop Rate) with zero packet\
-| ... | loss tolerance. Ref-NDR value is periodically updated acording to\
-| ... | formula: ref-NDR = 0.9x NDR, where NDR is found in RFC2544 long
-| ... | performance tests for the same DUT confiiguration. Test packets are\
-| ... | generated by TG on links to DUTs. TG traffic profile contains two L3\
-| ... | flow-groups (flow-group per direction, 253 flows per flow-group) with\
-| ... | all packets containing Ethernet header, IPv4 header or IPv6 header with\
-| ... | IP protocol=61 and generated payload.
-| ... | *[Ref] Applicable standard specifications:* RFC2544.
-
-*** Variables ***
-# Traffic profile:
-| ${traffic_profile} | trex-sl-3n-ethip4-ip4src253
-
-*** Test Cases ***
-| tc01-64B-1t1c-ethip4lispip6-ip4base-ndrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs LISP tunnel 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 1.53mpps.
-| | [Tags] | 64B | 1T1C | STHREAD
-| | ${framesize}= | Set Variable | ${64}
-| | ${rate}= | Set Variable | 1.53mpps
-| | 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
-| | When Initialize LISP IPv4 over IPv6 forwarding in 3-node circular topology
-| | ... | ${dut1_to_dut2_ip4o6} | ${dut1_to_tg_ip4o6} | ${dut2_to_dut1_ip4o6}
-| | ... | ${dut2_to_tg_ip4o6} | ${tg_prefix4o6} | ${dut_prefix4o6}
-| | And Configure LISP topology in 3-node circular topology
-| | ... | ${dut1} | ${dut1_if2} | ${NONE}
-| | ... | ${dut2} | ${dut2_if1} | ${NONE}
-| | ... | ${duts_locator_set} | ${dut1_ip4o6_eid} | ${dut2_ip4o6_eid}
-| | ... | ${dut1_ip4o6_static_adjacency} | ${dut2_ip4o6_static_adjacency}
-| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | ${traffic_profile}
-
-| tc02-1460B-1t1c-ethip4lispip6-ip4base-ndrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs LISP tunnel config with 1 thread, 1 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Verify ref-NDR for 1460 Byte frames using single trial\
-| | ... | throughput test at 2x 720000pps.
-| | [Tags] | 1460B | 1T1C | STHREAD
-| | ${framesize}= | Set Variable | ${1460}
-| | ${rate}= | Set Variable | 720000pps
-| | 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
-| | When Initialize LISP IPv4 over IPv6 forwarding in 3-node circular topology
-| | ... | ${dut1_to_dut2_ip4o6} | ${dut1_to_tg_ip4o6} | ${dut2_to_dut1_ip4o6}
-| | ... | ${dut2_to_tg_ip4o6} | ${tg_prefix4o6} | ${dut_prefix4o6}
-| | And Configure LISP topology in 3-node circular topology
-| | ... | ${dut1} | ${dut1_if2} | ${NONE}
-| | ... | ${dut2} | ${dut2_if1} | ${NONE}
-| | ... | ${duts_locator_set} | ${dut1_ip4o6_eid} | ${dut2_ip4o6_eid}
-| | ... | ${dut1_ip4o6_static_adjacency} | ${dut2_ip4o6_static_adjacency}
-| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | ${traffic_profile}
-
-| tc03-9000B-1t1c-ethip4lispip6-ip4base-ndrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs LISP tunnel 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 120000pps.
-| | [Tags] | 9000B | 1T1C | STHREAD
-| | ${framesize}= | Set Variable | ${9000}
-| | ${rate}= | Set Variable | 120000pps
-| | 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
-| | When Initialize LISP IPv4 over IPv6 forwarding in 3-node circular topology
-| | ... | ${dut1_to_dut2_ip4o6} | ${dut1_to_tg_ip4o6} | ${dut2_to_dut1_ip4o6}
-| | ... | ${dut2_to_tg_ip4o6} | ${tg_prefix4o6} | ${dut_prefix4o6}
-| | And Configure LISP topology in 3-node circular topology
-| | ... | ${dut1} | ${dut1_if2} | ${NONE}
-| | ... | ${dut2} | ${dut2_if1} | ${NONE}
-| | ... | ${duts_locator_set} | ${dut1_ip4o6_eid} | ${dut2_ip4o6_eid}
-| | ... | ${dut1_ip4o6_static_adjacency} | ${dut2_ip4o6_static_adjacency}
-| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | ${traffic_profile}
-
-| tc04-64B-2t2c-ethip4lispip6-ip4base-ndrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs LISP tunnel 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 3.25mpps.
-| | [Tags] | 64B | 2T2C | MTHREAD
-| | ${framesize}= | Set Variable | ${64}
-| | ${rate}= | Set Variable | 3.25mpps
-| | 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
-| | When Initialize LISP IPv4 over IPv6 forwarding in 3-node circular topology
-| | ... | ${dut1_to_dut2_ip4o6} | ${dut1_to_tg_ip4o6} | ${dut2_to_dut1_ip4o6}
-| | ... | ${dut2_to_tg_ip4o6} | ${tg_prefix4o6} | ${dut_prefix4o6}
-| | And Configure LISP topology in 3-node circular topology
-| | ... | ${dut1} | ${dut1_if2} | ${NONE}
-| | ... | ${dut2} | ${dut2_if1} | ${NONE}
-| | ... | ${duts_locator_set} | ${dut1_ip4o6_eid} | ${dut2_ip4o6_eid}
-| | ... | ${dut1_ip4o6_static_adjacency} | ${dut2_ip4o6_static_adjacency}
-| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | ${traffic_profile}
-
-| tc05-1460B-2t2c-ethip4lispip6-ip4base-ndrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs LISP tunnel config with 2 threads, 2 phy cores,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Verify ref-NDR for 1460 Byte frames using single trial\
-| | ... | throughput test at 2x 720000pps.
-| | [Tags] | 1460B | 2T2C | MTHREAD
-| | ${framesize}= | Set Variable | ${1460}
-| | ${rate}= | Set Variable | 720000pps
-| | 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
-| | When Initialize LISP IPv4 over IPv6 forwarding in 3-node circular topology
-| | ... | ${dut1_to_dut2_ip4o6} | ${dut1_to_tg_ip4o6} | ${dut2_to_dut1_ip4o6}
-| | ... | ${dut2_to_tg_ip4o6} | ${tg_prefix4o6} | ${dut_prefix4o6}
-| | And Configure LISP topology in 3-node circular topology
-| | ... | ${dut1} | ${dut1_if2} | ${NONE}
-| | ... | ${dut2} | ${dut2_if1} | ${NONE}
-| | ... | ${duts_locator_set} | ${dut1_ip4o6_eid} | ${dut2_ip4o6_eid}
-| | ... | ${dut1_ip4o6_static_adjacency} | ${dut2_ip4o6_static_adjacency}
-| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | ${traffic_profile}
-
-| tc06-9000B-2t2c-ethip4lispip6-ip4base-ndrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs LISP tunnel 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 120000pps.
-| | [Tags] | 9000B | 2T2C | MTHREAD
-| | ${framesize}= | Set Variable | ${9000}
-| | ${rate}= | Set Variable | 120000pps
-| | 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
-| | When Initialize LISP IPv4 over IPv6 forwarding in 3-node circular topology
-| | ... | ${dut1_to_dut2_ip4o6} | ${dut1_to_tg_ip4o6} | ${dut2_to_dut1_ip4o6}
-| | ... | ${dut2_to_tg_ip4o6} | ${tg_prefix4o6} | ${dut_prefix4o6}
-| | And Configure LISP topology in 3-node circular topology
-| | ... | ${dut1} | ${dut1_if2} | ${NONE}
-| | ... | ${dut2} | ${dut2_if1} | ${NONE}
-| | ... | ${duts_locator_set} | ${dut1_ip4o6_eid} | ${dut2_ip4o6_eid}
-| | ... | ${dut1_ip4o6_static_adjacency} | ${dut2_ip4o6_static_adjacency}
-| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | ${traffic_profile}
-
-| tc07-64B-4t4c-ethip4lispip6-ip4base-ndrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs LISP tunnel 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 3.12mpps.
-| | [Tags] | 64B | 4T4C | MTHREAD
-| | ${framesize}= | Set Variable | ${64}
-| | ${rate}= | Set Variable | 3.12mpps
-| | 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
-| | When Initialize LISP IPv4 over IPv6 forwarding in 3-node circular topology
-| | ... | ${dut1_to_dut2_ip4o6} | ${dut1_to_tg_ip4o6} | ${dut2_to_dut1_ip4o6}
-| | ... | ${dut2_to_tg_ip4o6} | ${tg_prefix4o6} | ${dut_prefix4o6}
-| | And Configure LISP topology in 3-node circular topology
-| | ... | ${dut1} | ${dut1_if2} | ${NONE}
-| | ... | ${dut2} | ${dut2_if1} | ${NONE}
-| | ... | ${duts_locator_set} | ${dut1_ip4o6_eid} | ${dut2_ip4o6_eid}
-| | ... | ${dut1_ip4o6_static_adjacency} | ${dut2_ip4o6_static_adjacency}
-| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | ${traffic_profile}
-
-| tc08-1460B-4t4c-ethip4lispip6-ip4base-ndrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs LISP tunnel config with 4 threads, 4 phy cores,\
-| | ... | 2 receive queues per NIC port.
-| | ... | [Ver] Verify ref-NDR for 1460 Byte frames using single trial\
-| | ... | throughput test at 2x 720000pps.
-| | [Tags] | 1460B | 4T4C | MTHREAD
-| | ${framesize}= | Set Variable | ${1460}
-| | ${rate}= | Set Variable | 720000pps
-| | 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
-| | When Initialize LISP IPv4 over IPv6 forwarding in 3-node circular topology
-| | ... | ${dut1_to_dut2_ip4o6} | ${dut1_to_tg_ip4o6} | ${dut2_to_dut1_ip4o6}
-| | ... | ${dut2_to_tg_ip4o6} | ${tg_prefix4o6} | ${dut_prefix4o6}
-| | And Configure LISP topology in 3-node circular topology
-| | ... | ${dut1} | ${dut1_if2} | ${NONE}
-| | ... | ${dut2} | ${dut2_if1} | ${NONE}
-| | ... | ${duts_locator_set} | ${dut1_ip4o6_eid} | ${dut2_ip4o6_eid}
-| | ... | ${dut1_ip4o6_static_adjacency} | ${dut2_ip4o6_static_adjacency}
-| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | ${traffic_profile}
-
-| tc09-9000B-4t4c-ethip4lispip6-ip4base-ndrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs LISP tunnel 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 120000pps.
-| | [Tags] | 9000B | 4T4C | MTHREAD
-| | ${framesize}= | Set Variable | ${9000}
-| | ${rate}= | Set Variable | 120000pps
-| | 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
-| | When Initialize LISP IPv4 over IPv6 forwarding in 3-node circular topology
-| | ... | ${dut1_to_dut2_ip4o6} | ${dut1_to_tg_ip4o6} | ${dut2_to_dut1_ip4o6}
-| | ... | ${dut2_to_tg_ip4o6} | ${tg_prefix4o6} | ${dut_prefix4o6}
-| | And Configure LISP topology in 3-node circular topology
-| | ... | ${dut1} | ${dut1_if2} | ${NONE}
-| | ... | ${dut2} | ${dut2_if1} | ${NONE}
-| | ... | ${duts_locator_set} | ${dut1_ip4o6_eid} | ${dut2_ip4o6_eid}
-| | ... | ${dut1_ip4o6_static_adjacency} | ${dut2_ip4o6_static_adjacency}
-| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | ${traffic_profile}
diff --git a/tests/vpp/perf/ip4_tunnels/10ge2p1x520-ethip4lispip6-ip4base-pdrchk.robot b/tests/vpp/perf/ip4_tunnels/10ge2p1x520-ethip4lispip6-ip4base-pdrchk.robot
deleted file mode 100644
index f8190674a7..0000000000
--- a/tests/vpp/perf/ip4_tunnels/10ge2p1x520-ethip4lispip6-ip4base-pdrchk.robot
+++ /dev/null
@@ -1,193 +0,0 @@
-# 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:
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-*** Settings ***
-| Resource | resources/libraries/robot/performance/performance_setup.robot
-| Resource | resources/libraries/robot/overlay/lisp_static_adjacency.robot
-| Variables | resources/test_data/lisp/performance/lisp_static_adjacency.py
-| ...
-| Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | PDRCHK
-| ... | NIC_Intel-X520-DA2 | IP4FWD | ENCAP | LISP | IP6UNRLAY | IP4OVRLAY
-| ...
-| Suite Setup | Set up 3-node performance topology with DUT's NIC model
-| ... | L3 | Intel-X520-DA2
-| Suite Teardown | Tear down 3-node performance topology
-| ...
-| Test Setup | Set up performance test
-| Test Teardown | Tear down performance pdrchk test
-| ...
-| Documentation | *Reference PDR throughput Lisp tunnel verify test cases*
-| ...
-| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology
-| ... | with single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4-LISP-IPv6 on DUT1-DUT2,\
-| ... | Eth-IPv4 on TG-DUTn for IPv4 routing over LISPoIPv6 tunnel.
-| ... | *[Cfg] DUT configuration:* DUT1 and DUT2 are configured with IPv4\
-| ... | routing and static routes. LISPoIPv6 tunnel is configured between\
-| ... | DUT1 and DUT2. DUT1 and DUT2 tested with 2p10GE NIC X520 Niantic\
-| ... | by Intel.
-| ... | *[Ver] TG verification:* In short performance tests, TG verifies\
-| ... | DUTs' throughput at ref-PDR (reference Non Drop Rate) with zero packet\
-| ... | loss tolerance. Ref-PDR value is periodically updated acording to\
-| ... | formula: ref-PDR = 0.9x PDR, where PDR is found in RFC2544 long
-| ... | performance tests for the same DUT confiiguration. Test packets are\
-| ... | generated by TG on links to DUTs. TG traffic profile contains two L3\
-| ... | flow-groups (flow-group per direction, 253 flows per flow-group) with\
-| ... | all packets containing Ethernet header, IPv4 header or IPv6 header with\
-| ... | IP protocol=61 and generated payload.
-| ... | *[Ref] Applicable standard specifications:* RFC2544.
-
-*** Variables ***
-# Traffic profile:
-| ${traffic_profile} | trex-sl-3n-ethip4-ip4src253
-
-*** Keywords ***
-| Check PDR for Lisp IPv4 over IPv6 forwarding
-| | [Documentation]
-| | ... | [Cfg] DUT runs LISP tunnel config with ${wt} thread, ${wt} phy core,\
-| | ... | ${rxq} receive queue per NIC port.
-| | ... | [Ver] Verify ref-NDR for ${framesize} Byte frames using single trial\
-| | ... | throughput test at 2x ${rate}.
-| | ...
-| | [Arguments] | ${framesize} | ${rate} | ${wt} | ${rxq}
-| | ...
-| | # Test Variables required for test and test teardown
-| | Set Test Variable | ${framesize}
-| | Set Test Variable | ${rate}
-| | ${get_framesize}= | Get Frame Size | ${framesize}
-| | ...
-| | Given Add '${wt}' worker threads and '${rxq}' rxqueues in 3-node single-link circular topology
-| | And Add PCI devices to DUTs in 3-node single link topology
-| | And Run Keyword If | ${get_framesize} < ${1522}
-| | ... | Add no multi seg to all DUTs
-| | And Apply startup configuration on all VPP DUTs
-| | When Initialize LISP IPv4 over IPv6 forwarding in 3-node circular topology
-| | ... | ${dut1_to_dut2_ip4o6} | ${dut1_to_tg_ip4o6} | ${dut2_to_dut1_ip4o6}
-| | ... | ${dut2_to_tg_ip4o6} | ${tg_prefix4o6} | ${dut_prefix4o6}
-| | And Configure LISP topology in 3-node circular topology
-| | ... | ${dut1} | ${dut1_if2} | ${NONE}
-| | ... | ${dut2} | ${dut2_if1} | ${NONE}
-| | ... | ${duts_locator_set} | ${dut1_ip4o6_eid} | ${dut2_ip4o6_eid}
-| | ... | ${dut1_ip4o6_static_adjacency} | ${dut2_ip4o6_static_adjacency}
-| | Then Traffic should pass with partial loss | ${perf_trial_duration}
-| | ... | ${rate} | ${framesize} | ${traffic_profile}
-| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
-
-*** Test Cases ***
-| tc01-64B-1t1c-ethip4lispip6-ip4base-pdrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs LISP tunnel 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 ${rate}.
-| | ...
-| | [Tags] | 64B | 1T1C | STHREAD
-| | ...
-| | [Template] | Check PDR for Lisp IPv4 over IPv6 forwarding
-| | framesize=${64} | rate=1.53mpps | wt=1 | rxq=1
-
-| tc02-1460B-1t1c-ethip4lispip6-ip4base-pdrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs LISP tunnel config with 1 thread, 1 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Verify ref-NDR for 1460 Byte frames using single trial\
-| | ... | throughput test at 2x ${rate}.
-| | ...
-| | [Tags] | 1460B | 1T1C | STHREAD
-| | ...
-| | [Template] | Check PDR for Lisp IPv4 over IPv6 forwarding
-| | framesize=${1460} | rate=360000pps | wt=1 | rxq=1
-
-| tc03-9000B-1t1c-ethip4lispip6-ip4base-pdrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs LISP tunnel 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 ${rate}.
-| | ...
-| | [Tags] | 9000B | 1T1C | STHREAD
-| | ...
-| | [Template] | Check PDR for Lisp IPv4 over IPv6 forwarding
-| | framesize=${9000} | rate=60000pps | wt=1 | rxq=1
-
-| tc04-64B-2t2c-ethip4lispip6-ip4base-pdrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs LISP tunnel 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 ${rate}.
-| | ...
-| | [Tags] | 64B | 2T2C | MTHREAD
-| | ...
-| | [Template] | Check PDR for Lisp IPv4 over IPv6 forwarding
-| | framesize=${64} | rate=3.25mpps | wt=2 | rxq=1
-
-| tc05-1460B-2t2c-ethip4lispip6-ip4base-pdrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs LISP tunnel config with 2 threads, 2 phy cores,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Verify ref-NDR for 1460 Byte frames using single trial\
-| | ... | throughput test at 2x ${rate}.
-| | ...
-| | [Tags] | 1460B | 2T2C | MTHREAD
-| | ...
-| | [Template] | Check PDR for Lisp IPv4 over IPv6 forwarding
-| | framesize=${1460} | rate=360000pps | wt=2 | rxq=1
-
-| tc06-9000B-2t2c-ethip4lispip6-ip4base-pdrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs LISP tunnel 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 ${rate}.
-| | ...
-| | [Tags] | 9000B | 2T2C | MTHREAD
-| | ...
-| | [Template] | Check PDR for Lisp IPv4 over IPv6 forwarding
-| | framesize=${9000} | rate=60000pps | wt=2 | rxq=1
-
-| tc07-64B-4t4c-ethip4lispip6-ip4base-pdrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs LISP tunnel 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 ${rate}.
-| | ...
-| | [Tags] | 64B | 4T4C | MTHREAD
-| | ...
-| | [Template] | Check PDR for Lisp IPv4 over IPv6 forwarding
-| | framesize=${64} | rate=3.12mpps | wt=4 | rxq=2
-
-| tc08-1460B-4t4c-ethip4lispip6-ip4base-pdrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs LISP tunnel config with 4 threads, 4 phy cores,\
-| | ... | 2 receive queues per NIC port.
-| | ... | [Ver] Verify ref-NDR for 1460 Byte frames using single trial\
-| | ... | throughput test at 2x ${rate}.
-| | ...
-| | [Tags] | 1460B | 4T4C | MTHREAD
-| | ...
-| | [Template] | Check PDR for Lisp IPv4 over IPv6 forwarding
-| | framesize=${1460} | rate=360000pps | wt=4 | rxq=2
-
-| tc09-9000B-4t4c-ethip4lispip6-ip4base-pdrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs LISP tunnel 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 ${rate}.
-| | ...
-| | [Tags] | 9000B | 4T4C | MTHREAD
-| | ...
-| | [Template] | Check PDR for Lisp IPv4 over IPv6 forwarding
-| | framesize=${9000} | rate=60000pps | wt=4 | rxq=2
diff --git a/tests/vpp/perf/ip4_tunnels/10ge2p1x520-ethip4vxlan-l2bdbasemaclrn-pdrchk.robot b/tests/vpp/perf/ip4_tunnels/10ge2p1x520-ethip4vxlan-l2bdbasemaclrn-pdrchk.robot
deleted file mode 100644
index dee56213c7..0000000000
--- a/tests/vpp/perf/ip4_tunnels/10ge2p1x520-ethip4vxlan-l2bdbasemaclrn-pdrchk.robot
+++ /dev/null
@@ -1,186 +0,0 @@
-# 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:
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-*** Settings ***
-| Resource | resources/libraries/robot/performance/performance_setup.robot
-| ...
-| Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | PDRCHK
-| ... | NIC_Intel-X520-DA2 | L2BDMACLRN | ENCAP | VXLAN | L2OVRLAY | IP4UNRLAY
-| ...
-| Suite Setup | Set up 3-node performance topology with DUT's NIC model
-| ... | L2 | Intel-X520-DA2
-| Suite Teardown | Tear down 3-node performance topology
-| ...
-| Test Setup | Set up performance test
-| ...
-| Test Teardown | Tear down performance pdrchk test
-| ...
-| Documentation | *RFC2544: Packet throughput L2BD with VXLANoIPv4 test cases*
-| ...
-| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology
-| ... | with single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 bridge domain on TG-DUTn.
-| ... | Eth-IPv4-VXLAN-Eth-IPv4 is applied on link between DUT1 and DUT2.
-| ... | *[Cfg] DUT configuration:* DUT1 and DUT2 are configured with L2 bridge
-| ... | domain. VXLAN tunnels are configured between L2BDs on DUT1 and DUT2.
-| ... | DUT1 and DUT2 tested with 2p10GE NIC X520 Niantic by Intel.
-| ... | *[Ver] TG verification:* TG verifies throughput PDR (Partial Drop
-| ... | Rate) with non-zero packet loss tolerance (LT) expressed in percentage
-| ... | of packets transmitted. Ref-PDR value is periodically updated acording
-| ... | to formula: ref-PDR = 0.9x PDR, where PDR is found in RFC2544 long
-| ... | performance tests for the same DUT configuration. Test packets are
-| ... | generated by TG on links to DUTs. TG traffic profile contains two L3
-| ... | flow-groups (flow-group per direction, 253 flows per flow-group) with
-| ... | all packets containing Ethernet header, IPv4 header with IP protocol=61
-| ... | and generated payload. MAC addresses are matching MAC addresses of the
-| ... | TG node interfaces.
-| ... | *[Ref] Applicable standard specifications:* RFC2544, RFC7348.
-
-*** Variables ***
-| ${vxlan_overhead} | ${50}
-# Traffic profile:
-| ${traffic_profile} | trex-sl-3n-ethip4-ip4src254
-
-*** Keywords ***
-| Check PDR for L2BD forwarding with VXLAN over IPv4
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2XC config config with ${wt} thread, ${wt} phy\
-| | ... | core, ${rxq} receive queue per NIC port.
-| | ... | [Ver] Verify ref-PDR for ${framesize} Byte frames using single trial\
-| | ... | throughput test at 2x ${rate}.
-| | ...
-| | [Arguments] | ${framesize} | ${rate} | ${wt} | ${rxq}
-| | ...
-| | # Test Variables required for test and test teardown
-| | Set Test Variable | ${framesize}
-| | Set Test Variable | ${rate}
-| | ${get_framesize}= | Get Frame Size | ${framesize}
-| | ...
-| | Given Add '${wt}' worker threads and '${rxq}' rxqueues in 3-node single-link circular topology
-| | And Add PCI devices to DUTs in 3-node single link topology
-| | And Run Keyword If | ${get_framesize} < ${1522}
-| | ... | Add no multi seg to all DUTs
-| | And Apply startup configuration on all VPP DUTs
-| | And Initialize L2 bridge domain with VXLANoIPv4 in 3-node circular topology
-| | Then Traffic should pass with partial loss | ${perf_trial_duration}
-| | ... | ${rate} | ${framesize} | ${traffic_profile}
-| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
-
-*** Test Cases ***
-| tc01-64B-1t1c-ethip4vxlan-l2bdbasemaclrn-pdrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2XC 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 ${rate}.
-| | ...
-| | [Tags] | 64B | 1T1C | STHREAD
-| | ...
-| | [Template] | Check PDR for L2BD forwarding with VXLAN over IPv4
-| | framesize=${64 + ${vxlan_overhead}} | rate=2.4mpps | wt=1 | rxq=1
-
-| tc02-1518B-1t1c-ethip4vxlan-l2bdbasemaclrn-pdrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2XC 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 ${rate}.
-| | ...
-| | [Tags] | 1518B | 1T1C | STHREAD
-| | ...
-| | [Template] | Check PDR for L2BD forwarding with VXLAN over IPv4
-| | framesize=${1518 + ${vxlan_overhead}} | rate=700000pps | wt=1 | rxq=1
-
-| tc03-9000B-1t1c-ethip4vxlan-l2bdbasemaclrn-pdrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2XC 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 ${rate}.
-| | ...
-| | [Tags] | 9000B | 1T1C | STHREAD
-| | ...
-| | [Template] | Check PDR for L2BD forwarding with VXLAN over IPv4
-| | framesize=${9000 + ${vxlan_overhead}} | rate=100000pps | wt=1 | rxq=1
-
-| tc04-64B-2t2c-ethip4vxlan-l2bdbasemaclrn-pdrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching 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 ${rate}.
-| | ...
-| | [Tags] | 64B | 2T2C | MTHREAD
-| | ...
-| | [Template] | Check PDR for L2BD forwarding with VXLAN over IPv4
-| | framesize=${64 + ${vxlan_overhead}} | rate=5.2mpps | wt=2 | rxq=1
-
-| tc05-1518B-2t2c-ethip4vxlan-l2bdbasemaclrn-pdrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching 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 ${rate}.
-| | ...
-| | [Tags] | 1518B | 2T2C | MTHREAD
-| | ...
-| | [Template] | Check PDR for L2BD forwarding with VXLAN over IPv4
-| | framesize=${1518 + ${vxlan_overhead}} | rate=650000pps | wt=2 | rxq=1
-
-| tc06-9000B-2t2c-ethip4vxlan-l2bdbasemaclrn-pdrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching 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 ${rate}.
-| | ...
-| | [Tags] | 9000B | 2T2C | MTHREAD
-| | ...
-| | [Template] | Check PDR for L2BD forwarding with VXLAN over IPv4
-| | framesize=${9000 + ${vxlan_overhead}} | rate=100000pps | wt=2 | rxq=1
-
-| tc07-64B-4t4c-ethip4vxlan-l2bdbasemaclrn-pdrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 4 threads, 4 phy cores,\
-| | ... | 2 receive queue per NIC port.
-| | ... | [Ver] Verify ref-NDR for 64 Byte frames using single trial\
-| | ... | throughput test at 2x ${rate}.
-| | ...
-| | [Tags] | 64B | 4T4C | MTHREAD
-| | ...
-| | [Template] | Check PDR for L2BD forwarding with VXLAN over IPv4
-| | framesize=${64 + ${vxlan_overhead}} | rate=6.5mpps | wt=4 | rxq=2
-
-| tc08-1518B-4t4c-ethip4vxlan-l2bdbasemaclrn-pdrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 4 threads, 4 phy cores,\
-| | ... | 2 receive queue per NIC port.
-| | ... | [Ver] Verify ref-NDR for 1518 Byte frames using single trial\
-| | ... | throughput test at 2x ${rate}.
-| | ...
-| | [Tags] | 1518B | 4T4C | MTHREAD
-| | ...
-| | [Template] | Check PDR for L2BD forwarding with VXLAN over IPv4
-| | framesize=${1518 + ${vxlan_overhead}} | rate=700000pps | wt=4 | rxq=2
-
-| tc09-9000B-4t4c-ethip4vxlan-l2bdbasemaclrn-pdrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 4 threads, 4 phy cores,\
-| | ... | 2 receive queue per NIC port.
-| | ... | [Ver] Verify ref-NDR for 9000 Byte frames using single trial\
-| | ... | throughput test at 2x ${rate}.
-| | ...
-| | [Tags] | 9000B | 4T4C | MTHREAD
-| | ...
-| | [Template] | Check PDR for L2BD forwarding with VXLAN over IPv4
-| | framesize=${9000 + ${vxlan_overhead}} | rate=100000pps | wt=4 | rxq=2
diff --git a/tests/vpp/perf/ip4_tunnels/10ge2p1x520-ethip4vxlan-l2xcbase-ndrchk.robot b/tests/vpp/perf/ip4_tunnels/10ge2p1x520-ethip4vxlan-l2xcbase-ndrchk.robot
deleted file mode 100644
index 1a07df20a3..0000000000
--- a/tests/vpp/perf/ip4_tunnels/10ge2p1x520-ethip4vxlan-l2xcbase-ndrchk.robot
+++ /dev/null
@@ -1,190 +0,0 @@
-# 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:
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-*** Settings ***
-| Resource | resources/libraries/robot/performance/performance_setup.robot
-| ...
-| Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRCHK
-| ... | NIC_Intel-X520-DA2 | L2XCFWD | ENCAP | VXLAN | L2OVRLAY | IP4UNRLAY
-| ...
-| Suite Setup | Set up 3-node performance topology with DUT's NIC model
-| ... | L2 | Intel-X520-DA2
-| 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 L2XC with VXLANoIPv4 verify test\
-| ... | cases*
-| ...
-| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology
-| ... | with single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 cross-connect on TG-DUTn.
-| ... | Eth-IPv4-VXLAN-Eth-IPv4 is applied on link between DUT1 and DUT2.
-| ... | *[Cfg] DUT configuration:* DUT1 and DUT2 are configured with L2 cross-
-| ... | connect. VXLAN tunnels are configured between L2XCs on DUT1 and DUT2.
-| ... | DUT1 and DUT2 tested with 2p10GE NIC X520 Niantic by Intel.
-| ... | *[Ver] TG verification:* In short performance tests, TG verifies
-| ... | DUTs' throughput at ref-NDR (reference Non Drop Rate) with zero packet
-| ... | loss tolerance. Ref-NDR value is periodically updated acording to
-| ... | formula: ref-NDR = 0.9x NDR, where NDR is found in RFC2544 long
-| ... | performance tests for the same DUT configuration. Test packets are
-| ... | generated by TG on links to DUTs. TG traffic profile contains two L3
-| ... | flow-groups (flow-group per direction, 253 flows per flow-group) with
-| ... | all packets containing Ethernet header, IPv4 header with IP protocol=61
-| ... | and generated payload. MAC addresses are matching MAC addresses of the
-| ... | TG node interfaces.
-| ... | *[Ref] Applicable standard specifications:* RFC2544, RFC7348.
-
-*** Variables ***
-# Traffic profile:
-| ${traffic_profile} | trex-sl-3n-ethip4-ip4src254
-
-*** Test Cases ***
-| tc01-64B-1t1c-ethip4vxlan-l2xcbase-ndrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2XC 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 2.4mpps.
-| | [Tags] | 64B | 1T1C | STHREAD
-| | ${framesize}= | Set Variable | ${64}
-| | ${rate}= | Set Variable | 2.4mpps
-| | 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 xconnect with VXLANoIPv4 in 3-node circular topology
-| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | ${traffic_profile}
-
-| tc02-1518B-1t1c-ethip4vxlan-l2xcbase-ndrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2XC 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 787153pps.
-| | [Tags] | 1518B | 1T1C | STHREAD
-| | ${framesize}= | Set Variable | ${1518}
-| | ${rate}= | Set Variable | 787153pps
-| | 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 xconnect with VXLANoIPv4 in 3-node circular topology
-| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | ${traffic_profile}
-
-| tc03-9000B-1t1c-ethip4vxlan-l2xcbase-ndrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2XC 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 137816pps.
-| | [Tags] | 9000B | 1T1C | STHREAD
-| | ${framesize}= | Set Variable | ${9000}
-| | ${rate}= | Set Variable | 137816pps
-| | 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 xconnect with VXLANoIPv4 in 3-node circular topology
-| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | ${traffic_profile}
-
-| tc04-64B-2t2c-ethip4vxlan-l2xcbase-ndrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching 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 5.2mpps.
-| | [Tags] | 64B | 2T2C | MTHREAD
-| | ${framesize}= | Set Variable | ${64}
-| | ${rate}= | Set Variable | 5.2mpps
-| | 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 xconnect with VXLANoIPv4 in 3-node circular topology
-| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | ${traffic_profile}
-
-| tc05-1518B-2t2c-ethip4vxlan-l2xcbase-ndrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching 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 787153pps.
-| | [Tags] | 1518B | 2T2C | MTHREAD
-| | ${framesize}= | Set Variable | ${1518}
-| | ${rate}= | Set Variable | 787153pps
-| | 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 xconnect with VXLANoIPv4 in 3-node circular topology
-| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | ${traffic_profile}
-
-| tc06-9000B-2t2c-ethip4vxlan-l2xcbase-ndrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching 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 137816pps.
-| | [Tags] | 9000B | 2T2C | MTHREAD
-| | ${framesize}= | Set Variable | ${9000}
-| | ${rate}= | Set Variable | 137816pps
-| | 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 xconnect with VXLANoIPv4 in 3-node circular topology
-| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | ${traffic_profile}
-
-| tc07-64B-4t4c-ethip4vxlan-l2xcbase-ndrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 4 threads, 4 phy cores, \
-| | ... | 2 receive queue per NIC port. [Ver] Verify ref-NDR for 64 Byte
-| | ... | frames using single trial throughput test at 2x 8.4mpps.
-| | [Tags] | 64B | 4T4C | MTHREAD
-| | ${framesize}= | Set Variable | ${64}
-| | ${rate}= | Set Variable | 8.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 xconnect with VXLANoIPv4 in 3-node circular topology
-| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | ${traffic_profile}
-
-| tc08-1518B-4t4c-ethip4vxlan-l2xcbase-ndrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 4 threads, 4 phy cores, \
-| | ... | 2 receive queue per NIC port. [Ver] Verify ref-NDR for 1518 Byte
-| | ... | frames using single trial throughput test at 2x 787153pps.
-| | [Tags] | 1518B | 4T4C | MTHREAD
-| | ${framesize}= | Set Variable | ${1518}
-| | ${rate}= | Set Variable | 787153pps
-| | 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 xconnect with VXLANoIPv4 in 3-node circular topology
-| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | ${traffic_profile}
-
-| tc09-9000B-4t4c-ethip4vxlan-l2xcbase-ndrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 4 threads, 4 phy cores, \
-| | ... | 2 receive queue per NIC port. [Ver] Verify ref-NDR for 9000 Byte
-| | ... | frames using single trial throughput test at 2x 137816pps.
-| | [Tags] | 9000B | 4T4C | MTHREAD
-| | ${framesize}= | Set Variable | ${9000}
-| | ${rate}= | Set Variable | 137816pps
-| | 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 xconnect with VXLANoIPv4 in 3-node circular topology
-| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | ${traffic_profile}
diff --git a/tests/vpp/perf/ip4_tunnels/10ge2p1x520-ethip4vxlan-l2xcbase-pdrchk.robot b/tests/vpp/perf/ip4_tunnels/10ge2p1x520-ethip4vxlan-l2xcbase-pdrchk.robot
deleted file mode 100644
index cfd119b300..0000000000
--- a/tests/vpp/perf/ip4_tunnels/10ge2p1x520-ethip4vxlan-l2xcbase-pdrchk.robot
+++ /dev/null
@@ -1,186 +0,0 @@
-# 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:
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-*** Settings ***
-| Resource | resources/libraries/robot/performance/performance_setup.robot
-| ...
-| Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | PDRCHK
-| ... | NIC_Intel-X520-DA2 | L2XCFWD | ENCAP | VXLAN | L2OVRLAY | IP4UNRLAY
-| ...
-| Suite Setup | Set up 3-node performance topology with DUT's NIC model
-| ... | L2 | Intel-X520-DA2
-| Suite Teardown | Tear down 3-node performance topology
-| ...
-| Test Setup | Set up performance test
-| Test Teardown | Tear down performance pdrchk test
-| ...
-| Documentation | *Reference PDR throughput L2XC with VXLANoIPv4 verify test\
-| ... | cases*
-| ...
-| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology
-| ... | with single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 cross-connect on TG-DUTn.
-| ... | Eth-IPv4-VXLAN-Eth-IPv4 is applied on link between DUT1 and DUT2.
-| ... | *[Cfg] DUT configuration:* DUT1 and DUT2 are configured with L2 cross-
-| ... | connect. VXLAN tunnels are configured between L2XCs on DUT1 and DUT2.
-| ... | DUT1 and DUT2 tested with 2p10GE NIC X520 Niantic by Intel.
-| ... | *[Ver] TG verification:* In short performance tests, TG verifies
-| ... | DUTs' throughput at ref-PDR (reference Non Drop Rate) with zero packet
-| ... | loss tolerance. Ref-PDR value is periodically updated acording to
-| ... | formula: ref-PDR = 0.9x PDR, where PDR is found in RFC2544 long
-| ... | performance tests for the same DUT configuration. Test packets are
-| ... | generated by TG on links to DUTs. TG traffic profile contains two L3
-| ... | flow-groups (flow-group per direction, 254 flows per flow-group) with
-| ... | all packets containing Ethernet header, IPv4 header with IP protocol=61
-| ... | and generated payload. MAC addresses are matching MAC addresses of the
-| ... | TG node interfaces.
-| ... | *[Ref] Applicable standard specifications:* RFC2544, RFC7348.
-
-*** Variables ***
-| ${vxlan_overhead} | ${50}
-# Traffic profile:
-| ${traffic_profile} | trex-sl-3n-ethip4-ip4src254
-
-*** Keywords ***
-| Check PDR for L2 xconnect with VXLAN over IPv4
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2XC config with ${wt} thread, ${wt} phy core,\
-| | ... | ${rxq} receive queue per NIC port.
-| | ... | [Ver] Verify ref-NDR for ${framesize} Byte frames using single trial\
-| | ... | throughput test at 2x ${rate}.
-| | ...
-| | [Arguments] | ${framesize} | ${rate} | ${wt} | ${rxq}
-| | ...
-| | # Test Variables required for test and test teardown
-| | Set Test Variable | ${framesize}
-| | Set Test Variable | ${rate}
-| | ${get_framesize}= | Get Frame Size | ${framesize}
-| | ...
-| | Given Add '${wt}' worker threads and '${rxq}' rxqueues in 3-node single-link circular topology
-| | And Add PCI devices to DUTs in 3-node single link topology
-| | And Run Keyword If | ${get_framesize} < ${1522}
-| | ... | Add no multi seg to all DUTs
-| | And Apply startup configuration on all VPP DUTs
-| | And Initialize L2 xconnect with VXLANoIPv4 in 3-node circular topology
-| | Then Traffic should pass with partial loss | ${perf_trial_duration}
-| | ... | ${rate} | ${framesize} | ${traffic_profile}
-| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
-
-*** Test Cases ***
-| tc01-64B-1t1c-ethip4vxlan-l2xcbase-pdrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2XC 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 ${rate}.
-| | ...
-| | [Tags] | 64B | 1T1C | STHREAD
-| | ...
-| | [Template] | Check PDR for L2 xconnect with VXLAN over IPv4
-| | framesize=${64 + ${vxlan_overhead}} | rate=2.0mpps | wt=1 | rxq=1
-
-| tc02-1518B-1t1c-ethip4vxlan-l2xcbase-pdrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2XC 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 ${rate}.
-| | ...
-| | [Tags] | 1518B | 1T1C | STHREAD
-| | ...
-| | [Template] | Check PDR for L2 xconnect with VXLAN over IPv4
-| | framesize=${1518 + ${vxlan_overhead}} | rate=500000pps | wt=1 | rxq=1
-
-| tc03-9000B-1t1c-ethip4vxlan-l2xcbase-pdrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2XC 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 ${rate}.
-| | ...
-| | [Tags] | 9000B | 1T1C | STHREAD
-| | ...
-| | [Template] | Check PDR for L2 xconnect with VXLAN over IPv4
-| | framesize=${9000 + ${vxlan_overhead}} | rate=100000pps | wt=1 | rxq=1
-
-| tc04-64B-2t2c-ethip4vxlan-l2xcbase-pdrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching 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 ${rate}.
-| | ...
-| | [Tags] | 64B | 2T2C | MTHREAD
-| | ...
-| | [Template] | Check PDR for L2 xconnect with VXLAN over IPv4
-| | framesize=${64 + ${vxlan_overhead}} | rate=5.0mpps | wt=2 | rxq=1
-
-| tc05-1518B-2t2c-ethip4vxlan-l2xcbase-pdrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching 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 ${rate}.
-| | ...
-| | [Tags] | 1518B | 2T2C | MTHREAD
-| | ...
-| | [Template] | Check PDR for L2 xconnect with VXLAN over IPv4
-| | framesize=${1518 + ${vxlan_overhead}} | rate=500000pps | wt=2 | rxq=1
-
-| tc06-9000B-2t2c-ethip4vxlan-l2xcbase-pdrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching 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 ${rate}.
-| | ...
-| | [Tags] | 9000B | 2T2C | MTHREAD
-| | ...
-| | [Template] | Check PDR for L2 xconnect with VXLAN over IPv4
-| | framesize=${9000 + ${vxlan_overhead}} | rate=100000pps | wt=2 | rxq=1
-
-| tc07-64B-4t4c-ethip4vxlan-l2xcbase-pdrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 4 threads, 4 phy cores,\
-| | ... | 2 receive queue per NIC port.
-| | ... | [Ver] Verify ref-NDR for 64 Byte frames using single trial\
-| | ... | throughput test at 2x ${rate}.
-| | ...
-| | [Tags] | 64B | 4T4C | MTHREAD
-| | ...
-| | [Template] | Check PDR for L2 xconnect with VXLAN over IPv4
-| | framesize=${64 + ${vxlan_overhead}} | rate=6.5mpps | wt=4 | rxq=2
-
-| tc08-1518B-4t4c-ethip4vxlan-l2xcbase-pdrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 4 threads, 4 phy cores,\
-| | ... | 2 receive queue per NIC port.
-| | ... | [Ver] Verify ref-NDR for 1518 Byte frames using single trial\
-| | ... | throughput test at 2x ${rate}.
-| | ...
-| | [Tags] | 1518B | 4T4C | MTHREAD
-| | ...
-| | [Template] | Check PDR for L2 xconnect with VXLAN over IPv4
-| | framesize=${1518 + ${vxlan_overhead}} | rate=500000pps | wt=4 | rxq=2
-
-| tc09-9000B-4t4c-ethip4vxlan-l2xcbase-pdrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 4 threads, 4 phy cores,\
-| | ... | 2 receive queue per NIC port.
-| | ... | [Ver] Verify ref-NDR for 9000 Byte frames using single trial\
-| | ... | throughput test at 2x ${rate}.
-| | ...
-| | [Tags] | 9000B | 4T4C | MTHREAD
-| | ...
-| | [Template] | Check PDR for L2 xconnect with VXLAN over IPv4
-| | framesize=${9000 + ${vxlan_overhead}} | rate=100000pps | wt=4 | rxq=2
diff --git a/tests/vpp/perf/ip6/10ge2p1x520-ethip6-ip6base-copwhtlistbase-ndrchk.robot b/tests/vpp/perf/ip6/10ge2p1x520-ethip6-ip6base-copwhtlistbase-ndrchk.robot
deleted file mode 100644
index f13b2b8d1d..0000000000
--- a/tests/vpp/perf/ip6/10ge2p1x520-ethip6-ip6base-copwhtlistbase-ndrchk.robot
+++ /dev/null
@@ -1,274 +0,0 @@
-# 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:
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-*** Settings ***
-| Resource | resources/libraries/robot/performance/performance_setup.robot
-| Library | resources.libraries.python.Cop
-| ...
-| Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRCHK
-| ... | NIC_Intel-X520-DA2 | ETH | IP6FWD | FEATURE | COPWHLIST
-| ...
-| Suite Setup | Set up 3-node performance topology with DUT's NIC model
-| ... | L3 | Intel-X520-DA2
-| 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 IPv6 whitelist verify test cases*
-| ...
-| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology
-| ... | with single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv6 for IPv6 routing.
-| ... | *[Cfg] DUT configuration:* DUT1 and DUT2 are configured with IPv6
-| ... | routing, two static IPv6 /64 routes and IPv6 COP security whitelist
-| ... | ingress /24 filter entries applied on links TG - DUT1 and DUT2 - TG.
-| ... | DUT1 and DUT2 tested with 2p10GE NIC X520 Niantic by Intel.
-| ... | *[Ver] TG verification:* In short performance tests, TG verifies
-| ... | DUTs' throughput at ref-NDR (reference Non Drop Rate) with zero packet
-| ... | loss tolerance. Ref-NDR value is periodically updated acording to
-| ... | formula: ref-NDR = 0.9x NDR, where NDR is found in RFC2544 long
-| ... | performance tests for the same DUT configuration. Test packets are
-| ... | generated by TG on links to DUTs. TG traffic profile contains two L3
-| ... | flow-groups (flow-group per direction, 253 flows per flow-group) with
-| ... | all packets containing Ethernet header, IPv6 header and static
-| ... | payload. MAC addresses are matching MAC addresses of the TG node
-| ... | interfaces.
-| ... | *[Ref] Applicable standard specifications:* RFC2544.
-
-*** Variables ***
-# Traffic profile:
-| ${traffic_profile} | trex-sl-3n-ethip6-ip6src253
-
-*** Test Cases ***
-| tc01-78B-1t1c-ethip6-ip6base-copwhtlistbase-ndrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs IPv6 routing and whitelist filters config with \
-| | ... | 1 thread, 1 phy core, 1 receive queue per NIC port. [Ver] Verify
-| | ... | ref-NDR for 78 Byte frames using single trial throughput test
-| | ... | at 2x 3.1mpps.
-| | [Tags] | 78B | 1T1C | STHREAD
-| | ${framesize}= | Set Variable | ${78}
-| | ${rate}= | Set Variable | 3.1mpps
-| | 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
-| | When Initialize IPv6 forwarding in 3-node circular topology
-| | And Add Fib Table | ${dut1} | 1 | ipv6=${TRUE}
-| | And Vpp Route Add | ${dut1} | 2001:1:: | 64 | vrf=1 | local=${TRUE}
-| | And Add Fib Table | ${dut2} | 1 | ipv6=${TRUE}
-| | And Vpp Route Add | ${dut2} | 2001:2:: | 64 | vrf=1 | local=${TRUE}
-| | And COP Add whitelist Entry | ${dut1} | ${dut1_if1} | ip6 | 1
-| | And COP Add whitelist Entry | ${dut2} | ${dut2_if2} | ip6 | 1
-| | And COP interface enable or disable | ${dut1} | ${dut1_if1} | enable
-| | And COP interface enable or disable | ${dut2} | ${dut2_if2} | enable
-| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | ${traffic_profile}
-
-| tc02-1518B-1t1c-ethip6-ip6base-copwhtlistbase-ndrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs IPv6 routing and whitelist filters 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] | 1518B | 1T1C | STHREAD
-| | ${framesize}= | Set Variable | ${1518}
-| | ${rate}= | Set Variable | 812743pps
-| | 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
-| | When Initialize IPv6 forwarding in 3-node circular topology
-| | And Add Fib Table | ${dut1} | 1 | ipv6=${TRUE}
-| | And Vpp Route Add | ${dut1} | 2001:1:: | 64 | vrf=1 | local=${TRUE}
-| | And Add Fib Table | ${dut2} | 1 | ipv6=${TRUE}
-| | And Vpp Route Add | ${dut2} | 2001:2:: | 64 | vrf=1 | local=${TRUE}
-| | And COP Add whitelist Entry | ${dut1} | ${dut1_if1} | ip6 | 1
-| | And COP Add whitelist Entry | ${dut2} | ${dut2_if2} | ip6 | 1
-| | And COP interface enable or disable | ${dut1} | ${dut1_if1} | enable
-| | And COP interface enable or disable | ${dut2} | ${dut2_if2} | enable
-| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | ${traffic_profile}
-
-| tc03-9000B-1t1c-ethip6-ip6base-copwhtlistbase-ndrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs IPv6 routing and whitelist filters 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] | 9000B | 1T1C | STHREAD
-| | ${framesize}= | Set Variable | ${9000}
-| | ${rate}= | Set Variable | 138580pps
-| | 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
-| | When Initialize IPv6 forwarding in 3-node circular topology
-| | And Add Fib Table | ${dut1} | 1 | ipv6=${TRUE}
-| | And Vpp Route Add | ${dut1} | 2001:1:: | 64 | vrf=1 | local=${TRUE}
-| | And Add Fib Table | ${dut2} | 1 | ipv6=${TRUE}
-| | And Vpp Route Add | ${dut2} | 2001:2:: | 64 | vrf=1 | local=${TRUE}
-| | And COP Add whitelist Entry | ${dut1} | ${dut1_if1} | ip6 | 1
-| | And COP Add whitelist Entry | ${dut2} | ${dut2_if2} | ip6 | 1
-| | And COP interface enable or disable | ${dut1} | ${dut1_if1} | enable
-| | And COP interface enable or disable | ${dut2} | ${dut2_if2} | enable
-| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | ${traffic_profile}
-
-| tc04-78B-2t2c-ethip6-ip6base-copwhtlistbase-ndrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs IPv6 routing and whitelist filters config with \
-| | ... | 2 threads, 2 phy cores, 1 receive queue per NIC port. [Ver] Verify
-| | ... | ref-NDR for 78 Byte frames using single trial throughput test
-| | ... | at 2x 5.9mpps.
-| | [Tags] | 78B | 2T2C | MTHREAD
-| | ${framesize}= | Set Variable | ${78}
-| | ${rate}= | Set Variable | 5.9mpps
-| | 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
-| | When Initialize IPv6 forwarding in 3-node circular topology
-| | And Add Fib Table | ${dut1} | 1 | ipv6=${TRUE}
-| | And Vpp Route Add | ${dut1} | 2001:1:: | 64 | vrf=1 | local=${TRUE}
-| | And Add Fib Table | ${dut2} | 1 | ipv6=${TRUE}
-| | And Vpp Route Add | ${dut2} | 2001:2:: | 64 | vrf=1 | local=${TRUE}
-| | And COP Add whitelist Entry | ${dut1} | ${dut1_if1} | ip6 | 1
-| | And COP Add whitelist Entry | ${dut2} | ${dut2_if2} | ip6 | 1
-| | And COP interface enable or disable | ${dut1} | ${dut1_if1} | enable
-| | And COP interface enable or disable | ${dut2} | ${dut2_if2} | enable
-| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | ${traffic_profile}
-
-| tc05-1518B-2t2c-ethip6-ip6base-copwhtlistbase-ndrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs IPv6 routing and whitelist filters 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] | 1518B | 2T2C | MTHREAD
-| | ${framesize}= | Set Variable | ${1518}
-| | ${rate}= | Set Variable | 812743pps
-| | 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
-| | When Initialize IPv6 forwarding in 3-node circular topology
-| | And Add Fib Table | ${dut1} | 1 | ipv6=${TRUE}
-| | And Vpp Route Add | ${dut1} | 2001:1:: | 64 | vrf=1 | local=${TRUE}
-| | And Add Fib Table | ${dut2} | 1 | ipv6=${TRUE}
-| | And Vpp Route Add | ${dut2} | 2001:2:: | 64 | vrf=1 | local=${TRUE}
-| | And COP Add whitelist Entry | ${dut1} | ${dut1_if1} | ip6 | 1
-| | And COP Add whitelist Entry | ${dut2} | ${dut2_if2} | ip6 | 1
-| | And COP interface enable or disable | ${dut1} | ${dut1_if1} | enable
-| | And COP interface enable or disable | ${dut2} | ${dut2_if2} | enable
-| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | ${traffic_profile}
-
-| tc06-9000B-2t2c-ethip6-ip6base-copwhtlistbase-ndrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs IPv6 routing and whitelist filters 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] | 9000B | 2T2C | MTHREAD
-| | ${framesize}= | Set Variable | ${9000}
-| | ${rate}= | Set Variable | 138580pps
-| | 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
-| | When Initialize IPv6 forwarding in 3-node circular topology
-| | And Add Fib Table | ${dut1} | 1 | ipv6=${TRUE}
-| | And Vpp Route Add | ${dut1} | 2001:1:: | 64 | vrf=1 | local=${TRUE}
-| | And Add Fib Table | ${dut2} | 1 | ipv6=${TRUE}
-| | And Vpp Route Add | ${dut2} | 2001:2:: | 64 | vrf=1 | local=${TRUE}
-| | And COP Add whitelist Entry | ${dut1} | ${dut1_if1} | ip6 | 1
-| | And COP Add whitelist Entry | ${dut2} | ${dut2_if2} | ip6 | 1
-| | And COP interface enable or disable | ${dut1} | ${dut1_if1} | enable
-| | And COP interface enable or disable | ${dut2} | ${dut2_if2} | enable
-| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | ${traffic_profile}
-
-| tc07-78B-4t4c-ethip6-ip6base-copwhtlistbase-ndrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs IPv6 routing and whitelist filters config with \
-| | ... | 4 threads, 4 phy cores, 2 receive queue per NIC port. [Ver] Verify
-| | ... | ref-NDR for 78 Byte frames using single trial throughput test
-| | ... | at 2x 9.4mpps.
-| | [Tags] | 78B | 4T4C | MTHREAD
-| | ${framesize}= | Set Variable | ${78}
-| | ${rate}= | Set Variable | 9.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
-| | When Initialize IPv6 forwarding in 3-node circular topology
-| | And Add Fib Table | ${dut1} | 1 | ipv6=${TRUE}
-| | And Vpp Route Add | ${dut1} | 2001:1:: | 64 | vrf=1 | local=${TRUE}
-| | And Add Fib Table | ${dut2} | 1 | ipv6=${TRUE}
-| | And Vpp Route Add | ${dut2} | 2001:2:: | 64 | vrf=1 | local=${TRUE}
-| | And COP Add whitelist Entry | ${dut1} | ${dut1_if1} | ip6 | 1
-| | And COP Add whitelist Entry | ${dut2} | ${dut2_if2} | ip6 | 1
-| | And COP interface enable or disable | ${dut1} | ${dut1_if1} | enable
-| | And COP interface enable or disable | ${dut2} | ${dut2_if2} | enable
-| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | ${traffic_profile}
-
-| tc08-1518B-4t4c-ethip6-ip6base-copwhtlistbase-ndrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs IPv6 routing and whitelist filters config with \
-| | ... | 4 threads, 4 phy cores, 2 receive queue per NIC port. [Ver] Verify
-| | ... | ref-NDR for 1518 Byte frames using single trial throughput test
-| | ... | at 2x 812743pps.
-| | [Tags] | 1518B | 4T4C | MTHREAD
-| | ${framesize}= | Set Variable | ${1518}
-| | ${rate}= | Set Variable | 812743pps
-| | 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
-| | When Initialize IPv6 forwarding in 3-node circular topology
-| | And Add Fib Table | ${dut1} | 1 | ipv6=${TRUE}
-| | And Vpp Route Add | ${dut1} | 2001:1:: | 64 | vrf=1 | local=${TRUE}
-| | And Add Fib Table | ${dut2} | 1 | ipv6=${TRUE}
-| | And Vpp Route Add | ${dut2} | 2001:2:: | 64 | vrf=1 | local=${TRUE}
-| | And COP Add whitelist Entry | ${dut1} | ${dut1_if1} | ip6 | 1
-| | And COP Add whitelist Entry | ${dut2} | ${dut2_if2} | ip6 | 1
-| | And COP interface enable or disable | ${dut1} | ${dut1_if1} | enable
-| | And COP interface enable or disable | ${dut2} | ${dut2_if2} | enable
-| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | ${traffic_profile}
-
-| tc09-9000B-4t4c-ethip6-ip6base-copwhtlistbase-ndrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs IPv6 routing and whitelist filters config with \
-| | ... | 4 threads, 4 phy cores, 2 receive queue per NIC port. [Ver] Verify
-| | ... | ref-NDR for 9000 Byte frames using single trial throughput test
-| | ... | at 2x 138580pps.
-| | [Tags] | 9000B | 4T4C | MTHREAD
-| | ${framesize}= | Set Variable | ${9000}
-| | ${rate}= | Set Variable | 138580pps
-| | 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
-| | When Initialize IPv6 forwarding in 3-node circular topology
-| | And Add Fib Table | ${dut1} | 1 | ipv6=${TRUE}
-| | And Vpp Route Add | ${dut1} | 2001:1:: | 64 | vrf=1 | local=${TRUE}
-| | And Add Fib Table | ${dut2} | 1 | ipv6=${TRUE}
-| | And Vpp Route Add | ${dut2} | 2001:2:: | 64 | vrf=1 | local=${TRUE}
-| | And COP Add whitelist Entry | ${dut1} | ${dut1_if1} | ip6 | 1
-| | And COP Add whitelist Entry | ${dut2} | ${dut2_if2} | ip6 | 1
-| | And COP interface enable or disable | ${dut1} | ${dut1_if1} | enable
-| | And COP interface enable or disable | ${dut2} | ${dut2_if2} | enable
-| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | ${traffic_profile}
diff --git a/tests/vpp/perf/ip6/10ge2p1x520-ethip6-ip6base-iacldstbase-ndrchk.robot b/tests/vpp/perf/ip6/10ge2p1x520-ethip6-ip6base-iacldstbase-ndrchk.robot
deleted file mode 100644
index fdd9cf2c8f..0000000000
--- a/tests/vpp/perf/ip6/10ge2p1x520-ethip6-ip6base-iacldstbase-ndrchk.robot
+++ /dev/null
@@ -1,209 +0,0 @@
-# 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:
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-*** Settings ***
-| Resource | resources/libraries/robot/performance/performance_setup.robot
-| ...
-| Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRCHK
-| ... | NIC_Intel-X520-DA2 | ETH | IP6FWD | FEATURE | IACLDST
-| ...
-| Suite Setup | Set up 3-node performance topology with DUT's NIC model
-| ... | L3 | Intel-X520-DA2
-| 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 IPv6 whitelist verify test cases*
-| ...
-| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology
-| ... | with single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv6 for IPv6 routing.
-| ... | *[Cfg] DUT configuration:* DUT1 and DUT2 are configured with IPv6
-| ... | routing, two static IPv6 /64 routes and IPv6 iAcl security whitelist
-| ... | ingress /64 filter entries applied on links TG - DUT1 and DUT2 - TG.
-| ... | DUT1 and DUT2 tested with 2p10GE NIC X520 Niantic by Intel.
-| ... | *[Ver] TG verification:* In short performance tests, TG verifies
-| ... | DUTs' throughput at ref-NDR (reference Non Drop Rate) with zero packet
-| ... | loss tolerance. Ref-NDR value is periodically updated acording to
-| ... | formula: ref-NDR = 0.9x NDR, where NDR is found in RFC2544 long
-| ... | performance tests for the same DUT confiiguration. Test packets are
-| ... | generated by TG on links to DUTs. TG traffic profile contains two L3
-| ... | flow-groups (flow-group per direction, 253 flows per flow-group) with
-| ... | all packets containing Ethernet header, IPv6 header and generated
-| ... | payload.
-| ... | *[Ref] Applicable standard specifications:* RFC2544.
-
-*** Variables ***
-# Traffic profile:
-| ${traffic_profile} | trex-sl-3n-ethip6-ip6src253
-
-*** Test Cases ***
-| tc01-78B-1t1c-ethip6-ip6base-iacldstbase-ndrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs IPv4 routing and whitelist filters config with \
-| | ... | 1 thread, 1 phy core, 1 receive queue per NIC port. [Ver] Verify
-| | ... | ref-NDR for 78 Byte frames using single trial throughput test
-| | ... | at 2x 3.2mpps.
-| | [Tags] | 78B | 1T1C | STHREAD
-| | ${framesize}= | Set Variable | ${78}
-| | ${rate}= | Set Variable | 3.2mpps
-| | 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 IPv6 forwarding in 3-node circular topology
-| | And Initialize IPv6 iAcl whitelist in 3-node circular topology
-| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | ${traffic_profile}
-
-| tc02-1518B-1t1c-ethip6-ip6base-iacldstbase-ndrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs IPv6 routing and whitelist filters 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] | 1518B | 1T1C | STHREAD
-| | ${framesize}= | Set Variable | ${1518}
-| | ${rate}= | Set Variable | 812743pps
-| | 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 IPv6 forwarding in 3-node circular topology
-| | And Initialize IPv6 iAcl whitelist in 3-node circular topology
-| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | ${traffic_profile}
-
-| tc03-9000B-1t1c-ethip6-ip6base-iacldstbase-ndrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs IPv6 routing and whitelist filters 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] | 9000B | 1T1C | STHREAD
-| | ${framesize}= | Set Variable | ${9000}
-| | ${rate}= | Set Variable | 138580pps
-| | 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 IPv6 forwarding in 3-node circular topology
-| | And Initialize IPv6 iAcl whitelist in 3-node circular topology
-| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | ${traffic_profile}
-
-| tc04-78B-2t2c-ethip6-ip6base-iacldstbase-ndrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs IPv6 routing and whitelist filters config with \
-| | ... | 2 threads, 2 phy cores, 1 receive queue per NIC port. [Ver] Verify
-| | ... | ref-NDR for 78 Byte frames using single trial throughput test
-| | ... | at 2x 5.7mpps.
-| | [Tags] | 78B | 2T2C | MTHREAD
-| | ${framesize}= | Set Variable | ${78}
-| | ${rate}= | Set Variable | 5.7mpps
-| | 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 IPv6 forwarding in 3-node circular topology
-| | And Initialize IPv6 iAcl whitelist in 3-node circular topology
-| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | ${traffic_profile}
-
-| tc05-1518B-2t2c-ethip6-ip6base-iacldstbase-ndrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs IPv6 routing and whitelist filters 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] | 1518B | 2T2C | MTHREAD
-| | ${framesize}= | Set Variable | ${1518}
-| | ${rate}= | Set Variable | 812743pps
-| | 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 IPv6 forwarding in 3-node circular topology
-| | And Initialize IPv6 iAcl whitelist in 3-node circular topology
-| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | ${traffic_profile}
-
-| tc06-9000B-2t2c-ethip6-ip6base-iacldstbase-ndrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs IPv6 routing and whitelist filters 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] | 9000B | 2T2C | MTHREAD
-| | ${framesize}= | Set Variable | ${9000}
-| | ${rate}= | Set Variable | 138580pps
-| | 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 IPv6 forwarding in 3-node circular topology
-| | And Initialize IPv6 iAcl whitelist in 3-node circular topology
-| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | ${traffic_profile}
-
-| tc07-78B-4t4c-ethip6-ip6base-iacldstbase-ndrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs IPv6 routing and whitelist filters config with \
-| | ... | 4 thread, 4 phy core, 2 receive queue per NIC port. [Ver] Verify
-| | ... | ref-NDR for 78 Byte frames using single trial throughput test
-| | ... | at 2x 9.2mpps.
-| | [Tags] | 78B | 4T4C | MTHREAD
-| | ${framesize}= | Set Variable | ${78}
-| | ${rate}= | Set Variable | 9.2mpps
-| | 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 IPv6 forwarding in 3-node circular topology
-| | And Initialize IPv6 iAcl whitelist in 3-node circular topology
-| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | ${traffic_profile}
-
-| tc08-1518B-4t4c-ethip6-ip6base-iacldstbase-ndrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs IPv6 routing and whitelist filters config with \
-| | ... | 4 thread, 4 phy core, 2 receive queue per NIC port. [Ver] Verify
-| | ... | ref-NDR for 1518 Byte frames using single trial throughput test
-| | ... | at 2x 812743pps.
-| | [Tags] | 1518B | 4T4C | MTHREAD
-| | ${framesize}= | Set Variable | ${1518}
-| | ${rate}= | Set Variable | 812743pps
-| | 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 IPv6 forwarding in 3-node circular topology
-| | And Initialize IPv6 iAcl whitelist in 3-node circular topology
-| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | ${traffic_profile}
-
-| tc09-9000B-4t4c-ethip6-ip6base-iacldstbase-ndrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs IPv6 routing and whitelist filters config with \
-| | ... | 4 thread, 4 phy core, 2 receive queue per NIC port. [Ver] Verify
-| | ... | ref-NDR for 9000 Byte frames using single trial throughput test
-| | ... | at 2x 138580pps.
-| | [Tags] | 9000B | 4T4C | MTHREAD
-| | ${framesize}= | Set Variable | ${9000}
-| | ${rate}= | Set Variable | 138580pps
-| | 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 IPv6 forwarding in 3-node circular topology
-| | And Initialize IPv6 iAcl whitelist in 3-node circular topology
-| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | ${traffic_profile}
diff --git a/tests/vpp/perf/ip6/10ge2p1x520-ethip6-ip6base-ndrchk.robot b/tests/vpp/perf/ip6/10ge2p1x520-ethip6-ip6base-ndrchk.robot
deleted file mode 100644
index 8011baf632..0000000000
--- a/tests/vpp/perf/ip6/10ge2p1x520-ethip6-ip6base-ndrchk.robot
+++ /dev/null
@@ -1,191 +0,0 @@
-# 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:
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-*** Settings ***
-| Resource | resources/libraries/robot/performance/performance_setup.robot
-| ...
-| Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRCHK
-| ... | NIC_Intel-X520-DA2 | ETH | IP6FWD | BASE | IP6BASE
-| ...
-| Suite Setup | Set up 3-node performance topology with DUT's NIC model
-| ... | L3 | Intel-X520-DA2
-| 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 IPv6 routing verify test cases*
-| ...
-| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology
-| ... | with single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv6 for IPv6 routing.
-| ... | *[Cfg] DUT configuration:* DUT1 and DUT2 are configured with IPv6
-| ... | routing and two static IPv6 /64 route entries. DUT1 and DUT2 tested with
-| ... | 2p10GE NIC X520 Niantic by Intel.
-| ... | *[Ver] TG verification:* In short performance tests, TG verifies
-| ... | DUTs' throughput at ref-NDR (reference Non Drop Rate) with zero packet
-| ... | loss tolerance. Ref-NDR value is periodically updated acording to
-| ... | formula: ref-NDR = 0.9x NDR, where NDR is found in RFC2544 long
-| ... | performance tests for the same DUT configuration. Test packets are
-| ... | generated by TG on links to DUTs. TG traffic profile contains two L3
-| ... | flow-groups (flow-group per direction, 253 flows per flow-group) with
-| ... | all packets containing Ethernet header, IPv6 header and static
-| ... | payload. MAC addresses are matching MAC addresses of the TG node
-| ... | interfaces.
-| ... | *[Ref] Applicable standard specifications:* RFC2544.
-
-*** Variables ***
-# Traffic profile:
-| ${traffic_profile} | trex-sl-3n-ethip6-ip6src253
-
-*** Test Cases ***
-| tc01-78B-1t1c-ethip6-ip6base-ndrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs IPv6 routing config with 1 thread, 1 phy core, \
-| | ... | 1 receive queue per NIC port. [Ver] Verify ref-NDR for 78 Byte
-| | ... | frames using single trial throughput test at 2x 3.9mpps.
-| | [Tags] | 78B | 1T1C | STHREAD
-| | ${framesize}= | Set Variable | ${78}
-| | ${rate}= | Set Variable | 3.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 IPv6 forwarding in 3-node circular topology
-| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | ${traffic_profile}
-
-| tc02-1518B-1t1c-ethip6-ip6base-ndrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs IPv6 routing 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] | 1518B | 1T1C | STHREAD
-| | ${framesize}= | Set Variable | ${1518}
-| | ${rate}= | Set Variable | 812743pps
-| | 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 IPv6 forwarding in 3-node circular topology
-| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | ${traffic_profile}
-
-| tc03-9000B-1t1c-ethip6-ip6base-ndrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs IPv6 routing 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] | 9000B | 1T1C | STHREAD
-| | ${framesize}= | Set Variable | ${9000}
-| | ${rate}= | Set Variable | 138580pps
-| | 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 IPv6 forwarding in 3-node circular topology
-| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | ${traffic_profile}
-
-| tc04-78B-2t2c-ethip6-ip6base-ndrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs IPv6 routing config with 2 threads, 2 phy cores, \
-| | ... | 1 receive queue per NIC port. [Ver] Verify ref-NDR for 78 Byte
-| | ... | frames using single trial throughput test at 2x 8.1mpps.
-| | [Tags] | 78B | 2T2C | MTHREAD
-| | ${framesize}= | Set Variable | ${78}
-| | ${rate}= | Set Variable | 8.1mpps
-| | 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 IPv6 forwarding in 3-node circular topology
-| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | ${traffic_profile}
-
-| tc05-1518B-2t2c-ethip6-ip6base-ndrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs IPv6 routing 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] | 1518B | 2T2C | MTHREAD
-| | ${framesize}= | Set Variable | ${1518}
-| | ${rate}= | Set Variable | 812743pps
-| | 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 IPv6 forwarding in 3-node circular topology
-| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | ${traffic_profile}
-
-| tc06-9000B-2t2c-ethip6-ip6base-ndrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs IPv6 routing 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] | 9000B | 2T2C | MTHREAD
-| | ${framesize}= | Set Variable | ${9000}
-| | ${rate}= | Set Variable | 138580pps
-| | 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 IPv6 forwarding in 3-node circular topology
-| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | ${traffic_profile}
-
-| tc07-78B-4t4c-ethip6-ip6base-ndrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs IPv6 routing config with 4 threads, 4 phy cores, \
-| | ... | 2 receive queues per NIC port. [Ver] Verify ref-NDR for 78 Byte
-| | ... | frames using single trial throughput test at 2x 9.4mpps.
-| | [Tags] | 78B | 4T4C | MTHREAD
-| | ${framesize}= | Set Variable | ${78}
-| | ${rate}= | Set Variable | 9.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 IPv6 forwarding in 3-node circular topology
-| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | ${traffic_profile}
-
-| tc08-1518B-4t4c-ethip6-ip6base-ndrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs IPv6 routing 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] | 1518B | 4T4C | MTHREAD
-| | ${framesize}= | Set Variable | ${1518}
-| | ${rate}= | Set Variable | 812743pps
-| | 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 IPv6 forwarding in 3-node circular topology
-| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | ${traffic_profile}
-
-| tc09-9000B-4t4c-ethip6-ip6base-ndrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs IPv6 routing 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] | 9000B | 4T4C | MTHREAD
-| | ${framesize}= | Set Variable | ${9000}
-| | ${rate}= | Set Variable | 138580pps
-| | 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 IPv6 forwarding in 3-node circular topology
-| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | ${traffic_profile}
diff --git a/tests/vpp/perf/ip6/10ge2p1x520-ethip6-ip6base-pdrchk.robot b/tests/vpp/perf/ip6/10ge2p1x520-ethip6-ip6base-pdrchk.robot
deleted file mode 100644
index 5ca64f5790..0000000000
--- a/tests/vpp/perf/ip6/10ge2p1x520-ethip6-ip6base-pdrchk.robot
+++ /dev/null
@@ -1,183 +0,0 @@
-# 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:
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-*** Settings ***
-| Resource | resources/libraries/robot/performance/performance_setup.robot
-| ...
-| Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | PDRCHK
-| ... | NIC_Intel-X520-DA2 | ETH | IP6FWD | BASE | IP6BASE
-| ...
-| Suite Setup | Set up 3-node performance topology with DUT's NIC model
-| ... | L3 | Intel-X520-DA2
-| Suite Teardown | Tear down 3-node performance topology
-| ...
-| Test Setup | Set up performance test
-| Test Teardown | Tear down performance pdrchk test
-| ...
-| Documentation | *Reference PDR throughput IPv6 routing verify test cases*
-| ...
-| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology
-| ... | with single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv6 for IPv6 routing.
-| ... | *[Cfg] DUT configuration:* DUT1 and DUT2 are configured with IPv6
-| ... | routing and two static IPv6 /64 route entries. DUT1 and DUT2 tested with
-| ... | 2p10GE NIC X520 Niantic by Intel.
-| ... | *[Ver] TG verification:* In short performance tests, TG verifies
-| ... | DUTs' throughput at ref-PDR (reference Non Drop Rate) with zero packet
-| ... | loss tolerance. Ref-PDR value is periodically updated acording to
-| ... | formula: ref-PDR = 0.9x PDR, where PDR is found in RFC2544 long
-| ... | performance tests for the same DUT configuration. Test packets are
-| ... | generated by TG on links to DUTs. TG traffic profile contains two L3
-| ... | flow-groups (flow-group per direction, 253 flows per flow-group) with
-| ... | all packets containing Ethernet header, IPv6 header and static
-| ... | payload. MAC addresses are matching MAC addresses of the TG node
-| ... | interfaces.
-| ... | *[Ref] Applicable standard specifications:* RFC2544.
-
-*** Variables ***
-# Traffic profile:
-| ${traffic_profile} | trex-sl-3n-ethip6-ip6src253
-
-*** Keywords ***
-| Check PDR for IPv6 routing
-| | [Documentation]
-| | ... | [Cfg] DUT runs IPv6 routing config with ${wt} thread, ${wt} phy core,\
-| | ... | ${rxq} receive queue per NIC port.
-| | ... | [Ver] Verify ref-NDR for ${framesize} Byte frames using single trial\
-| | ... | throughput test at 2x ${rate}.
-| | ...
-| | [Arguments] | ${framesize} | ${rate} | ${wt} | ${rxq}
-| | ...
-| | # Test Variables required for test and test teardown
-| | Set Test Variable | ${framesize}
-| | Set Test Variable | ${rate}
-| | ${get_framesize}= | Get Frame Size | ${framesize}
-| | ...
-| | Given Add '${wt}' worker threads and '${rxq}' rxqueues in 3-node single-link circular topology
-| | And Add PCI devices to DUTs in 3-node single link topology
-| | And Run Keyword If | ${get_framesize} < ${1522}
-| | ... | Add no multi seg to all DUTs
-| | And Apply startup configuration on all VPP DUTs
-| | And Initialize IPv6 forwarding in 3-node circular topology
-| | Then Traffic should pass with partial loss | ${perf_trial_duration}
-| | ... | ${rate} | ${framesize} | ${traffic_profile}
-| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
-
-*** Test Cases ***
-| tc01-78B-1t1c-ethip6-ip6base-pdrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs IPv6 routing config with 1 thread, 1 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Verify ref-NDR for 78 Byte frames using single trial\
-| | ... | throughput test at 2x ${rate}.
-| | ...
-| | [Tags] | 78B | 1T1C | STHREAD
-| | ...
-| | [Template] | Check PDR for IPv6 routing
-| | framesize=${78} | rate=3.9mpps | wt=1 | rxq=1
-
-| tc02-1518B-1t1c-ethip6-ip6base-pdrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs IPv6 routing 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 ${rate}.
-| | ...
-| | [Tags] | 1518B | 1T1C | STHREAD
-| | ...
-| | [Template] | Check PDR for IPv6 routing
-| | framesize=${1518} | rate=400000pps | wt=1 | rxq=1
-
-| tc03-9000B-1t1c-ethip6-ip6base-pdrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs IPv6 routing 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 ${rate}.
-| | ...
-| | [Tags] | 9000B | 1T1C | STHREAD
-| | ...
-| | [Template] | Check PDR for IPv6 routing
-| | framesize=${9000} | rate=60000pps | wt=1 | rxq=1
-
-| tc04-78B-2t2c-ethip6-ip6base-pdrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs IPv6 routing config with 2 threads, 2 phy cores,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Verify ref-NDR for 78 Byte frames using single trial\
-| | ... | throughput test at 2x ${rate}.
-| | ...
-| | [Tags] | 78B | 2T2C | MTHREAD
-| | ...
-| | [Template] | Check PDR for IPv6 routing
-| | framesize=${78} | rate=6.0mpps | wt=2 | rxq=1
-
-| tc05-1518B-2t2c-ethip6-ip6base-pdrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs IPv6 routing 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 ${rate}.
-| | ...
-| | [Tags] | 1518B | 2T2C | MTHREAD
-| | ...
-| | [Template] | Check PDR for IPv6 routing
-| | framesize=${1518} | rate=400000pps | wt=2 | rxq=1
-
-| tc06-9000B-2t2c-ethip6-ip6base-pdrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs IPv6 routing 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 ${rate}.
-| | ...
-| | [Tags] | 9000B | 2T2C | MTHREAD
-| | ...
-| | [Template] | Check PDR for IPv6 routing
-| | framesize=${9000} | rate=60000pps | wt=2 | rxq=1
-
-| tc07-78B-4t4c-ethip6-ip6base-pdrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs IPv6 routing config with 4 threads, 4 phy cores,\
-| | ... | 2 receive queues per NIC port.
-| | ... | [Ver] Verify ref-NDR for 78 Byte frames using single trial\
-| | ... | throughput test at 2x ${rate}.
-| | ...
-| | [Tags] | 78B | 4T4C | MTHREAD
-| | ...
-| | [Template] | Check PDR for IPv6 routing
-| | framesize=${78} | rate=6.1mpps | wt=4 | rxq=2
-
-| tc08-1518B-4t4c-ethip6-ip6base-pdrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs IPv6 routing 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 ${rate}.
-| | ...
-| | [Tags] | 1518B | 4T4C | MTHREAD
-| | ...
-| | [Template] | Check PDR for IPv6 routing
-| | framesize=${1518} | rate=400000pps | wt=4 | rxq=2
-
-| tc09-9000B-4t4c-ethip6-ip6base-pdrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs IPv6 routing 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 ${rate}.
-| | ...
-| | [Tags] | 9000B | 4T4C | MTHREAD
-| | ...
-| | [Template] | Check PDR for IPv6 routing
-| | framesize=${9000} | rate=60000pps | wt=4 | rxq=2
diff --git a/tests/vpp/perf/ip6/10ge2p1x520-ethip6-ip6scale200k-ndrchk.robot b/tests/vpp/perf/ip6/10ge2p1x520-ethip6-ip6scale200k-ndrchk.robot
deleted file mode 100644
index d4ab80ea5e..0000000000
--- a/tests/vpp/perf/ip6/10ge2p1x520-ethip6-ip6scale200k-ndrchk.robot
+++ /dev/null
@@ -1,201 +0,0 @@
-# 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:
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-*** Settings ***
-| Resource | resources/libraries/robot/performance/performance_setup.robot
-| ...
-| Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRCHK
-| ... | NIC_Intel-X520-DA2 | ETH | IP6FWD | SCALE | FIB_200K
-| ...
-| Suite Setup | Set up 3-node performance topology with DUT's NIC model
-| ... | L3 | Intel-X520-DA2
-| 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 IPv6 routing verify test cases*
-| ...
-| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology
-| ... | with single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv6 for IPv6 routing.
-| ... | *[Cfg] DUT configuration:* DUT1 and DUT2 are configured with IPv6
-| ... | routing and 2x100k static IPv6 /64 route entries. DUT1 and DUT2 tested
-| ... | with 2p10GE NIC X520 Niantic by Intel.
-| ... | *[Ver] TG verification:* In short performance tests, TG verifies
-| ... | DUTs' throughput at ref-NDR (reference Non Drop Rate) with zero packet
-| ... | loss tolerance. Ref-NDR value is periodically updated acording to
-| ... | formula: ref-NDR = 0.9x NDR, where NDR is found in RFC2544 long
-| ... | performance tests for the same DUT confiiguration. Test packets are
-| ... | generated by TG on links to DUTs. TG traffic profile contains two L3
-| ... | flow-groups (flow-group per direction, 100k flows per flow-group) with
-| ... | all packets containing Ethernet header, IPv6 header and static
-| ... | payload. Incrementing of IP.dst (IPv6 destination address) field is
-| ... | applied to both streams.
-| ... | *[Ref] Applicable standard specifications:* RFC2544.
-
-*** Variables ***
-| ${rts_per_flow}= | ${100000}
-
-# Traffic profile:
-| ${traffic_profile} | trex-sl-3n-ethip6-ip6dst${rts_per_flow}
-*** Test Cases ***
-| tc01-78B-1t1c-ethip6-ip6scale200k-ndrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs IPv6 routing config with 1 thread, 1 phy core, \
-| | ... | 1 receive queue per NIC port. [Ver] Verify ref-NDR for 78 Byte
-| | ... | frames using single trial throughput test at 2x 2.3mpps.
-| | [Tags] | 78B | 1T1C | STHREAD
-| | ${framesize}= | Set Variable | ${78}
-| | ${rate}= | Set Variable | 2.3mpps
-| | 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 IPv6 forwarding with scaling in 3-node circular topology
-| | ... | ${rts_per_flow}
-| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | ${traffic_profile}
-
-| tc02-1518B-1t1c-ethip6-ip6scale200k-ndrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs IPv6 routing 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] | 1518B | 1T1C | STHREAD
-| | ${framesize}= | Set Variable | ${1518}
-| | ${rate}= | Set Variable | 812743pps
-| | 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 IPv6 forwarding with scaling in 3-node circular topology
-| | ... | ${rts_per_flow}
-| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | ${traffic_profile}
-
-| tc03-9000B-1t1c-ethip6-ip6scale200k-ndrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs IPv6 routing 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] | 9000B | 1T1C | STHREAD
-| | ${framesize}= | Set Variable | ${9000}
-| | ${rate}= | Set Variable | 138580pps
-| | 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 IPv6 forwarding with scaling in 3-node circular topology
-| | ... | ${rts_per_flow}
-| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | ${traffic_profile}
-
-| tc04-78B-2t2c-ethip6-ip6scale200k-ndrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs IPv6 routing config with 2 threads, 2 phy cores, \
-| | ... | 1 receive queue per NIC port. [Ver] Verify ref-NDR for 78 Byte
-| | ... | frames using single trial throughput test at 2x 4.4mpps.
-| | [Tags] | 78B | 2T2C | MTHREAD
-| | ${framesize}= | Set Variable | ${78}
-| | ${rate}= | Set Variable | 4.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 IPv6 forwarding with scaling in 3-node circular topology
-| | ... | ${rts_per_flow}
-| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | ${traffic_profile}
-
-| tc05-1518B-2t2c-ethip6-ip6scale200k-ndrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs IPv6 routing 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] | 1518B | 2T2C | MTHREAD
-| | ${framesize}= | Set Variable | ${1518}
-| | ${rate}= | Set Variable | 812743pps
-| | 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 IPv6 forwarding with scaling in 3-node circular topology
-| | ... | ${rts_per_flow}
-| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | ${traffic_profile}
-
-| tc06-9000B-2t2c-ethip6-ip6scale200k-ndrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs IPv6 routing 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] | 9000B | 2T2C | MTHREAD
-| | ${framesize}= | Set Variable | ${9000}
-| | ${rate}= | Set Variable | 138580pps
-| | 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 IPv6 forwarding with scaling in 3-node circular topology
-| | ... | ${rts_per_flow}
-| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | ${traffic_profile}
-
-| tc07-78B-4t4c-ethip6-ip6scale200k-ndrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs IPv6 routing config with 4 threads, 4 phy cores, \
-| | ... | 2 receive queue per NIC port. [Ver] Verify ref-NDR for 78 Byte
-| | ... | frames using single trial throughput test at 2x 5.7mpps.
-| | [Tags] | 78B | 4T4C | MTHREAD
-| | ${framesize}= | Set Variable | ${78}
-| | ${rate}= | Set Variable | 5.7mpps
-| | 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 IPv6 forwarding with scaling in 3-node circular topology
-| | ... | ${rts_per_flow}
-| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | ${traffic_profile}
-
-| tc08-1518B-4t4c-ethip6-ip6scale200k-ndrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs IPv6 routing config with 4 threads, 4 phy cores, \
-| | ... | 2 receive queue per NIC port. [Ver] Verify ref-NDR for 1518 Byte
-| | ... | frames using single trial throughput test at 2x 812743pps.
-| | [Tags] | 1518B | 4T4C | MTHREAD
-| | ${framesize}= | Set Variable | ${1518}
-| | ${rate}= | Set Variable | 812743pps
-| | 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 IPv6 forwarding with scaling in 3-node circular topology
-| | ... | ${rts_per_flow}
-| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | ${traffic_profile}
-
-| tc09-9000B-4t4c-ethip6-ip6scale200k-ndrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs IPv6 routing config with 4 threads, 4 phy cores, \
-| | ... | 2 receive queue per NIC port. [Ver] Verify ref-NDR for 9000 Byte
-| | ... | frames using single trial throughput test at 2x 138580pps.
-| | [Tags] | 9000B | 4T4C | MTHREAD
-| | ${framesize}= | Set Variable | ${9000}
-| | ${rate}= | Set Variable | 138580pps
-| | 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 IPv6 forwarding with scaling in 3-node circular topology
-| | ... | ${rts_per_flow}
-| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | ${traffic_profile}
diff --git a/tests/vpp/perf/ip6/10ge2p1x520-ethip6-ip6scale20k-ndrchk.robot b/tests/vpp/perf/ip6/10ge2p1x520-ethip6-ip6scale20k-ndrchk.robot
deleted file mode 100644
index ebf642f9b5..0000000000
--- a/tests/vpp/perf/ip6/10ge2p1x520-ethip6-ip6scale20k-ndrchk.robot
+++ /dev/null
@@ -1,201 +0,0 @@
-# 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:
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-*** Settings ***
-| Resource | resources/libraries/robot/performance/performance_setup.robot
-| ...
-| Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRCHK
-| ... | NIC_Intel-X520-DA2 | ETH | IP6FWD | SCALE | FIB_20K
-| ...
-| Suite Setup | Set up 3-node performance topology with DUT's NIC model
-| ... | L3 | Intel-X520-DA2
-| 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 IPv6 routing verify test cases*
-| ...
-| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology
-| ... | with single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv6 for IPv6 routing.
-| ... | *[Cfg] DUT configuration:* DUT1 and DUT2 are configured with IPv6
-| ... | routing and 2x10k static IPv6 /64 route entries. DUT1 and DUT2 tested
-| ... | with 2p10GE NIC X520 Niantic by Intel.
-| ... | *[Ver] TG verification:* In short performance tests, TG verifies
-| ... | DUTs' throughput at ref-NDR (reference Non Drop Rate) with zero packet
-| ... | loss tolerance. Ref-NDR value is periodically updated acording to
-| ... | formula: ref-NDR = 0.9x NDR, where NDR is found in RFC2544 long
-| ... | performance tests for the same DUT confiiguration. Test packets are
-| ... | generated by TG on links to DUTs. TG traffic profile contains two L3
-| ... | flow-groups (flow-group per direction, 10k flows per flow-group) with
-| ... | all packets containing Ethernet header, IPv6 header and static
-| ... | payload. Incrementing of IP.dst (IPv6 destination address) field is
-| ... | applied to both streams.
-| ... | *[Ref] Applicable standard specifications:* RFC2544.
-
-*** Variables ***
-| ${rts_per_flow}= | ${10000}
-# Traffic profile:
-| ${traffic_profile} | trex-sl-3n-ethip6-ip6dst${rts_per_flow}
-
-*** Test Cases ***
-| tc01-78B-1t1c-ethip6-ip6scale20k-ndrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs IPv6 routing config with 1 thread, 1 phy core, \
-| | ... | 1 receive queue per NIC port. [Ver] Verify ref-NDR for 78 Byte
-| | ... | frames using single trial throughput test at 2x 2.9mpps.
-| | [Tags] | 78B | 1T1C | STHREAD
-| | ${framesize}= | Set Variable | ${78}
-| | ${rate}= | Set Variable | 2.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 IPv6 forwarding with scaling in 3-node circular topology
-| | ... | ${rts_per_flow}
-| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | ${traffic_profile}
-
-| tc02-1518B-1t1c-ethip6-ip6scale20k-ndrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs IPv6 routing 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] | 1518B | 1T1C | STHREAD
-| | ${framesize}= | Set Variable | ${1518}
-| | ${rate}= | Set Variable | 812743pps
-| | 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 IPv6 forwarding with scaling in 3-node circular topology
-| | ... | ${rts_per_flow}
-| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | ${traffic_profile}
-
-| tc03-9000B-1t1c-ethip6-ip6scale20k-ndrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs IPv6 routing 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] | 9000B | 1T1C | STHREAD
-| | ${framesize}= | Set Variable | ${9000}
-| | ${rate}= | Set Variable | 138580pps
-| | 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 IPv6 forwarding with scaling in 3-node circular topology
-| | ... | ${rts_per_flow}
-| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | ${traffic_profile}
-
-| tc04-78B-2t2c-ethip6-ip6scale20k-ndrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs IPv6 routing config with 2 threads, 2 phy cores, \
-| | ... | 1 receive queue per NIC port. [Ver] Verify ref-NDR for 78 Byte
-| | ... | frames using single trial throughput test at 2x 7.0mpps.
-| | [Tags] | 78B | 2T2C | MTHREAD
-| | ${framesize}= | Set Variable | ${78}
-| | ${rate}= | Set Variable | 7.0mpps
-| | 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 IPv6 forwarding with scaling in 3-node circular topology
-| | ... | ${rts_per_flow}
-| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | ${traffic_profile}
-
-| tc05-1518B-2t2c-ethip6-ip6scale20k-ndrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs IPv6 routing 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] | 1518B | 2T2C | MTHREAD
-| | ${framesize}= | Set Variable | ${1518}
-| | ${rate}= | Set Variable | 812743pps
-| | 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 IPv6 forwarding with scaling in 3-node circular topology
-| | ... | ${rts_per_flow}
-| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | ${traffic_profile}
-
-| tc06-9000B-2t2c-ethip6-ip6scale20k-ndrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs IPv6 routing 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] | 9000B | 2T2C | MTHREAD
-| | ${framesize}= | Set Variable | ${9000}
-| | ${rate}= | Set Variable | 138580pps
-| | 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 IPv6 forwarding with scaling in 3-node circular topology
-| | ... | ${rts_per_flow}
-| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | ${traffic_profile}
-
-| tc07-78B-4t4c-ethip6-ip6scale20k-ndrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs IPv6 routing config with 4 threads, 4 phy cores, \
-| | ... | 2 receive queue per NIC port. [Ver] Verify ref-NDR for 78 Byte
-| | ... | frames using single trial throughput test at 2x 9.6mpps.
-| | [Tags] | 78B | 4T4C | MTHREAD
-| | ${framesize}= | Set Variable | ${78}
-| | ${rate}= | Set Variable | 10.0mpps
-| | 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 IPv6 forwarding with scaling in 3-node circular topology
-| | ... | ${rts_per_flow}
-| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | ${traffic_profile}
-
-| tc08-1518B-4t4c-ethip6-ip6scale20k-ndrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs IPv6 routing config with 4 threads, 4 phy cores, \
-| | ... | 2 receive queue per NIC port. [Ver] Verify ref-NDR for 1518 Byte
-| | ... | frames using single trial throughput test at 2x 812743pps.
-| | [Tags] | 1518B | 4T4C | MTHREAD
-| | ${framesize}= | Set Variable | ${1518}
-| | ${rate}= | Set Variable | 812743pps
-| | 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 IPv6 forwarding with scaling in 3-node circular topology
-| | ... | ${rts_per_flow}
-| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | ${traffic_profile}
-
-| tc09-9000B-4t4c-ethip6-ip6scale20k-ndrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs IPv6 routing config with 4 threads, 4 phy cores, \
-| | ... | 2 receive queue per NIC port. [Ver] Verify ref-NDR for 9000 Byte
-| | ... | frames using single trial throughput test at 2x 138580pps.
-| | [Tags] | 9000B | 4T4C | MTHREAD
-| | ${framesize}= | Set Variable | ${9000}
-| | ${rate}= | Set Variable | 138580pps
-| | 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 IPv6 forwarding with scaling in 3-node circular topology
-| | ... | ${rts_per_flow}
-| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | ${traffic_profile}
diff --git a/tests/vpp/perf/ip6/10ge2p1x520-ethip6-ip6scale2m-ndrchk.robot b/tests/vpp/perf/ip6/10ge2p1x520-ethip6-ip6scale2m-ndrchk.robot
deleted file mode 100644
index c3411cebd8..0000000000
--- a/tests/vpp/perf/ip6/10ge2p1x520-ethip6-ip6scale2m-ndrchk.robot
+++ /dev/null
@@ -1,210 +0,0 @@
-# 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:
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-*** Settings ***
-| Resource | resources/libraries/robot/performance/performance_setup.robot
-| ...
-| Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRCHK
-| ... | NIC_Intel-X520-DA2 | ETH | IP6FWD | SCALE | FIB_2M
-| ...
-| Suite Setup | Set up 3-node performance topology with DUT's NIC model
-| ... | L3 | Intel-X520-DA2
-| 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 IPv6 routing verify test cases*
-| ...
-| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology
-| ... | with single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv6 for IPv6 routing.
-| ... | *[Cfg] DUT configuration:* DUT1 and DUT2 are configured with IPv6
-| ... | routing and 2x1M static IPv6 /64 route entries. DUT1 and DUT2 tested
-| ... | with 2p10GE NIC X520 Niantic by Intel.
-| ... | *[Ver] TG verification:* In short performance tests, TG verifies
-| ... | DUTs' throughput at ref-NDR (reference Non Drop Rate) with zero packet
-| ... | loss tolerance. Ref-NDR value is periodically updated acording to
-| ... | formula: ref-NDR = 0.9x NDR, where NDR is found in RFC2544 long
-| ... | performance tests for the same DUT confiiguration. Test packets are
-| ... | generated by TG on links to DUTs. TG traffic profile contains two L3
-| ... | flow-groups (flow-group per direction, 1M flows per flow-group) with
-| ... | all packets containing Ethernet header, IPv6 header and static
-| ... | payload. Incrementing of IP.dst (IPv6 destination address) field is
-| ... | applied to both streams.
-| ... | *[Ref] Applicable standard specifications:* RFC2544.
-
-*** Variables ***
-| ${rts_per_flow}= | ${1000000}
-# Traffic profile:
-| ${traffic_profile} | trex-sl-3n-ethip6-ip6dst${rts_per_flow}
-
-*** Test Cases ***
-| tc01-78B-1t1c-ethip6-ip6scale2m-ndrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs IPv6 routing config with 1 thread, 1 phy core, \
-| | ... | 1 receive queue per NIC port. [Ver] Verify ref-NDR for 78 Byte
-| | ... | frames using single trial throughput test at 2x 1.8mpps.
-| | [Tags] | 78B | 1T1C | STHREAD
-| | ${framesize}= | Set Variable | ${78}
-| | ${rate}= | Set Variable | 1.8mpps
-| | 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 IPv6 forwarding with scaling in 3-node circular topology
-| | ... | ${rts_per_flow}
-| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize}
-| | ... | ${traffic_profile}
-
-| tc02-1518B-1t1c-ethip6-ip6scale2m-ndrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs IPv6 routing 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] | 1518B | 1T1C | STHREAD
-| | ${framesize}= | Set Variable | ${1518}
-| | ${rate}= | Set Variable | 812743pps
-| | 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 IPv6 forwarding with scaling in 3-node circular topology
-| | ... | ${rts_per_flow}
-| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize}
-| | ... | ${traffic_profile}
-
-| tc03-9000B-1t1c-ethip6-ip6scale2m-ndrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs IPv6 routing 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] | 9000B | 1T1C | STHREAD
-| | ${framesize}= | Set Variable | ${9000}
-| | ${rate}= | Set Variable | 138580pps
-| | 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 IPv6 forwarding with scaling in 3-node circular topology
-| | ... | ${rts_per_flow}
-| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize}
-| | ... | ${traffic_profile}
-
-| tc04-78B-2t2c-ethip6-ip6scale2m-ndrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs IPv6 routing config with 2 threads, 2 phy cores, \
-| | ... | 1 receive queue per NIC port. [Ver] Verify ref-NDR for 78 Byte
-| | ... | frames using single trial throughput test at 2x 4.0mpps.
-| | [Tags] | 78B | 2T2C | MTHREAD
-| | ${framesize}= | Set Variable | ${78}
-| | ${rate}= | Set Variable | 4.0mpps
-| | 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 IPv6 forwarding with scaling in 3-node circular topology
-| | ... | ${rts_per_flow}
-| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize}
-| | ... | ${traffic_profile}
-
-| tc05-1518B-2t2c-ethip6-ip6scale2m-ndrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs IPv6 routing 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] | 1518B | 2T2C | MTHREAD
-| | ${framesize}= | Set Variable | ${1518}
-| | ${rate}= | Set Variable | 812743pps
-| | 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 IPv6 forwarding with scaling in 3-node circular topology
-| | ... | ${rts_per_flow}
-| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize}
-| | ... | ${traffic_profile}
-
-| tc06-9000B-2t2c-ethip6-ip6scale2m-ndrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs IPv6 routing 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] | 9000B | 2T2C | MTHREAD
-| | ${framesize}= | Set Variable | ${9000}
-| | ${rate}= | Set Variable | 138580pps
-| | 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 IPv6 forwarding with scaling in 3-node circular topology
-| | ... | ${rts_per_flow}
-| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize}
-| | ... | ${traffic_profile}
-
-| tc07-78B-4t4c-ethip6-ip6scale2m-ndrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs IPv6 routing config with 4 threads, 4 phy cores, \
-| | ... | 2 receive queue per NIC port. [Ver] Verify ref-NDR for 78 Byte
-| | ... | frames using single trial throughput test at 2x 6.8mpps.
-| | [Tags] | 78B | 4T4C | MTHREAD
-| | ${framesize}= | Set Variable | ${78}
-| | ${rate}= | Set Variable | 6.8mpps
-| | 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 IPv6 forwarding with scaling in 3-node circular topology
-| | ... | ${rts_per_flow}
-| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize}
-| | ... | ${traffic_profile}
-
-| tc08-1518B-4t4c-ethip6-ip6scale2m-ndrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs IPv6 routing config with 4 threads, 4 phy cores, \
-| | ... | 2 receive queue per NIC port. [Ver] Verify ref-NDR for 1518 Byte
-| | ... | frames using single trial throughput test at 2x 812743pps.
-| | [Tags] | 1518B | 4T4C | MTHREAD
-| | ${framesize}= | Set Variable | ${1518}
-| | ${rate}= | Set Variable | 812743pps
-| | 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 IPv6 forwarding with scaling in 3-node circular topology
-| | ... | ${rts_per_flow}
-| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize}
-| | ... | ${traffic_profile}
-
-| tc09-9000B-4t4c-ethip6-ip6scale2m-ndrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs IPv6 routing config with 4 threads, 4 phy cores, \
-| | ... | 2 receive queue per NIC port. [Ver] Verify ref-NDR for 9000 Byte
-| | ... | frames using single trial throughput test at 2x 138580pps.
-| | [Tags] | 9000B | 4T4C | MTHREAD
-| | ${framesize}= | Set Variable | ${9000}
-| | ${rate}= | Set Variable | 138580pps
-| | 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 IPv6 forwarding with scaling in 3-node circular topology
-| | ... | ${rts_per_flow}
-| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize}
-| | ... | ${traffic_profile}
diff --git a/tests/vpp/perf/ip6/10ge2p1x520-ethip6-ip6scale2m-pdrchk.robot b/tests/vpp/perf/ip6/10ge2p1x520-ethip6-ip6scale2m-pdrchk.robot
deleted file mode 100644
index 977e73ff2a..0000000000
--- a/tests/vpp/perf/ip6/10ge2p1x520-ethip6-ip6scale2m-pdrchk.robot
+++ /dev/null
@@ -1,185 +0,0 @@
-# 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:
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-*** Settings ***
-| Resource | resources/libraries/robot/performance/performance_setup.robot
-| ...
-| Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | PDRCHK
-| ... | NIC_Intel-X520-DA2 | ETH | IP6FWD | SCALE | FIB_2M
-| ...
-| Suite Setup | Set up 3-node performance topology with DUT's NIC model
-| ... | L3 | Intel-X520-DA2
-| Suite Teardown | Tear down 3-node performance topology
-| ...
-| Test Setup | Set up performance test
-| Test Teardown | Tear down performance pdrchk test
-| ...
-| Documentation | *Reference PDR throughput IPv6 routing verify test cases*
-| ...
-| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology
-| ... | with single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv6 for IPv6 routing.
-| ... | *[Cfg] DUT configuration:* DUT1 and DUT2 are configured with IPv6
-| ... | routing and 2x1M static IPv6 /64 route entries. DUT1 and DUT2 tested
-| ... | with 2p10GE NIC X520 Niantic by Intel.
-| ... | *[Ver] TG verification:* In short performance tests, TG verifies
-| ... | DUTs' throughput at ref-PDR (reference Non Drop Rate) with zero packet
-| ... | loss tolerance. Ref-PDR value is periodically updated acording to
-| ... | formula: ref-PDR = 0.9x PDR, where PDR is found in RFC2544 long
-| ... | performance tests for the same DUT confiiguration. Test packets are
-| ... | generated by TG on links to DUTs. TG traffic profile contains two L3
-| ... | flow-groups (flow-group per direction, 1M flows per flow-group) with
-| ... | all packets containing Ethernet header, IPv6 header and static
-| ... | payload. Incrementing of IP.dst (IPv6 destination address) field is
-| ... | applied to both streams.
-| ... | *[Ref] Applicable standard specifications:* RFC2544.
-
-*** Variables ***
-| ${rts_per_flow}= | ${1000000}
-# Traffic profile:
-| ${traffic_profile} | trex-sl-3n-ethip6-ip6dst${rts_per_flow}
-
-*** Keywords ***
-| Check PDR for IPv6 scaled routing
-| | [Documentation]
-| | ... | [Cfg] DUT runs IPv6 routing config with ${wt} thread, ${wt} phy core,\
-| | ... | ${rxq} receive queue per NIC port.
-| | ... | [Ver] Verify ref-NDR for ${framesize} Byte frames using single trial\
-| | ... | throughput test at 2x ${rate}.
-| | ...
-| | [Arguments] | ${framesize} | ${rate} | ${wt} | ${rxq}
-| | ...
-| | # Test Variables required for test and test teardown
-| | Set Test Variable | ${framesize}
-| | Set Test Variable | ${rate}
-| | ${get_framesize}= | Get Frame Size | ${framesize}
-| | ...
-| | Given Add '${wt}' worker threads and '${rxq}' rxqueues in 3-node single-link circular topology
-| | And Add PCI devices to DUTs in 3-node single link topology
-| | And Run Keyword If | ${get_framesize} < ${1522}
-| | ... | Add no multi seg to all DUTs
-| | And Apply startup configuration on all VPP DUTs
-| | And Initialize IPv6 forwarding with scaling in 3-node circular topology
-| | ... | ${rts_per_flow}
-| | Then Traffic should pass with partial loss | ${perf_trial_duration}
-| | ... | ${rate} | ${framesize} | ${traffic_profile}
-| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
-
-*** Test Cases ***
-| tc01-78B-1t1c-ethip6-ip6scale2m-pdrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs IPv6 routing config with 1 thread, 1 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Verify ref-NDR for 78 Byte frames using single trial\
-| | ... | throughput test at 2x ${rate}.
-| | ...
-| | [Tags] | 78B | 1T1C | STHREAD
-| | ...
-| | [Template] | Check PDR for IPv6 scaled routing
-| | framesize=${78} | rate=1.8mpps | wt=1 | rxq=1
-
-| tc02-1518B-1t1c-ethip6-ip6scale2m-pdrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs IPv6 routing 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 ${rate}.
-| | ...
-| | [Tags] | 1518B | 1T1C | STHREAD
-| | ...
-| | [Template] | Check PDR for IPv6 scaled routing
-| | framesize=${1518} | rate=400000pps | wt=1 | rxq=1
-
-| tc03-9000B-1t1c-ethip6-ip6scale2m-pdrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs IPv6 routing 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 ${rate}.
-| | ...
-| | [Tags] | 9000B | 1T1C | STHREAD
-| | ...
-| | [Template] | Check PDR for IPv6 scaled routing
-| | framesize=${9000} | rate=60000pps | wt=1 | rxq=1
-
-| tc04-78B-2t2c-ethip6-ip6scale2m-pdrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs IPv6 routing config with 2 threads, 2 phy cores,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Verify ref-NDR for 78 Byte frames using single trial\
-| | ... | throughput test at 2x ${rate}.
-| | ...
-| | [Tags] | 78B | 2T2C | MTHREAD
-| | ...
-| | [Template] | Check PDR for IPv6 scaled routing
-| | framesize=${78} | rate=4.0mpps | wt=2 | rxq=1
-
-| tc05-1518B-2t2c-ethip6-ip6scale2m-pdrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs IPv6 routing 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 ${rate}.
-| | ...
-| | [Tags] | 1518B | 2T2C | MTHREAD
-| | ...
-| | [Template] | Check PDR for IPv6 scaled routing
-| | framesize=${1518} | rate=400000pps | wt=2 | rxq=1
-
-| tc06-9000B-2t2c-ethip6-ip6scale2m-pdrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs IPv6 routing 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 ${rate}.
-| | ...
-| | [Tags] | 9000B | 2T2C | MTHREAD
-| | ...
-| | [Template] | Check PDR for IPv6 scaled routing
-| | framesize=${900} | rate=138580pps | wt=2 | rxq=1
-
-| tc07-78B-4t4c-ethip6-ip6scale2m-pdrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs IPv6 routing config with 4 threads, 4 phy cores,\
-| | ... | 2 receive queue per NIC port.
-| | ... | [Ver] Verify ref-NDR for 78 Byte frames using single trial\
-| | ... | throughput test at 2x ${rate}.
-| | ...
-| | [Tags] | 78B | 4T4C | MTHREAD
-| | ...
-| | [Template] | Check PDR for IPv6 scaled routing
-| | framesize=${78} | rate=6.4mpps | wt=4 | rxq=2
-
-| tc08-1518B-4t4c-ethip6-ip6scale2m-pdrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs IPv6 routing config with 4 threads, 4 phy cores,\
-| | ... | 2 receive queue per NIC port.
-| | ... | [Ver] Verify ref-NDR for 1518 Byte frames using single trial\
-| | ... | throughput test at 2x ${rate}.
-| | ...
-| | [Tags] | 1518B | 4T4C | MTHREAD
-| | ...
-| | [Template] | Check PDR for IPv6 scaled routing
-| | framesize=${1518} | rate=400000pps | wt=4 | rxq=2
-
-| tc09-9000B-4t4c-ethip6-ip6scale2m-pdrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs IPv6 routing config with 4 threads, 4 phy cores,\
-| | ... | 2 receive queue per NIC port.
-| | ... | [Ver] Verify ref-NDR for 9000 Byte frames using single trial\
-| | ... | throughput test at 2x ${rate}.
-| | ...
-| | [Tags] | 9000B | 4T4C | MTHREAD
-| | ...
-| | [Template] | Check PDR for IPv6 scaled routing
-| | framesize=${9000} | rate=60000pps | wt=4 | rxq=2
diff --git a/tests/vpp/perf/ip6_tunnels/10ge2p1x520-ethip6lispip4-ip6base-ndrchk.robot b/tests/vpp/perf/ip6_tunnels/10ge2p1x520-ethip6lispip4-ip6base-ndrchk.robot
deleted file mode 100644
index 6448d4390f..0000000000
--- a/tests/vpp/perf/ip6_tunnels/10ge2p1x520-ethip6lispip4-ip6base-ndrchk.robot
+++ /dev/null
@@ -1,266 +0,0 @@
-# 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:
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-*** Settings ***
-| Resource | resources/libraries/robot/performance/performance_setup.robot
-| Resource | resources/libraries/robot/overlay/lisp_static_adjacency.robot
-| Variables | resources/test_data/lisp/performance/lisp_static_adjacency.py
-| ...
-| Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRCHK
-| ... | NIC_Intel-X520-DA2 | IP6FWD | ENCAP | LISP | IP4UNRLAY | IP6OVRLAY
-| ...
-| Suite Setup | Set up 3-node performance topology with DUT's NIC model
-| ... | L3 | Intel-X520-DA2
-| 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 Lisp tunnel verify test cases*
-| ...
-| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology
-| ... | with single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv6-LISP-IPv4 on DUT1-DUT2,\
-| ... | Eth-IPv6 on TG-DUTn for IPv6 routing over LISPoIPv4 tunnel.
-| ... | *[Cfg] DUT configuration:* DUT1 and DUT2 are configured with IPv6\
-| ... | routing and static routes. LISPoIPv4 tunnel is configured between\
-| ... | DUT1 and DUT2. DUT1 and DUT2 tested with 2p10GE NIC X520 Niantic\
-| ... | by Intel.
-| ... | *[Ver] TG verification:* In short performance tests, TG verifies\
-| ... | DUTs' throughput at ref-NDR (reference Non Drop Rate) with zero packet\
-| ... | loss tolerance. Ref-NDR value is periodically updated acording to\
-| ... | formula: ref-NDR = 0.9x NDR, where NDR is found in RFC2544 long\
-| ... | performance tests for the same DUT confiiguration. Test packets are\
-| ... | generated by TG on links to DUTs. TG traffic profile contains two L3\
-| ... | flow-groups (flow-group per direction, 253 flows per flow-group) with\
-| ... | all packets containing Ethernet header, IPv4 header or IPv6 header with\
-| ... | IP protocol=61 and generated payload.
-| ... | *[Ref] Applicable standard specifications:* RFC2544.
-
-*** Variables ***
-# Traffic profile:
-| ${traffic_profile} | trex-sl-3n-ethip6-ip6src253
-
-*** Test Cases ***
-| tc01-78B-1t1c-ethip6lispip4-ip6base-ndrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs LISP tunnel config with 1 thread, 1 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Verify ref-NDR for 78 Byte frames using single trial\
-| | ... | throughput test at 2x 1.75mpps.
-| | [Tags] | 78B | 1T1C | STHREAD
-| | ${framesize}= | Set Variable | ${78}
-| | ${rate}= | Set Variable | 1.75mpps
-| | 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
-| | When Initialize LISP IPv6 over IPv4 forwarding in 3-node circular topology
-| | ... | ${dut1_to_dut2_ip6o4} | ${dut1_to_tg_ip6o4} | ${dut2_to_dut1_ip6o4}
-| | ... | ${dut2_to_tg_ip6o4} | ${tg_prefix6o4} | ${dut_prefix6o4}
-| | And Configure LISP topology in 3-node circular topology
-| | ... | ${dut1} | ${dut1_if2} | ${NONE}
-| | ... | ${dut2} | ${dut2_if1} | ${NONE}
-| | ... | ${duts_locator_set} | ${dut1_ip6o4_eid} | ${dut2_ip6o4_eid}
-| | ... | ${dut1_ip6o4_static_adjacency} | ${dut2_ip6o4_static_adjacency}
-| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | ${traffic_profile}
-
-| tc02-1460B-1t1c-ethip6lispip4-ip6base-ndrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs LISP tunnel config with 1 thread, 1 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Verify ref-NDR for 1460 Byte frames using single trial\
-| | ... | throughput test at 2x 720000pps.
-| | [Tags] | 1460B | 1T1C | STHREAD
-| | ${framesize}= | Set Variable | ${1460}
-| | ${rate}= | Set Variable | 720000pps
-| | 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
-| | When Initialize LISP IPv6 over IPv4 forwarding in 3-node circular topology
-| | ... | ${dut1_to_dut2_ip6o4} | ${dut1_to_tg_ip6o4} | ${dut2_to_dut1_ip6o4}
-| | ... | ${dut2_to_tg_ip6o4} | ${tg_prefix6o4} | ${dut_prefix6o4}
-| | And Configure LISP topology in 3-node circular topology
-| | ... | ${dut1} | ${dut1_if2} | ${NONE}
-| | ... | ${dut2} | ${dut2_if1} | ${NONE}
-| | ... | ${duts_locator_set} | ${dut1_ip6o4_eid} | ${dut2_ip6o4_eid}
-| | ... | ${dut1_ip6o4_static_adjacency} | ${dut2_ip6o4_static_adjacency}
-| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | ${traffic_profile}
-
-| tc03-9000B-1t1c-ethip6lispip4-ip6base-ndrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs LISP tunnel 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 120000pps.
-| | [Tags] | 9000B | 1T1C | STHREAD
-| | ${framesize}= | Set Variable | ${9000}
-| | ${rate}= | Set Variable | 120000pps
-| | 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
-| | When Initialize LISP IPv6 over IPv4 forwarding in 3-node circular topology
-| | ... | ${dut1_to_dut2_ip6o4} | ${dut1_to_tg_ip6o4} | ${dut2_to_dut1_ip6o4}
-| | ... | ${dut2_to_tg_ip6o4} | ${tg_prefix6o4} | ${dut_prefix6o4}
-| | And Configure LISP topology in 3-node circular topology
-| | ... | ${dut1} | ${dut1_if2} | ${NONE}
-| | ... | ${dut2} | ${dut2_if1} | ${NONE}
-| | ... | ${duts_locator_set} | ${dut1_ip6o4_eid} | ${dut2_ip6o4_eid}
-| | ... | ${dut1_ip6o4_static_adjacency} | ${dut2_ip6o4_static_adjacency}
-| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | ${traffic_profile}
-
-| tc04-78B-2t2c-ethip6lispip4-ip6base-ndrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs LISP tunnel config with 2 threads, 2 phy cores,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Verify ref-NDR for 78 Byte frames using single trial\
-| | ... | throughput test at 2x 3.42mpps.
-| | [Tags] | 78B | 2T2C | MTHREAD
-| | ${framesize}= | Set Variable | ${78}
-| | ${rate}= | Set Variable | 3.42mpps
-| | 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
-| | When Initialize LISP IPv6 over IPv4 forwarding in 3-node circular topology
-| | ... | ${dut1_to_dut2_ip6o4} | ${dut1_to_tg_ip6o4} | ${dut2_to_dut1_ip6o4}
-| | ... | ${dut2_to_tg_ip6o4} | ${tg_prefix6o4} | ${dut_prefix6o4}
-| | And Configure LISP topology in 3-node circular topology
-| | ... | ${dut1} | ${dut1_if2} | ${NONE}
-| | ... | ${dut2} | ${dut2_if1} | ${NONE}
-| | ... | ${duts_locator_set} | ${dut1_ip6o4_eid} | ${dut2_ip6o4_eid}
-| | ... | ${dut1_ip6o4_static_adjacency} | ${dut2_ip6o4_static_adjacency}
-| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | ${traffic_profile}
-
-| tc05-1460B-2t2c-ethip6lispip4-ip6base-ndrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs LISP tunnel config with 2 threads, 2 phy cores,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Verify ref-NDR for 1460 Byte frames using single trial\
-| | ... | throughput test at 2x 720000pps.
-| | [Tags] | 1460B | 2T2C | MTHREAD
-| | ${framesize}= | Set Variable | ${1460}
-| | ${rate}= | Set Variable | 720000pps
-| | 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
-| | When Initialize LISP IPv6 over IPv4 forwarding in 3-node circular topology
-| | ... | ${dut1_to_dut2_ip6o4} | ${dut1_to_tg_ip6o4} | ${dut2_to_dut1_ip6o4}
-| | ... | ${dut2_to_tg_ip6o4} | ${tg_prefix6o4} | ${dut_prefix6o4}
-| | And Configure LISP topology in 3-node circular topology
-| | ... | ${dut1} | ${dut1_if2} | ${NONE}
-| | ... | ${dut2} | ${dut2_if1} | ${NONE}
-| | ... | ${duts_locator_set} | ${dut1_ip6o4_eid} | ${dut2_ip6o4_eid}
-| | ... | ${dut1_ip6o4_static_adjacency} | ${dut2_ip6o4_static_adjacency}
-| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | ${traffic_profile}
-
-| tc06-9000B-2t2c-ethip6lispip4-ip6base-ndrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs LISP tunnel 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 120000pps.
-| | [Tags] | 9000B | 2T2C | MTHREAD
-| | ${framesize}= | Set Variable | ${9000}
-| | ${rate}= | Set Variable | 120000pps
-| | 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
-| | When Initialize LISP IPv6 over IPv4 forwarding in 3-node circular topology
-| | ... | ${dut1_to_dut2_ip6o4} | ${dut1_to_tg_ip6o4} | ${dut2_to_dut1_ip6o4}
-| | ... | ${dut2_to_tg_ip6o4} | ${tg_prefix6o4} | ${dut_prefix6o4}
-| | And Configure LISP topology in 3-node circular topology
-| | ... | ${dut1} | ${dut1_if2} | ${NONE}
-| | ... | ${dut2} | ${dut2_if1} | ${NONE}
-| | ... | ${duts_locator_set} | ${dut1_ip6o4_eid} | ${dut2_ip6o4_eid}
-| | ... | ${dut1_ip6o4_static_adjacency} | ${dut2_ip6o4_static_adjacency}
-| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | ${traffic_profile}
-
-| tc07-78B-4t4c-ethip6lispip4-ip6base-ndrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs LISP tunnel config with 4 threads, 4 phy cores,\
-| | ... | 2 receive queues per NIC port.
-| | ... | [Ver] Verify ref-NDR for 78 Byte frames using single trial\
-| | ... | throughput test at 2x 3.42mpps.
-| | [Tags] | 78B | 4T4C | MTHREAD
-| | ${framesize}= | Set Variable | ${78}
-| | ${rate}= | Set Variable | 3.42mpps
-| | 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
-| | When Initialize LISP IPv6 over IPv4 forwarding in 3-node circular topology
-| | ... | ${dut1_to_dut2_ip6o4} | ${dut1_to_tg_ip6o4} | ${dut2_to_dut1_ip6o4}
-| | ... | ${dut2_to_tg_ip6o4} | ${tg_prefix6o4} | ${dut_prefix6o4}
-| | And Configure LISP topology in 3-node circular topology
-| | ... | ${dut1} | ${dut1_if2} | ${NONE}
-| | ... | ${dut2} | ${dut2_if1} | ${NONE}
-| | ... | ${duts_locator_set} | ${dut1_ip6o4_eid} | ${dut2_ip6o4_eid}
-| | ... | ${dut1_ip6o4_static_adjacency} | ${dut2_ip6o4_static_adjacency}
-| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | ${traffic_profile}
-
-| tc08-1460B-4t4c-ethip6lispip4-ip6base-ndrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs LISP tunnel config with 4 threads, 4 phy cores,\
-| | ... | 2 receive queues per NIC port.
-| | ... | [Ver] Verify ref-NDR for 1460 Byte frames using single trial\
-| | ... | throughput test at 2x 720000pps.
-| | [Tags] | 1460B | 4T4C | MTHREAD
-| | ${framesize}= | Set Variable | ${1460}
-| | ${rate}= | Set Variable | 720000pps
-| | 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
-| | When Initialize LISP IPv6 over IPv4 forwarding in 3-node circular topology
-| | ... | ${dut1_to_dut2_ip6o4} | ${dut1_to_tg_ip6o4} | ${dut2_to_dut1_ip6o4}
-| | ... | ${dut2_to_tg_ip6o4} | ${tg_prefix6o4} | ${dut_prefix6o4}
-| | And Configure LISP topology in 3-node circular topology
-| | ... | ${dut1} | ${dut1_if2} | ${NONE}
-| | ... | ${dut2} | ${dut2_if1} | ${NONE}
-| | ... | ${duts_locator_set} | ${dut1_ip6o4_eid} | ${dut2_ip6o4_eid}
-| | ... | ${dut1_ip6o4_static_adjacency} | ${dut2_ip6o4_static_adjacency}
-| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | ${traffic_profile}
-
-| tc09-9000B-4t4c-ethip6lispip4-ip6base-ndrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs LISP tunnel 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 120000pps.
-| | [Tags] | 9000B | 4T4C | MTHREAD
-| | ${framesize}= | Set Variable | ${9000}
-| | ${rate}= | Set Variable | 120000pps
-| | 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
-| | When Initialize LISP IPv6 over IPv4 forwarding in 3-node circular topology
-| | ... | ${dut1_to_dut2_ip6o4} | ${dut1_to_tg_ip6o4} | ${dut2_to_dut1_ip6o4}
-| | ... | ${dut2_to_tg_ip6o4} | ${tg_prefix6o4} | ${dut_prefix6o4}
-| | And Configure LISP topology in 3-node circular topology
-| | ... | ${dut1} | ${dut1_if2} | ${NONE}
-| | ... | ${dut2} | ${dut2_if1} | ${NONE}
-| | ... | ${duts_locator_set} | ${dut1_ip6o4_eid} | ${dut2_ip6o4_eid}
-| | ... | ${dut1_ip6o4_static_adjacency} | ${dut2_ip6o4_static_adjacency}
-| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | ${traffic_profile}
diff --git a/tests/vpp/perf/ip6_tunnels/10ge2p1x520-ethip6lispip4-ip6base-pdrchk.robot b/tests/vpp/perf/ip6_tunnels/10ge2p1x520-ethip6lispip4-ip6base-pdrchk.robot
deleted file mode 100644
index 55c5a19e70..0000000000
--- a/tests/vpp/perf/ip6_tunnels/10ge2p1x520-ethip6lispip4-ip6base-pdrchk.robot
+++ /dev/null
@@ -1,193 +0,0 @@
-# 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:
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-*** Settings ***
-| Resource | resources/libraries/robot/performance/performance_setup.robot
-| Resource | resources/libraries/robot/overlay/lisp_static_adjacency.robot
-| Variables | resources/test_data/lisp/performance/lisp_static_adjacency.py
-| ...
-| Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | PDRCHK
-| ... | NIC_Intel-X520-DA2 | IP6FWD | ENCAP | LISP | IP4UNRLAY | IP6OVRLAY
-| ...
-| Suite Setup | Set up 3-node performance topology with DUT's NIC model
-| ... | L3 | Intel-X520-DA2
-| Suite Teardown | Tear down 3-node performance topology
-| ...
-| Test Setup | Set up performance test
-| Test Teardown | Tear down performance pdrchk test
-| ...
-| Documentation | *Reference PDR throughput Lisp tunnel verify test cases*
-| ...
-| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology
-| ... | with single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv6-LISP-IPv4 on DUT1-DUT2,\
-| ... | Eth-IPv6 on TG-DUTn for IPv6 routing over LISPoIPv4 tunnel.
-| ... | *[Cfg] DUT configuration:* DUT1 and DUT2 are configured with IPv6\
-| ... | routing and static routes. LISPoIPv4 tunnel is configured between\
-| ... | DUT1 and DUT2. DUT1 and DUT2 tested with 2p10GE NIC X520 Niantic\
-| ... | by Intel.
-| ... | *[Ver] TG verification:* In short performance tests, TG verifies\
-| ... | DUTs' throughput at ref-PDR (reference Non Drop Rate) with zero packet\
-| ... | loss tolerance. Ref-PDR value is periodically updated acording to\
-| ... | formula: ref-PDR = 0.9x PDR, where PDR is found in RFC2544 long\
-| ... | performance tests for the same DUT confiiguration. Test packets are\
-| ... | generated by TG on links to DUTs. TG traffic profile contains two L3\
-| ... | flow-groups (flow-group per direction, 253 flows per flow-group) with\
-| ... | all packets containing Ethernet header, IPv4 header or IPv6 header with\
-| ... | IP protocol=61 and generated payload.
-| ... | *[Ref] Applicable standard specifications:* RFC2544.
-
-*** Variables ***
-# Traffic profile:
-| ${traffic_profile} | trex-sl-3n-ethip6-ip6src253
-
-*** Keywords ***
-| Check PDR for Lisp IPv6 over IPv4 forwarding
-| | [Documentation]
-| | ... | [Cfg] DUT runs LISP tunnel config with ${wt} thread, ${wt} phy core,\
-| | ... | ${rxq} receive queue per NIC port.
-| | ... | [Ver] Verify ref-NDR for ${framesize} Byte frames using single trial\
-| | ... | throughput test at 2x ${rate}.
-| | ...
-| | [Arguments] | ${framesize} | ${rate} | ${wt} | ${rxq}
-| | ...
-| | # Test Variables required for test and test teardown
-| | Set Test Variable | ${framesize}
-| | Set Test Variable | ${rate}
-| | ${get_framesize}= | Get Frame Size | ${framesize}
-| | ...
-| | Given Add '${wt}' worker threads and '${rxq}' rxqueues in 3-node single-link circular topology
-| | And Add PCI devices to DUTs in 3-node single link topology
-| | And Run Keyword If | ${get_framesize} < ${1522}
-| | ... | Add no multi seg to all DUTs
-| | And Apply startup configuration on all VPP DUTs
-| | When Initialize LISP IPv6 over IPv4 forwarding in 3-node circular topology
-| | ... | ${dut1_to_dut2_ip6o4} | ${dut1_to_tg_ip6o4} | ${dut2_to_dut1_ip6o4}
-| | ... | ${dut2_to_tg_ip6o4} | ${tg_prefix6o4} | ${dut_prefix6o4}
-| | And Configure LISP topology in 3-node circular topology
-| | ... | ${dut1} | ${dut1_if2} | ${NONE}
-| | ... | ${dut2} | ${dut2_if1} | ${NONE}
-| | ... | ${duts_locator_set} | ${dut1_ip6o4_eid} | ${dut2_ip6o4_eid}
-| | ... | ${dut1_ip6o4_static_adjacency} | ${dut2_ip6o4_static_adjacency}
-| | Then Traffic should pass with partial loss | ${perf_trial_duration}
-| | ... | ${rate} | ${framesize} | ${traffic_profile}
-| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
-
-*** Test Cases ***
-| tc01-78B-1t1c-ethip6lispip4-ip6base-pdrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs LISP tunnel config with 1 thread, 1 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Verify ref-NDR for 78 Byte frames using single trial\
-| | ... | throughput test at 2x ${rate}.
-| | ...
-| | [Tags] | 78B | 1T1C | STHREAD
-| | ...
-| | [Template] | Check PDR for Lisp IPv6 over IPv4 forwarding
-| | framesize=${78} | rate=1.75mpps | wt=1 | rxq=1
-
-| tc02-1460B-1t1c-ethip6lispip4-ip6base-pdrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs LISP tunnel config with 1 thread, 1 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Verify ref-NDR for 1460 Byte frames using single trial\
-| | ... | throughput test at 2x ${rate}.
-| | ...
-| | [Tags] | 1460B | 1T1C | STHREAD
-| | ...
-| | [Template] | Check PDR for Lisp IPv6 over IPv4 forwarding
-| | framesize=${1460} | rate=37000pps | wt=1 | rxq=1
-
-| tc03-9000B-1t1c-ethip6lispip4-ip6base-pdrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs LISP tunnel 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 ${rate}.
-| | ...
-| | [Tags] | 9000B | 1T1C | STHREAD
-| | ...
-| | [Template] | Check PDR for Lisp IPv6 over IPv4 forwarding
-| | framesize=${9000} | rate=60000pps | wt=1 | rxq=1
-
-| tc04-78B-2t2c-ethip6lispip4-ip6base-pdrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs LISP tunnel config with 2 threads, 2 phy cores,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Verify ref-NDR for 78 Byte frames using single trial\
-| | ... | throughput test at 2x ${rate}.
-| | ...
-| | [Tags] | 78B | 2T2C | MTHREAD
-| | ...
-| | [Template] | Check PDR for Lisp IPv6 over IPv4 forwarding
-| | framesize=${78} | rate=3.42mpps | wt=2 | rxq=1
-
-| tc05-1460B-2t2c-ethip6lispip4-ip6base-pdrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs LISP tunnel config with 2 threads, 2 phy cores,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Verify ref-NDR for 1460 Byte frames using single trial\
-| | ... | throughput test at 2x ${rate}.
-| | ...
-| | [Tags] | 1460B | 2T2C | MTHREAD
-| | ...
-| | [Template] | Check PDR for Lisp IPv6 over IPv4 forwarding
-| | framesize=${1460} | rate=370000pps | wt=2 | rxq=1
-
-| tc06-9000B-2t2c-ethip6lispip4-ip6base-pdrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs LISP tunnel 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 ${rate}.
-| | ...
-| | [Tags] | 9000B | 2T2C | MTHREAD
-| | ...
-| | [Template] | Check PDR for Lisp IPv6 over IPv4 forwarding
-| | framesize=${9000} | rate=60000pps | wt=2 | rxq=1
-
-| tc07-78B-4t4c-ethip6lispip4-ip6base-pdrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs LISP tunnel config with 4 threads, 4 phy cores,\
-| | ... | 2 receive queues per NIC port.
-| | ... | [Ver] Verify ref-NDR for 78 Byte frames using single trial\
-| | ... | throughput test at 2x ${rate}.
-| | ...
-| | [Tags] | 78B | 4T4C | MTHREAD
-| | ...
-| | [Template] | Check PDR for Lisp IPv6 over IPv4 forwarding
-| | framesize=${78} | rate=3.42mpps | wt=4 | rxq=2
-
-| tc08-1460B-4t4c-ethip6lispip4-ip6base-pdrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs LISP tunnel config with 4 threads, 4 phy cores,\
-| | ... | 2 receive queues per NIC port.
-| | ... | [Ver] Verify ref-NDR for 1460 Byte frames using single trial\
-| | ... | throughput test at 2x ${rate}.
-| | ...
-| | [Tags] | 1460B | 4T4C | MTHREAD
-| | ...
-| | [Template] | Check PDR for Lisp IPv6 over IPv4 forwarding
-| | framesize=${1460} | rate=370000pps | wt=4 | rxq=2
-
-| tc09-9000B-4t4c-ethip6lispip4-ip6base-pdrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs LISP tunnel 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 ${rate}.
-| | ...
-| | [Tags] | 9000B | 4T4C | MTHREAD
-| | ...
-| | [Template] | Check PDR for Lisp IPv6 over IPv4 forwarding
-| | framesize=${9000} | rate=60000pps | wt=4 | rxq=2
diff --git a/tests/vpp/perf/ip6_tunnels/10ge2p1x520-ethip6lispip6-ip6base-ndrchk.robot b/tests/vpp/perf/ip6_tunnels/10ge2p1x520-ethip6lispip6-ip6base-ndrchk.robot
deleted file mode 100644
index 2e44791318..0000000000
--- a/tests/vpp/perf/ip6_tunnels/10ge2p1x520-ethip6lispip6-ip6base-ndrchk.robot
+++ /dev/null
@@ -1,266 +0,0 @@
-# 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:
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-*** Settings ***
-| Resource | resources/libraries/robot/performance/performance_setup.robot
-| Resource | resources/libraries/robot/overlay/lisp_static_adjacency.robot
-| Variables | resources/test_data/lisp/performance/lisp_static_adjacency.py
-| ...
-| Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRCHK
-| ... | NIC_Intel-X520-DA2 | IP6FWD | ENCAP | LISP | IP6UNRLAY | IP6OVRLAY
-| ...
-| Suite Setup | Set up 3-node performance topology with DUT's NIC model
-| ... | L3 | Intel-X520-DA2
-| 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 Lisp tunnel verify test cases*
-| ...
-| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology\
-| ... | with single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv6-LISP-IPv6 on DUT1-DUT2,\
-| ... | Eth-IPv6-ICMPv6 on TG-DUTn for IPv6 routing over LISPoIPv6 tunnel.
-| ... | *[Cfg] DUT configuration:* DUT1 and DUT2 are configured with IPv6\
-| ... | routing and static routes. LISPoIPv6 tunnel is configured\
-| ... | between DUT1 and DUT2. DUT1 and DUT2 tested with 2p10GE NIC X520\
-| ... | Niantic by Intel.
-| ... | *[Ver] TG verification:* In short performance tests, TG verifies\
-| ... | DUTs' throughput at ref-NDR (reference Non Drop Rate) with zero packet\
-| ... | loss tolerance. Ref-NDR value is periodically updated acording to\
-| ... | formula: ref-NDR = 0.9x NDR, where NDR is found in RFC2544 long\
-| ... | performance tests for the same DUT confiiguration. Test packets are\
-| ... | generated by TG on links to DUTs. TG traffic profile contains two L3\
-| ... | flow-groups (flow-group per direction, 253 flows per flow-group) with\
-| ... | all packets containing Ethernet header, IPv6 header with\
-| ... | IP protocol=61 and generated payload.
-| ... | *[Ref] Applicable standard specifications:* RFC2544.
-
-*** Variables ***
-# Traffic profile:
-| ${traffic_profile} | trex-sl-3n-ethip6-ip6src253
-
-*** Test Cases ***
-| tc01-78B-1t1c-ethip6lispip6-ip6base-ndrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs LISP tunnel config with 1 thread, 1 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Verify ref-NDR for 78 Byte frames using single trial\
-| | ... | throughput test at 2x 1.56mpps.
-| | [Tags] | 78B | 1T1C | STHREAD
-| | ${framesize}= | Set Variable | ${78}
-| | ${rate}= | Set Variable | 1.56mpps
-| | 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
-| | When Initialize LISP IPv6 forwarding in 3-node circular topology
-| | ... | ${dut1_to_dut2_ip6} | ${dut1_to_tg_ip6} | ${dut2_to_dut1_ip6}
-| | ... | ${dut2_to_tg_ip6} | ${prefix6}
-| | And Configure LISP topology in 3-node circular topology
-| | ... | ${dut1} | ${dut1_if2} | ${NONE}
-| | ... | ${dut2} | ${dut2_if1} | ${NONE}
-| | ... | ${duts_locator_set} | ${dut1_ip6_eid} | ${dut2_ip6_eid}
-| | ... | ${dut1_ip6_static_adjacency} | ${dut2_ip6_static_adjacency}
-| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | ${traffic_profile}
-
-| tc02-1460B-1t1c-ethip6lispip6-ip6base-ndrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs LISP tunnel config with 1 thread, 1 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Verify ref-NDR for 1460 Byte frames using single trial\
-| | ... | throughput test at 2x 740000pps.
-| | [Tags] | 1460B | 1T1C | STHREAD
-| | ${framesize}= | Set Variable | ${1460}
-| | ${rate}= | Set Variable | 740000pps
-| | 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
-| | When Initialize LISP IPv6 forwarding in 3-node circular topology
-| | ... | ${dut1_to_dut2_ip6} | ${dut1_to_tg_ip6} | ${dut2_to_dut1_ip6}
-| | ... | ${dut2_to_tg_ip6} | ${prefix6}
-| | And Configure LISP topology in 3-node circular topology
-| | ... | ${dut1} | ${dut1_if2} | ${NONE}
-| | ... | ${dut2} | ${dut2_if1} | ${NONE}
-| | ... | ${duts_locator_set} | ${dut1_ip6_eid} | ${dut2_ip6_eid}
-| | ... | ${dut1_ip6_static_adjacency} | ${dut2_ip6_static_adjacency}
-| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | ${traffic_profile}
-
-| tc03-9000B-1t1c-ethip6lispip6-ip6base-ndrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs LISP tunnel 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 120000pps.
-| | [Tags] | 9000B | 1T1C | STHREAD
-| | ${framesize}= | Set Variable | ${9000}
-| | ${rate}= | Set Variable | 120000pps
-| | 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
-| | When Initialize LISP IPv6 forwarding in 3-node circular topology
-| | ... | ${dut1_to_dut2_ip6} | ${dut1_to_tg_ip6} | ${dut2_to_dut1_ip6}
-| | ... | ${dut2_to_tg_ip6} | ${prefix6}
-| | And Configure LISP topology in 3-node circular topology
-| | ... | ${dut1} | ${dut1_if2} | ${NONE}
-| | ... | ${dut2} | ${dut2_if1} | ${NONE}
-| | ... | ${duts_locator_set} | ${dut1_ip6_eid} | ${dut2_ip6_eid}
-| | ... | ${dut1_ip6_static_adjacency} | ${dut2_ip6_static_adjacency}
-| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | ${traffic_profile}
-
-| tc04-78B-2t2c-ethip6lispip6-ip6base-ndrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs LISP tunnel config with 2 thread, 2 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Verify ref-NDR for 78 Byte frames using single trial\
-| | ... | throughput test at 2x 3.2mpps.
-| | [Tags] | 78B | 2T2C | MTHREAD
-| | ${framesize}= | Set Variable | ${78}
-| | ${rate}= | Set Variable | 3.2mpps
-| | 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
-| | When Initialize LISP IPv6 forwarding in 3-node circular topology
-| | ... | ${dut1_to_dut2_ip6} | ${dut1_to_tg_ip6} | ${dut2_to_dut1_ip6}
-| | ... | ${dut2_to_tg_ip6} | ${prefix6}
-| | And Configure LISP topology in 3-node circular topology
-| | ... | ${dut1} | ${dut1_if2} | ${NONE}
-| | ... | ${dut2} | ${dut2_if1} | ${NONE}
-| | ... | ${duts_locator_set} | ${dut1_ip6_eid} | ${dut2_ip6_eid}
-| | ... | ${dut1_ip6_static_adjacency} | ${dut2_ip6_static_adjacency}
-| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | ${traffic_profile}
-
-| tc05-1460B-2t2c-ethip6lispip6-ip6base-ndrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs LISP tunnel config with 2 threads, 2 phy cores,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Verify ref-NDR for 1460 Byte frames using single trial\
-| | ... | throughput test at 2x 740000pps.
-| | [Tags] | 1460B | 2T2C | MTHREAD
-| | ${framesize}= | Set Variable | ${1460}
-| | ${rate}= | Set Variable | 740000pps
-| | 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
-| | When Initialize LISP IPv6 forwarding in 3-node circular topology
-| | ... | ${dut1_to_dut2_ip6} | ${dut1_to_tg_ip6} | ${dut2_to_dut1_ip6}
-| | ... | ${dut2_to_tg_ip6} | ${prefix6}
-| | And Configure LISP topology in 3-node circular topology
-| | ... | ${dut1} | ${dut1_if2} | ${NONE}
-| | ... | ${dut2} | ${dut2_if1} | ${NONE}
-| | ... | ${duts_locator_set} | ${dut1_ip6_eid} | ${dut2_ip6_eid}
-| | ... | ${dut1_ip6_static_adjacency} | ${dut2_ip6_static_adjacency}
-| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | ${traffic_profile}
-
-| tc06-9000B-2t2c-ethip6lispip6-ip6base-ndrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs LISP tunnel 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 120000pps.
-| | [Tags] | 9000B | 2T2C | MTHREAD
-| | ${framesize}= | Set Variable | ${9000}
-| | ${rate}= | Set Variable | 120000pps
-| | 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
-| | When Initialize LISP IPv6 forwarding in 3-node circular topology
-| | ... | ${dut1_to_dut2_ip6} | ${dut1_to_tg_ip6} | ${dut2_to_dut1_ip6}
-| | ... | ${dut2_to_tg_ip6} | ${prefix6}
-| | And Configure LISP topology in 3-node circular topology
-| | ... | ${dut1} | ${dut1_if2} | ${NONE}
-| | ... | ${dut2} | ${dut2_if1} | ${NONE}
-| | ... | ${duts_locator_set} | ${dut1_ip6_eid} | ${dut2_ip6_eid}
-| | ... | ${dut1_ip6_static_adjacency} | ${dut2_ip6_static_adjacency}
-| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | ${traffic_profile}
-
-| tc07-78B-4t4c-ethip6lispip6-ip6base-ndrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs LISP tunnel config with 4 threads, 4 phy cores,\
-| | ... | 2 receive queues per NIC port.
-| | ... | [Ver] Verify ref-NDR for 78 Byte frames using single trial\
-| | ... | throughput test at 2x 3.2mpps.
-| | [Tags] | 78B | 4T4C | MTHREAD
-| | ${framesize}= | Set Variable | ${78}
-| | ${rate}= | Set Variable | 3.2mpps
-| | 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
-| | When Initialize LISP IPv6 forwarding in 3-node circular topology
-| | ... | ${dut1_to_dut2_ip6} | ${dut1_to_tg_ip6} | ${dut2_to_dut1_ip6}
-| | ... | ${dut2_to_tg_ip6} | ${prefix6}
-| | And Configure LISP topology in 3-node circular topology
-| | ... | ${dut1} | ${dut1_if2} | ${NONE}
-| | ... | ${dut2} | ${dut2_if1} | ${NONE}
-| | ... | ${duts_locator_set} | ${dut1_ip6_eid} | ${dut2_ip6_eid}
-| | ... | ${dut1_ip6_static_adjacency} | ${dut2_ip6_static_adjacency}
-| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | ${traffic_profile}
-
-| tc08-1460B-4t4c-ethip6lispip6-ip6base-ndrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs LISP tunnel config with 4 threads, 4 phy cores,\
-| | ... | 2 receive queues per NIC port.
-| | ... | [Ver] Verify ref-NDR for 1460 Byte frames using single trial\
-| | ... | throughput test at 2x 740000pps.
-| | [Tags] | 1460B | 4T4C | MTHREAD
-| | ${framesize}= | Set Variable | ${1460}
-| | ${rate}= | Set Variable | 740000pps
-| | 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
-| | When Initialize LISP IPv6 forwarding in 3-node circular topology
-| | ... | ${dut1_to_dut2_ip6} | ${dut1_to_tg_ip6} | ${dut2_to_dut1_ip6}
-| | ... | ${dut2_to_tg_ip6} | ${prefix6}
-| | And Configure LISP topology in 3-node circular topology
-| | ... | ${dut1} | ${dut1_if2} | ${NONE}
-| | ... | ${dut2} | ${dut2_if1} | ${NONE}
-| | ... | ${duts_locator_set} | ${dut1_ip6_eid} | ${dut2_ip6_eid}
-| | ... | ${dut1_ip6_static_adjacency} | ${dut2_ip6_static_adjacency}
-| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | ${traffic_profile}
-
-| tc09-9000B-4t4c-ethip6lispip6-ip6base-ndrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs LISP tunnel 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 120000pps.
-| | [Tags] | 9000B | 4T4C | MTHREAD
-| | ${framesize}= | Set Variable | ${9000}
-| | ${rate}= | Set Variable | 120000pps
-| | 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
-| | When Initialize LISP IPv6 forwarding in 3-node circular topology
-| | ... | ${dut1_to_dut2_ip6} | ${dut1_to_tg_ip6} | ${dut2_to_dut1_ip6}
-| | ... | ${dut2_to_tg_ip6} | ${prefix6}
-| | And Configure LISP topology in 3-node circular topology
-| | ... | ${dut1} | ${dut1_if2} | ${NONE}
-| | ... | ${dut2} | ${dut2_if1} | ${NONE}
-| | ... | ${duts_locator_set} | ${dut1_ip6_eid} | ${dut2_ip6_eid}
-| | ... | ${dut1_ip6_static_adjacency} | ${dut2_ip6_static_adjacency}
-| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | ${traffic_profile}
diff --git a/tests/vpp/perf/ip6_tunnels/10ge2p1x520-ethip6lispip6-ip6base-pdrchk.robot b/tests/vpp/perf/ip6_tunnels/10ge2p1x520-ethip6lispip6-ip6base-pdrchk.robot
deleted file mode 100644
index 717efedf45..0000000000
--- a/tests/vpp/perf/ip6_tunnels/10ge2p1x520-ethip6lispip6-ip6base-pdrchk.robot
+++ /dev/null
@@ -1,193 +0,0 @@
-# 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:
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-*** Settings ***
-| Resource | resources/libraries/robot/performance/performance_setup.robot
-| Resource | resources/libraries/robot/overlay/lisp_static_adjacency.robot
-| Variables | resources/test_data/lisp/performance/lisp_static_adjacency.py
-| ...
-| Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | PDRCHK
-| ... | NIC_Intel-X520-DA2 | IP6FWD | ENCAP | LISP | IP6UNRLAY | IP6OVRLAY
-| ...
-| Suite Setup | Set up 3-node performance topology with DUT's NIC model
-| ... | L3 | Intel-X520-DA2
-| Suite Teardown | Tear down 3-node performance topology
-| ...
-| Test Setup | Set up performance test
-| Test Teardown | Tear down performance pdrchk test
-| ...
-| Documentation | *Reference PDR throughput Lisp tunnel verify test cases*
-| ...
-| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology\
-| ... | with single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv6-LISP-IPv6 on DUT1-DUT2,\
-| ... | Eth-IPv6-ICMPv6 on TG-DUTn for IPv6 routing over LISPoIPv6 tunnel.
-| ... | *[Cfg] DUT configuration:* DUT1 and DUT2 are configured with IPv6\
-| ... | routing and static routes. LISPoIPv6 tunnel is configured\
-| ... | between DUT1 and DUT2. DUT1 and DUT2 tested with 2p10GE NIC X520\
-| ... | Niantic by Intel.
-| ... | *[Ver] TG verification:* In short performance tests, TG verifies\
-| ... | DUTs' throughput at ref-PDR (reference Non Drop Rate) with zero packet\
-| ... | loss tolerance. Ref-PDR value is periodically updated acording to\
-| ... | formula: ref-PDR = 0.9x PDR, where PDR is found in RFC2544 long\
-| ... | performance tests for the same DUT confiiguration. Test packets are\
-| ... | generated by TG on links to DUTs. TG traffic profile contains two L3\
-| ... | flow-groups (flow-group per direction, 253 flows per flow-group) with\
-| ... | all packets containing Ethernet header, IPv6 header with\
-| ... | IP protocol=61 and generated payload.
-| ... | *[Ref] Applicable standard specifications:* RFC2544.
-
-*** Variables ***
-# Traffic profile:
-| ${traffic_profile} | trex-sl-3n-ethip6-ip6src253
-
-*** Keywords ***
-| Check PDR for Lisp IPv6 over IPv6 forwarding
-| | [Documentation]
-| | ... | [Cfg] DUT runs LISP tunnel config with ${wt} thread, ${wt} phy core,\
-| | ... | ${rxq} receive queue per NIC port.
-| | ... | [Ver] Verify ref-NDR for ${framesize} Byte frames using single trial\
-| | ... | throughput test at 2x ${rate}.
-| | ...
-| | [Arguments] | ${framesize} | ${rate} | ${wt} | ${rxq}
-| | ...
-| | # Test Variables required for test and test teardown
-| | Set Test Variable | ${framesize}
-| | Set Test Variable | ${rate}
-| | ${get_framesize}= | Get Frame Size | ${framesize}
-| | ...
-| | Given Add '${wt}' worker threads and '${rxq}' rxqueues in 3-node single-link circular topology
-| | And Add PCI devices to DUTs in 3-node single link topology
-| | And Run Keyword If | ${get_framesize} < ${1522}
-| | ... | Add no multi seg to all DUTs
-| | And Apply startup configuration on all VPP DUTs
-| | When Initialize LISP IPv6 forwarding in 3-node circular topology
-| | ... | ${dut1_to_dut2_ip6} | ${dut1_to_tg_ip6} | ${dut2_to_dut1_ip6}
-| | ... | ${dut2_to_tg_ip6} | ${prefix6}
-| | And Configure LISP topology in 3-node circular topology
-| | ... | ${dut1} | ${dut1_if2} | ${NONE}
-| | ... | ${dut2} | ${dut2_if1} | ${NONE}
-| | ... | ${duts_locator_set} | ${dut1_ip6_eid} | ${dut2_ip6_eid}
-| | ... | ${dut1_ip6_static_adjacency} | ${dut2_ip6_static_adjacency}
-| | Then Traffic should pass with partial loss | ${perf_trial_duration}
-| | ... | ${rate} | ${framesize} | ${traffic_profile}
-| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
-
-*** Test Cases ***
-| tc01-78B-1t1c-ethip6lispip6-ip6base-pdrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs LISP tunnel config with 1 thread, 1 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Verify ref-NDR for 78 Byte frames using single trial\
-| | ... | throughput test at 2x ${rate}.
-| | ...
-| | [Tags] | 78B | 1T1C | STHREAD
-| | ...
-| | [Template] | Check PDR for Lisp IPv6 over IPv6 forwarding
-| | framesize=${78} | rate=1.56mpps | wt=1 | rxq=1
-
-| tc02-1460B-1t1c-ethip6lispip6-ip6base-pdrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs LISP tunnel config with 1 thread, 1 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Verify ref-NDR for 1460 Byte frames using single trial\
-| | ... | throughput test at 2x ${rate}.
-| | ...
-| | [Tags] | 1460B | 1T1C | STHREAD
-| | ...
-| | [Template] | Check PDR for Lisp IPv6 over IPv6 forwarding
-| | framesize=${1460} | rate=370000pps | wt=1 | rxq=1
-
-| tc03-9000B-1t1c-ethip6lispip6-ip6base-pdrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs LISP tunnel 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 ${rate}.
-| | ...
-| | [Tags] | 9000B | 1T1C | STHREAD
-| | ...
-| | [Template] | Check PDR for Lisp IPv6 over IPv6 forwarding
-| | framesize=${9000} | rate=60000pps | wt=1 | rxq=1
-
-| tc04-78B-2t2c-ethip6lispip6-ip6base-pdrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs LISP tunnel config with 2 thread, 2 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Verify ref-NDR for 78 Byte frames using single trial\
-| | ... | throughput test at 2x ${rate}.
-| | ...
-| | [Tags] | 78B | 2T2C | MTHREAD
-| | ...
-| | [Template] | Check PDR for Lisp IPv6 over IPv6 forwarding
-| | framesize=${78} | rate=3.2mpps | wt=2 | rxq=1
-
-| tc05-1460B-2t2c-ethip6lispip6-ip6base-pdrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs LISP tunnel config with 2 threads, 2 phy cores,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Verify ref-NDR for 1460 Byte frames using single trial\
-| | ... | throughput test at 2x ${rate}.
-| | ...
-| | [Tags] | 1460B | 2T2C | MTHREAD
-| | ...
-| | [Template] | Check PDR for Lisp IPv6 over IPv6 forwarding
-| | framesize=${1460} | rate=370000pps | wt=2 | rxq=1
-
-| tc06-9000B-2t2c-ethip6lispip6-ip6base-pdrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs LISP tunnel 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 ${rate}.
-| | ...
-| | [Tags] | 9000B | 2T2C | MTHREAD
-| | ...
-| | [Template] | Check PDR for Lisp IPv6 over IPv6 forwarding
-| | framesize=${9000} | rate=60000pps | wt=2 | rxq=1
-
-| tc07-78B-4t4c-ethip6lispip6-ip6base-pdrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs LISP tunnel config with 4 threads, 4 phy cores,\
-| | ... | 2 receive queues per NIC port.
-| | ... | [Ver] Verify ref-NDR for 78 Byte frames using single trial\
-| | ... | throughput test at 2x ${rate}.
-| | ...
-| | [Tags] | 78B | 4T4C | MTHREAD
-| | ...
-| | [Template] | Check PDR for Lisp IPv6 over IPv6 forwarding
-| | framesize=${78} | rate=3.2mpps | wt=4 | rxq=2
-
-| tc08-1460B-4t4c-ethip6lispip6-ip6base-pdrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs LISP tunnel config with 4 threads, 4 phy cores,\
-| | ... | 2 receive queues per NIC port.
-| | ... | [Ver] Verify ref-NDR for 1460 Byte frames using single trial\
-| | ... | throughput test at 2x ${rate}.
-| | ...
-| | [Tags] | 1460B | 4T4C | MTHREAD
-| | ...
-| | [Template] | Check PDR for Lisp IPv6 over IPv6 forwarding
-| | framesize=${1460} | rate=370000pps | wt=4 | rxq=2
-
-| tc09-9000B-4t4c-ethip6lispip6-ip6base-pdrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs LISP tunnel 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 ${rate}.
-| | ...
-| | [Tags] | 9000B | 4T4C | MTHREAD
-| | ...
-| | [Template] | Check PDR for Lisp IPv6 over IPv6 forwarding
-| | framesize=${9000} | rate=60000pps | wt=4 | rxq=2
diff --git a/tests/vpp/perf/l2/10ge2p1x520-dot1ad-l2xcbase-ndrchk.robot b/tests/vpp/perf/l2/10ge2p1x520-dot1ad-l2xcbase-ndrchk.robot
deleted file mode 100644
index 3f4f0b23f3..0000000000
--- a/tests/vpp/perf/l2/10ge2p1x520-dot1ad-l2xcbase-ndrchk.robot
+++ /dev/null
@@ -1,279 +0,0 @@
-# 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:
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-*** Settings ***
-| Resource | resources/libraries/robot/performance/performance_setup.robot
-| Resource | resources/libraries/robot/l2/tagging.robot
-| ...
-| Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRCHK
-| ... | NIC_Intel-X520-DA2 | L2XCFWD | BASE | DOT1AD
-| ...
-| Suite Setup | Set up 3-node performance topology with DUT's NIC model
-| ... | L2 | Intel-X520-DA2
-| 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 L2XC with 802.1ad verify test cases*
-| ...
-| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology
-| ... | with single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 xconnect.
-| ... | 802.1ad tagging is applied on link between DUT1 and DUT2 with inner 4B
-| ... | vlan tag (id=100) and outer 4B vlan tag (id=200).
-| ... | *[Cfg] DUT configuration:* DUT1 and DUT2 are configured with L2 cross-
-| ... | connect. DUT1 and DUT2 tested with 2p10GE NIC X520 Niantic by Intel.
-| ... | *[Ver] TG verification:* In short performance tests, TG verifies
-| ... | DUTs' throughput at ref-NDR (reference Non Drop Rate) with zero packet
-| ... | loss tolerance. Ref-NDR value is periodically updated acording to
-| ... | formula: ref-NDR = 0.9x NDR, where NDR is found in RFC2544 long
-| ... | performance tests for the same DUT configuration. Test packets are
-| ... | generated by TG on links to DUTs. TG traffic profile contains two L3
-| ... | flow-groups (flow-group per direction, 253 flows per flow-group) with
-| ... | all packets containing Ethernet header, IPv4 header with IP protocol=61
-| ... | and static payload. MAC addresses are matching MAC addresses of the
-| ... | TG node interfaces.
-| ... | *[Ref] Applicable standard specifications:* RFC2544.
-
-*** Variables ***
-| ${subid}= | 10
-| ${outer_vlan_id}= | 100
-| ${inner_vlan_id}= | 200
-| ${type_subif}= | two_tags
-| ${tag_rewrite}= | pop-2
-# Traffic profile:
-| ${traffic_profile} | trex-sl-3n-ethip4-ip4src254
-
-*** Test Cases ***
-| tc01-64B-1t1c-dot1ad-l2xcbase-ndrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2XC with 802.1ad 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 4.0mpps.
-| | [Tags] | 64B | 1T1C | STHREAD
-| | ${framesize}= | Set Variable | ${64}
-| | ${rate}= | Set Variable | 4.0mpps
-| | 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 Set interfaces in path in 3-node circular topology up
-| | When Initialize VLAN sub-interfaces in 3-node circular topology
-| | ... | ${dut1} | ${dut1_if2} | ${dut2} | ${dut2_if1} | ${subid}
-| | ... | ${outer_vlan_id} | ${inner_vlan_id} | ${type_subif}
-| | And Configure L2 tag rewrite method on interfaces
-| | ... | ${dut1} | ${subif_index_1} | ${dut2} | ${subif_index_2}
-| | ... | ${tag_rewrite}
-| | 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}
-| | ... | ${framesize} | ${traffic_profile}
-
-| tc02-1514B-1t1c-dot1ad-l2xcbase-ndrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2XC with 802.1ad config with 1 thread, 1 phy core, \
-| | ... | 1 receive queue per NIC port. [Ver] Verify ref-NDR for 1514 Byte
-| | ... | frames using single trial throughput test at 2x 810635pps.
-| | [Tags] | 1514B | 1T1C | STHREAD
-| | ${framesize}= | Set Variable | ${1514}
-| | ${rate}= | Set Variable | 810635pps
-| | 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 Set interfaces in path in 3-node circular topology up
-| | When Initialize VLAN sub-interfaces in 3-node circular topology
-| | ... | ${dut1} | ${dut1_if2} | ${dut2} | ${dut2_if1} | ${subid}
-| | ... | ${outer_vlan_id} | ${inner_vlan_id} | ${type_subif}
-| | And Configure L2 tag rewrite method on interfaces
-| | ... | ${dut1} | ${subif_index_1} | ${dut2} | ${subif_index_2}
-| | ... | ${tag_rewrite}
-| | 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}
-| | ... | ${framesize} | ${traffic_profile}
-
-| tc03-9000B-1t1c-dot1ad-l2xcbase-ndrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2XC with 802.1ad 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 138458pps.
-| | [Tags] | 9000B | 1T1C | STHREAD
-| | ${framesize}= | Set Variable | ${9000}
-| | ${rate}= | Set Variable | 138458pps
-| | 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 Set interfaces in path in 3-node circular topology up
-| | When Initialize VLAN sub-interfaces in 3-node circular topology
-| | ... | ${dut1} | ${dut1_if2} | ${dut2} | ${dut2_if1} | ${subid}
-| | ... | ${outer_vlan_id} | ${inner_vlan_id} | ${type_subif}
-| | And Configure L2 tag rewrite method on interfaces
-| | ... | ${dut1} | ${subif_index_1} | ${dut2} | ${subif_index_2}
-| | ... | ${tag_rewrite}
-| | 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}
-| | ... | ${framesize} | ${traffic_profile}
-
-| tc04-64B-2t2c-dot1ad-l2xcbase-ndrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2XC with 802.1ad config with 2 thread, 2 phy core, \
-| | ... | 1 receive queue per NIC port. [Ver] Verify ref-NDR for 64 Byte
-| | ... | frames using single trial throughput test at 2x 8.2mpps.
-| | [Tags] | 64B | 2T2C | MTHREAD
-| | ${framesize}= | Set Variable | ${64}
-| | ${rate}= | Set Variable | 8.2mpps
-| | 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 Set interfaces in path in 3-node circular topology up
-| | When Initialize VLAN sub-interfaces in 3-node circular topology
-| | ... | ${dut1} | ${dut1_if2} | ${dut2} | ${dut2_if1} | ${subid}
-| | ... | ${outer_vlan_id} | ${inner_vlan_id} | ${type_subif}
-| | And Configure L2 tag rewrite method on interfaces
-| | ... | ${dut1} | ${subif_index_1} | ${dut2} | ${subif_index_2}
-| | ... | ${tag_rewrite}
-| | 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}
-| | ... | ${framesize} | ${traffic_profile}
-
-| tc05-1514B-2t2c-dot1ad-l2xcbase-ndrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2XC with 802.1ad config with 2 thread, 2 phy core, \
-| | ... | 1 receive queue per NIC port. [Ver] Verify ref-NDR for 1514 Byte
-| | ... | frames using single trial throughput test at 2x 810635pps.
-| | [Tags] | 1514B | 2T2C | MTHREAD
-| | ${framesize}= | Set Variable | ${1514}
-| | ${rate}= | Set Variable | 810635pps
-| | 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 Set interfaces in path in 3-node circular topology up
-| | When Initialize VLAN sub-interfaces in 3-node circular topology
-| | ... | ${dut1} | ${dut1_if2} | ${dut2} | ${dut2_if1} | ${subid}
-| | ... | ${outer_vlan_id} | ${inner_vlan_id} | ${type_subif}
-| | And Configure L2 tag rewrite method on interfaces
-| | ... | ${dut1} | ${subif_index_1} | ${dut2} | ${subif_index_2}
-| | ... | ${tag_rewrite}
-| | 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}
-| | ... | ${framesize} | ${traffic_profile}
-
-| tc06-9000B-2t2c-dot1ad-l2xcbase-ndrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2XC with 802.1ad config with 2 thread, 2 phy core, \
-| | ... | 1 receive queue per NIC port. [Ver] Verify ref-NDR for 9000 Byte
-| | ... | frames using single trial throughput test at 2x 138458pps.
-| | [Tags] | 9000B | 2T2C | MTHREAD
-| | ${framesize}= | Set Variable | ${9000}
-| | ${rate}= | Set Variable | 138458pps
-| | 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 Set interfaces in path in 3-node circular topology up
-| | When Initialize VLAN sub-interfaces in 3-node circular topology
-| | ... | ${dut1} | ${dut1_if2} | ${dut2} | ${dut2_if1} | ${subid}
-| | ... | ${outer_vlan_id} | ${inner_vlan_id} | ${type_subif}
-| | And Configure L2 tag rewrite method on interfaces
-| | ... | ${dut1} | ${subif_index_1} | ${dut2} | ${subif_index_2}
-| | ... | ${tag_rewrite}
-| | 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}
-| | ... | ${framesize} | ${traffic_profile}
-
-| tc07-64B-4t4c-dot1ad-l2xcbase-ndrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2XC with 802.1ad config with 4 thread, 4 phy core, \
-| | ... | 2 receive queue per NIC port. [Ver] Verify ref-NDR for 64 Byte
-| | ... | frames using single trial throughput test at 2x 8.6mpps.
-| | [Tags] | 64B | 4T4C | MTHREAD
-| | ${framesize}= | Set Variable | ${64}
-| | ${rate}= | Set Variable | 8.6mpps
-| | 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 Set interfaces in path in 3-node circular topology up
-| | When Initialize VLAN sub-interfaces in 3-node circular topology
-| | ... | ${dut1} | ${dut1_if2} | ${dut2} | ${dut2_if1} | ${subid}
-| | ... | ${outer_vlan_id} | ${inner_vlan_id} | ${type_subif}
-| | And Configure L2 tag rewrite method on interfaces
-| | ... | ${dut1} | ${subif_index_1} | ${dut2} | ${subif_index_2}
-| | ... | ${tag_rewrite}
-| | 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}
-| | ... | ${framesize} | ${traffic_profile}
-
-| tc08-1514B-4t4c-dot1ad-l2xcbase-ndrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2XC with 802.1ad config with 4 thread, 4 phy core, \
-| | ... | 2 receive queue per NIC port. [Ver] Verify ref-NDR for 1514 Byte
-| | ... | frames using single trial throughput test at 2x 810635pps.
-| | [Tags] | 1514B | 4T4C | MTHREAD
-| | ${framesize}= | Set Variable | ${1514}
-| | ${rate}= | Set Variable | 810635pps
-| | 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 Set interfaces in path in 3-node circular topology up
-| | When Initialize VLAN sub-interfaces in 3-node circular topology
-| | ... | ${dut1} | ${dut1_if2} | ${dut2} | ${dut2_if1} | ${subid}
-| | ... | ${outer_vlan_id} | ${inner_vlan_id} | ${type_subif}
-| | And Configure L2 tag rewrite method on interfaces
-| | ... | ${dut1} | ${subif_index_1} | ${dut2} | ${subif_index_2}
-| | ... | ${tag_rewrite}
-| | 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}
-| | ... | ${framesize} | ${traffic_profile}
-
-| tc09-9000B-4t4c-dot1ad-l2xcbase-ndrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2XC with 802.1ad config with 4 thread, 4 phy core, \
-| | ... | 2 receive queue per NIC port. [Ver] Verify ref-NDR for 9000 Byte
-| | ... | frames using single trial throughput test at 2x 138458pps.
-| | [Tags] | 9000B | 4T4C | MTHREAD
-| | ${framesize}= | Set Variable | ${9000}
-| | ${rate}= | Set Variable | 138458pps
-| | 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 Set interfaces in path in 3-node circular topology up
-| | When Initialize VLAN sub-interfaces in 3-node circular topology
-| | ... | ${dut1} | ${dut1_if2} | ${dut2} | ${dut2_if1} | ${subid}
-| | ... | ${outer_vlan_id} | ${inner_vlan_id} | ${type_subif}
-| | And Configure L2 tag rewrite method on interfaces
-| | ... | ${dut1} | ${subif_index_1} | ${dut2} | ${subif_index_2}
-| | ... | ${tag_rewrite}
-| | 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}
-| | ... | ${framesize} | ${traffic_profile}
diff --git a/tests/vpp/perf/l2/10ge2p1x520-dot1q-l2xcbase-ndrchk.robot b/tests/vpp/perf/l2/10ge2p1x520-dot1q-l2xcbase-ndrchk.robot
deleted file mode 100644
index ae3f2d4364..0000000000
--- a/tests/vpp/perf/l2/10ge2p1x520-dot1q-l2xcbase-ndrchk.robot
+++ /dev/null
@@ -1,266 +0,0 @@
-# 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:
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-*** Settings ***
-| Resource | resources/libraries/robot/performance/performance_setup.robot
-| Resource | resources/libraries/robot/l2/tagging.robot
-| ...
-| Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRCHK
-| ... | NIC_Intel-X520-DA2 | L2XCFWD | BASE | DOT1Q
-| ...
-| Suite Setup | Set up 3-node performance topology with DUT's NIC model
-| ... | L2 | Intel-X520-DA2
-| 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 L2XC with 802.1q verify test cases*
-| ...
-| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology
-| ... | with single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 cross connect. 802.1q
-| ... | tagging is applied on link between DUT1 and DUT2.
-| ... | *[Cfg] DUT configuration:* DUT1 and DUT2 are configured with L2 cross-
-| ... | connect. DUT1 and DUT2 tested with 2p10GE NIC X520 Niantic by Intel.
-| ... | *[Ver] TG verification:* In short performance tests, TG verifies
-| ... | DUTs' throughput at ref-NDR (reference Non Drop Rate) with zero packet
-| ... | loss tolerance. Ref-NDR value is periodically updated acording to
-| ... | formula: ref-NDR = 0.9x NDR, where NDR is found in RFC2544 long
-| ... | performance tests for the same DUT configuration. Test packets are
-| ... | generated by TG on links to DUTs. TG traffic profile contains two L3
-| ... | flow-groups (flow-group per direction, 253 flows per flow-group) with
-| ... | all packets containing Ethernet header, IPv4 header with IP protocol=61
-| ... | and static payload. MAC addresses are matching MAC addresses of the
-| ... | TG node interfaces.
-| ... | *[Ref] Applicable standard specifications:* RFC2544.
-
-*** Variables ***
-| ${subid}= | 10
-| ${tag_rewrite}= | pop-1
-# Traffic profile:
-| ${traffic_profile} | trex-sl-3n-ethip4-ip4src254
-
-*** Test Cases ***
-| tc01-64B-1t1c-dot1q-l2xcbase-ndrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2XC 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 4.0mpps.
-| | [Tags] | 64B | 1T1C | STHREAD
-| | ${framesize}= | Set Variable | ${64}
-| | ${rate}= | Set Variable | 4.0mpps
-| | 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 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 Configure L2 tag rewrite method on interfaces
-| | ... | ${dut1} | ${subif_index_1} | ${dut2} | ${subif_index_2}
-| | ... | ${tag_rewrite}
-| | 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}
-| | ... | ${framesize} | ${traffic_profile}
-
-| tc02-1518B-1t1c-dot1q-l2xcbase-ndrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2XC 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 720000pps.
-| | [Tags] | 1518B | 1T1C | STHREAD
-| | ${framesize}= | Set Variable | ${1518}
-| | ${rate}= | Set Variable | 720000pps
-| | 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 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 Configure L2 tag rewrite method on interfaces
-| | ... | ${dut1} | ${subif_index_1} | ${dut2} | ${subif_index_2}
-| | ... | ${tag_rewrite}
-| | 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}
-| | ... | ${framesize} | ${traffic_profile}
-
-| tc03-9000B-1t1c-dot1q-l2xcbase-ndrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2XC 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 120000pps.
-| | [Tags] | 9000B | 1T1C | STHREAD
-| | ${framesize}= | Set Variable | ${9000}
-| | ${rate}= | Set Variable | 120000pps
-| | 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 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 Configure L2 tag rewrite method on interfaces
-| | ... | ${dut1} | ${subif_index_1} | ${dut2} | ${subif_index_2}
-| | ... | ${tag_rewrite}
-| | 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}
-| | ... | ${framesize} | ${traffic_profile}
-
-| tc04-64B-2t2c-dot1q-l2xcbase-ndrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2XC 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 8.1mpps.
-| | [Tags] | 64B | 2T2C | MTHREAD
-| | ${framesize}= | Set Variable | ${64}
-| | ${rate}= | Set Variable | 8.1mpps
-| | 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 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 Configure L2 tag rewrite method on interfaces
-| | ... | ${dut1} | ${subif_index_1} | ${dut2} | ${subif_index_2}
-| | ... | ${tag_rewrite}
-| | 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}
-| | ... | ${framesize} | ${traffic_profile}
-
-| tc05-1518B-2t2c-dot1q-l2xcbase-ndrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2XC 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 720000pps.
-| | [Tags] | 1518B | 2T2C | MTHREAD
-| | ${framesize}= | Set Variable | ${1518}
-| | ${rate}= | Set Variable | 720000pps
-| | 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 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 Configure L2 tag rewrite method on interfaces
-| | ... | ${dut1} | ${subif_index_1} | ${dut2} | ${subif_index_2}
-| | ... | ${tag_rewrite}
-| | 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}
-| | ... | ${framesize} | ${traffic_profile}
-
-| tc06-9000B-2t2c-dot1q-l2xcbase-ndrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2XC 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 120000pps.
-| | [Tags] | 9000B | 2T2C | MTHREAD
-| | ${framesize}= | Set Variable | ${9000}
-| | ${rate}= | Set Variable | 120000pps
-| | 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 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 Configure L2 tag rewrite method on interfaces
-| | ... | ${dut1} | ${subif_index_1} | ${dut2} | ${subif_index_2}
-| | ... | ${tag_rewrite}
-| | 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}
-| | ... | ${framesize} | ${traffic_profile}
-
-| tc07-64B-4t4c-dot1q-l2xcbase-ndrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2XC 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 10.3mpps.
-| | [Tags] | 64B | 4T4C | MTHREAD
-| | ${framesize}= | Set Variable | ${64}
-| | ${rate}= | Set Variable | 10.3mpps
-| | 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 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 Configure L2 tag rewrite method on interfaces
-| | ... | ${dut1} | ${subif_index_1} | ${dut2} | ${subif_index_2}
-| | ... | ${tag_rewrite}
-| | 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}
-| | ... | ${framesize} | ${traffic_profile}
-
-| tc08-1518B-4t4c-dot1q-l2xcbase-ndrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2XC 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 720000pps.
-| | [Tags] | 1518B | 4T4C | MTHREAD
-| | ${framesize}= | Set Variable | ${1518}
-| | ${rate}= | Set Variable | 720000pps
-| | 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 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 Configure L2 tag rewrite method on interfaces
-| | ... | ${dut1} | ${subif_index_1} | ${dut2} | ${subif_index_2}
-| | ... | ${tag_rewrite}
-| | 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}
-| | ... | ${framesize} | ${traffic_profile}
-
-| tc09-9000B-4t4c-dot1q-l2xcbase-ndrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2XC 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 120000pps.
-| | [Tags] | 9000B | 4T4C | MTHREAD
-| | ${framesize}= | Set Variable | ${9000}
-| | ${rate}= | Set Variable | 120000pps
-| | 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 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 Configure L2 tag rewrite method on interfaces
-| | ... | ${dut1} | ${subif_index_1} | ${dut2} | ${subif_index_2}
-| | ... | ${tag_rewrite}
-| | 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}
-| | ... | ${framesize} | ${traffic_profile}
diff --git a/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-ndrchk.robot b/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-ndrchk.robot
deleted file mode 100644
index 351216235a..0000000000
--- a/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-ndrchk.robot
+++ /dev/null
@@ -1,192 +0,0 @@
-# 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:
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-*** Settings ***
-| Resource | resources/libraries/robot/performance/performance_setup.robot
-| Library | resources.libraries.python.NodePath
-| ...
-| Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRCHK
-| ... | 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 | 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
-| ... | with single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 switching of IPv4.
-| ... | *[Cfg] DUT configuration:* DUT1 and DUT2 are configured with L2 bridge-
-| ... | domain and MAC learning enabled. DUT1 and DUT2 tested with 2p10GE NIC
-| ... | X520 Niantic by Intel.
-| ... | *[Ver] TG verification:* In short performance tests, TG verifies
-| ... | DUTs' throughput at ref-NDR (reference Non Drop Rate) with zero packet
-| ... | loss tolerance. Ref-NDR value is periodically updated acording to
-| ... | formula: ref-NDR = 0.9x NDR, where NDR is found in RFC2544 long
-| ... | performance tests for the same DUT configuration. Test packets are
-| ... | generated by TG on links to DUTs. TG traffic profile contains two L3
-| ... | flow-groups (flow-group per direction, 253 flows per flow-group) with
-| ... | all packets containing Ethernet header, IPv4 header with IP protocol=61
-| ... | and static payload. MAC addresses are matching MAC addresses of the
-| ... | 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 4.0mpps.
-| | [Tags] | 64B | 1T1C | STHREAD
-| | ${framesize}= | Set Variable | ${64}
-| | ${rate}= | Set Variable | 4.0mpps
-| | 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] | 1518B | 1T1C | STHREAD
-| | ${framesize}= | Set Variable | ${1518}
-| | ${rate}= | Set Variable | 812743pps
-| | 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] | 9000B | 1T1C | STHREAD
-| | ${framesize}= | Set Variable | ${9000}
-| | ${rate}= | Set Variable | 138580pps
-| | 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 9.4mpps.
-| | [Tags] | 64B | 2T2C | MTHREAD
-| | ${framesize}= | Set Variable | ${64}
-| | ${rate}= | Set Variable | 9.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] | 1518B | 2T2C | MTHREAD
-| | ${framesize}= | Set Variable | ${1518}
-| | ${rate}= | Set Variable | 812743pps
-| | 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] | 9000B | 2T2C | MTHREAD
-| | ${framesize}= | Set Variable | ${9000}
-| | ${rate}= | Set Variable | 138580pps
-| | 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 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] | 1518B | 4T4C | MTHREAD
-| | ${framesize}= | Set Variable | ${1518}
-| | ${rate}= | Set Variable | 812743pps
-| | 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] | 9000B | 4T4C | MTHREAD
-| | ${framesize}= | Set Variable | ${9000}
-| | ${rate}= | Set Variable | 138580pps
-| | 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}
diff --git a/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-pdrchk.robot b/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-pdrchk.robot
deleted file mode 100644
index 257efc93f6..0000000000
--- a/tests/vpp/perf/l2/10ge2p1x520-eth-l2bdbasemaclrn-pdrchk.robot
+++ /dev/null
@@ -1,184 +0,0 @@
-# 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:
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-*** Settings ***
-| Resource | resources/libraries/robot/performance/performance_setup.robot
-| Library | resources.libraries.python.NodePath
-| ...
-| Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | PDRCHK
-| ... | 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 | Tear down 3-node performance topology
-| ...
-| Test Setup | Set up performance test
-| Test Teardown | Tear down performance pdrchk test
-| ...
-| Documentation | *Reference PDR throughput L2BD verify test cases*
-| ...
-| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology
-| ... | with single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 switching of IPv4.
-| ... | *[Cfg] DUT configuration:* DUT1 and DUT2 are configured with L2 bridge-
-| ... | domain and MAC learning enabled. DUT1 and DUT2 tested with 2p10GE NIC
-| ... | X520 Niantic by Intel.
-| ... | *[Ver] TG verification:* In short performance tests, TG verifies
-| ... | DUTs' throughput at ref-PDR (reference Non Drop Rate) with zero packet
-| ... | loss tolerance. Ref-PDR value is periodically updated acording to
-| ... | formula: ref-PDR = 0.9x PDR, where PDR is found in RFC2544 long
-| ... | performance tests for the same DUT configuration. Test packets are
-| ... | generated by TG on links to DUTs. TG traffic profile contains two L3
-| ... | flow-groups (flow-group per direction, 254 flows per flow-group) with
-| ... | all packets containing Ethernet header, IPv4 header with IP protocol=61
-| ... | and static payload. MAC addresses are matching MAC addresses of the
-| ... | TG node interfaces.
-| ... | *[Ref] Applicable standard specifications:* RFC2544.
-
-*** Variables ***
-# Traffic profile:
-| ${traffic_profile} | trex-sl-3n-ethip4-ip4src254
-
-*** Keywords ***
-| Check PDR for L2 bridge domain
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD config with ${wt} thread, ${wt} phy core,\
-| | ... | ${rxq} receive queue per NIC port.
-| | ... | [Ver] Verify ref-PDR for ${framesize} Byte frames using single trial\
-| | ... | throughput test at 2x ${rate}.
-| | ...
-| | [Arguments] | ${framesize} | ${rate} | ${wt} | ${rxq}
-| | ...
-| | # Test Variables required for test and test teardown
-| | Set Test Variable | ${framesize}
-| | Set Test Variable | ${rate}
-| | ${get_framesize}= | Get Frame Size | ${framesize}
-| | ...
-| | Given Add '${wt}' worker threads and '${rxq}' rxqueues in 3-node single-link circular topology
-| | And Add PCI devices to DUTs in 3-node single link topology
-| | And Run Keyword If | ${get_framesize} < ${1522}
-| | ... | 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 partial loss | ${perf_trial_duration}
-| | ... | ${rate} | ${framesize} | ${traffic_profile}
-| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
-
-*** Test Cases ***
-| tc01-64B-1t1c-eth-l2bdbasemaclrn-pdrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD config with 1 thread, 1 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Verify ref-PDR for 64 Byte frames using single trial\
-| | ... | throughput test at 2x ${rate}.
-| | ...
-| | [Tags] | 64B | 1T1C | STHREAD
-| | ...
-| | [Template] | Check PDR for L2 bridge domain
-| | framesize=${64} | rate=4.0mpps | wt=1 | rxq=1
-
-| tc02-1518B-1t1c-eth-l2bdbasemaclrn-pdrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD config with 1 thread, 1 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Verify ref-PDR for 1518 Byte frames using single trial\
-| | ... | throughput test at 2x ${rate}.
-| | ...
-| | [Tags] | 1518B | 1T1C | STHREAD
-| | ...
-| | [Template] | Check PDR for L2 bridge domain
-| | framesize=${1518} | rate=772105pps | wt=1 | rxq=1
-
-| tc03-9000B-1t1c-eth-l2bdbasemaclrn-pdrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD config with 1 thread, 1 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Verify ref-PDR for 9000 Byte frames using single trial\
-| | ... | throughput test at 2x ${rate}.
-| | ...
-| | [Tags] | 9000B | 1T1C | STHREAD
-| | ...
-| | [Template] | Check PDR for L2 bridge domain
-| | framesize=${9000} | rate=110000pps | wt=1 | rxq=1
-
-| tc04-64B-2t2c-eth-l2bdbasemaclrn-pdrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD config with 2 thread, 2 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Verify ref-PDR for 64 Byte frames using single trial\
-| | ... | throughput test at 2x ${rate}.
-| | ...
-| | [Tags] | 64B | 2T2C | MTHREAD
-| | ...
-| | [Template] | Check PDR for L2 bridge domain
-| | framesize=${64} | rate=9.4mpps | wt=2 | rxq=1
-
-| tc05-1518B-2t2c-eth-l2bdbasemaclrn-pdrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD config with 2 thread, 2 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Verify ref-PDR for 1518 Byte frames using single trial\
-| | ... | throughput test at 2x ${rate}.
-| | ...
-| | [Tags] | 1518B | 2T2C | MTHREAD
-| | ...
-| | [Template] | Check PDR for L2 bridge domain
-| | framesize=${1518} | rate=812743pps | wt=2 | rxq=1
-
-| tc06-9000B-2t2c-eth-l2bdbasemaclrn-pdrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD config with 2 thread, 2 phy core,\
-| | ... | 1 receive queue per NIC port.
-| | ... | [Ver] Verify ref-PDR for 9000 Byte frames using single trial\
-| | ... | throughput test at 2x ${rate}.
-| | ...
-| | [Tags] | 9000B | 2T2C | MTHREAD
-| | ...
-| | [Template] | Check PDR for L2 bridge domain
-| | framesize=${9000} | rate=100000pps | wt=2 | rxq=1
-
-| tc07-64B-4t4c-eth-l2bdbasemaclrn-pdrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD config with 4 thread, 4 phy core,\
-| | ... | 2 receive queue per NIC port.
-| | ... | [Ver] Verify ref-PDR for 64 Byte frames using single trial\
-| | ... | throughput test at 2x ${rate}.
-| | ...
-| | [Tags] | 64B | 4T4C | MTHREAD
-| | ...
-| | [Template] | Check PDR for L2 bridge domain
-| | framesize=${64} | rate=10.4mpps | wt=4 | rxq=2
-
-| tc08-1518B-4t4c-eth-l2bdbasemaclrn-pdrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD config with 4 thread, 4 phy core,\
-| | ... | 2 receive queue per NIC port.
-| | ... | [Ver] Verify ref-PDR for 1518 Byte frames using single trial\
-| | ... | throughput test at 2x ${rate}.
-| | ...
-| | [Tags] | 1518B | 4T4C | MTHREAD
-| | ...
-| | [Template] | Check PDR for L2 bridge domain
-| | framesize=${1518} | rate=812743pps | wt=4 | rxq=2
-
-| tc09-9000B-4t4c-eth-l2bdbasemaclrn-pdrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD config with 4 thread, 4 phy core,\
-| | ... | 2 receive queue per NIC port.
-| | ... | [Ver] Verify ref-PDR for 9000 Byte frames using single trial\
-| | ... | throughput test at 2x ${rate}.
-| | ...
-| | [Tags] | 9000B | 4T4C | MTHREAD
-| | ...
-| | [Template] | Check PDR for L2 bridge domain
-| | framesize=${9000} | rate=138580pps | wt=4 | rxq=2
diff --git a/tests/vpp/perf/l2/10ge2p1x520-eth-l2xcbase-ndrchk.robot b/tests/vpp/perf/l2/10ge2p1x520-eth-l2xcbase-ndrchk.robot
deleted file mode 100644
index 115df06e97..0000000000
--- a/tests/vpp/perf/l2/10ge2p1x520-eth-l2xcbase-ndrchk.robot
+++ /dev/null
@@ -1,192 +0,0 @@
-# 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:
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-*** Settings ***
-| Resource | resources/libraries/robot/performance/performance_setup.robot
-| Library | resources.libraries.python.InterfaceUtil
-| Library | resources.libraries.python.NodePath
-| ...
-| Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRCHK
-| ... | NIC_Intel-X520-DA2 | ETH | L2XCFWD | BASE | L2XCBASE
-| ...
-| Suite Setup | Set up 3-node performance topology with DUT's NIC model
-| ... | L2 | Intel-X520-DA2
-| 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 L2XC verify test cases*
-| ...
-| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology
-| ... | with single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 cross connect.
-| ... | *[Cfg] DUT configuration:* DUT1 and DUT2 are configured with L2 cross-
-| ... | connect. DUT1 and DUT2 tested with 2p10GE NIC X520 Niantic by Intel.
-| ... | *[Ver] TG verification:* In short performance tests, TG verifies
-| ... | DUTs' throughput at ref-NDR (reference Non Drop Rate) with zero packet
-| ... | loss tolerance. Ref-NDR value is periodically updated acording to
-| ... | formula: ref-NDR = 0.9x NDR, where NDR is found in RFC2544 long
-| ... | performance tests for the same DUT configuration. Test packets are
-| ... | generated by TG on links to DUTs. TG traffic profile contains two L3
-| ... | flow-groups (flow-group per direction, 253 flows per flow-group) with
-| ... | all packets containing Ethernet header, IPv4 header with IP protocol=61
-| ... | and static payload. MAC addresses are matching MAC addresses of the
-| ... | TG node interfaces.
-| ... | *[Ref] Applicable standard specifications:* RFC2544.
-
-*** Variables ***
-# Traffic profile:
-| ${traffic_profile} | trex-sl-3n-ethip4-ip4src254
-
-*** Test Cases ***
-| tc01-64B-1t1c-eth-l2xcbase-ndrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2XC 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 5.5mpps.
-| | [Tags] | 64B | 1T1C | STHREAD
-| | ${framesize}= | Set Variable | ${64}
-| | ${rate}= | Set Variable | 5.5mpps
-| | 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 xconnect in 3-node circular topology
-| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | ${traffic_profile}
-
-| tc02-1518B-1t1c-eth-l2xcbase-ndrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2XC 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] | 1518B | 1T1C | STHREAD
-| | ${framesize}= | Set Variable | ${1518}
-| | ${rate}= | Set Variable | 812743pps
-| | 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 xconnect in 3-node circular topology
-| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | ${traffic_profile}
-
-| tc03-9000B-1t1c-eth-l2xcbase-ndrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2XC 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] | 9000B | 1T1C | STHREAD
-| | ${framesize}= | Set Variable | ${9000}
-| | ${rate}= | Set Variable | 138580pps
-| | 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 xconnect in 3-node circular topology
-| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | ${traffic_profile}
-
-| tc04-64B-2t2c-eth-l2xcbase-ndrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2XC 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 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 xconnect in 3-node circular topology
-| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | ${traffic_profile}
-
-| tc05-1518B-2t2c-eth-l2xcbase-ndrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2XC 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] | 1518B | 2T2C | MTHREAD
-| | ${framesize}= | Set Variable | ${1518}
-| | ${rate}= | Set Variable | 812743pps
-| | 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 xconnect in 3-node circular topology
-| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | ${traffic_profile}
-
-| tc06-9000B-2t2c-eth-l2xcbase-ndrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2XC 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] | 9000B | 2T2C | MTHREAD
-| | ${framesize}= | Set Variable | ${9000}
-| | ${rate}= | Set Variable | 138580pps
-| | 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 xconnect in 3-node circular topology
-| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | ${traffic_profile}
-
-| tc07-64B-4t4c-eth-l2xcbase-ndrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2XC 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 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 xconnect in 3-node circular topology
-| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | ${traffic_profile}
-
-| tc08-1518B-4t4c-eth-l2xcbase-ndrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2XC 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] | 1518B | 4T4C | MTHREAD
-| | ${framesize}= | Set Variable | ${1518}
-| | ${rate}= | Set Variable | 812743pps
-| | 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 xconnect in 3-node circular topology
-| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | ${traffic_profile}
-
-| tc09-9000B-4t4c-eth-l2xcbase-ndrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2XC 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] | 9000B | 4T4C | MTHREAD
-| | ${framesize}= | Set Variable | ${9000}
-| | ${rate}= | Set Variable | 138580pps
-| | 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 xconnect in 3-node circular topology
-| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
-| | ... | ${framesize} | ${traffic_profile}
diff --git a/tests/vpp/perf/l2/10ge2p1x520-eth-l2xcbase-pdrchk.robot b/tests/vpp/perf/l2/10ge2p1x520-eth-l2xcbase-pdrchk.robot
deleted file mode 100644
index 85627f0ea7..0000000000
--- a/tests/vpp/perf/l2/10ge2p1x520-eth-l2xcbase-pdrchk.robot
+++ /dev/null
@@ -1,184 +0,0 @@
-# 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:
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-*** Settings ***
-| Resource | resources/libraries/robot/performance/performance_setup.robot
-| Library | resources.libraries.python.InterfaceUtil
-| Library | resources.libraries.python.NodePath
-| ...
-| Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | PDRCHK
-| ... | NIC_Intel-X520-DA2 | ETH | L2XCFWD | BASE | L2XCBASE
-| ...
-| Suite Setup | Set up 3-node performance topology with DUT's NIC model
-| ... | L2 | Intel-X520-DA2
-| Suite Teardown | Tear down 3-node performance topology
-| ...
-| Test Setup | Set up performance test
-| Test Teardown | Tear down performance pdrchk test
-| ...
-| Documentation | *Reference PDR throughput L2XC verify test cases*
-| ...
-| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology
-| ... | with single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 cross connect.
-| ... | *[Cfg] DUT configuration:* DUT1 and DUT2 are configured with L2 cross-
-| ... | connect. DUT1 and DUT2 tested with 2p10GE NIC X520 Niantic by Intel.
-| ... | *[Ver] TG verification:* In short performance tests, TG verifies
-| ... | DUTs' throughput at ref-PDR (reference Non Drop Rate) with zero packet
-| ... | loss tolerance. Ref-PDR value is periodically updated acording to
-| ... | formula: ref-PDR = 0.9x PDR, where PDR is found in RFC2544 long
-| ... | performance tests for the same DUT configuration. Test packets are
-| ... | generated by TG on links to DUTs. TG traffic profile contains two L3
-| ... | flow-groups (flow-group per direction, 254 flows per flow-group) with
-| ... | all packets containing Ethernet header, IPv4 header with IP protocol=61
-| ... | and static payload. MAC addresses are matching MAC addresses of the
-| ... | TG node interfaces.
-| ... | *[Ref] Applicable standard specifications:* RFC2544.
-
-*** Variables ***
-# Traffic profile:
-| ${traffic_profile} | trex-sl-3n-ethip4-ip4src254
-
-*** Keywords ***
-| Check PDR for L2 xconnect
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2XC config with ${wt} thread, ${wt} phy core,\
-| | ... | ${rxq} receive queue per NIC port.
-| | ... | [Ver] Verify ref-PDR for ${framesize} Byte frames using single trial\
-| | ... | throughput test at 2x ${rate}.
-| | ...
-| | [Arguments] | ${framesize} | ${rate} | ${wt} | ${rxq}
-| | ...
-| | # Test Variables required for test and test teardown
-| | Set Test Variable | ${framesize}
-| | Set Test Variable | ${rate}
-| | ${get_framesize}= | Get Frame Size | ${framesize}
-| | ...
-| | Given Add '${wt}' worker threads and '${rxq}' rxqueues in 3-node single-link circular topology
-| | And Add PCI devices to DUTs in 3-node single link topology
-| | And Run Keyword If | ${get_framesize} < ${1522}
-| | ... | Add no multi seg to all DUTs
-| | And Apply startup configuration on all VPP DUTs
-| | And Initialize L2 xconnect in 3-node circular topology
-| | Then Traffic should pass with partial loss | ${perf_trial_duration}
-| | ... | ${rate} | ${framesize} | ${traffic_profile}
-| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
-
-*** Test Cases ***
-| tc01-64B-1t1c-eth-l2xcbase-pdrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2XC 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 ${rate}.
-| | ...
-| | [Tags] | 64B | 1T1C | STHREAD
-| | ...
-| | [Template] | Check PDR for L2 xconnect
-| | framesize=${64} | rate=5.5mpps | wt=1 | rxq=1
-
-| tc02-1518B-1t1c-eth-l2xcbase-pdrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2XC 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 ${rate}.
-| | ...
-| | [Tags] | 1518B | 1T1C | STHREAD
-| | ...
-| | [Template] | Check PDR for L2 xconnect
-| | framesize=${1518} | rate=812743pps | wt=1 | rxq=1
-
-| tc03-9000B-1t1c-eth-l2xcbase-pdrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2XC 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 ${rate}.
-| | ...
-| | [Tags] | 9000B | 1T1C | STHREAD
-| | ...
-| | [Template] | Check PDR for L2 xconnect
-| | framesize=${9000} | rate=138580pps | wt=1 | rxq=1
-
-| tc04-64B-2t2c-eth-l2xcbase-pdrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2XC 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 ${rate}.
-| | ...
-| | [Tags] | 64B | 2T2C | MTHREAD
-| | ...
-| | [Template] | Check PDR for L2 xconnect
-| | framesize=${64} | rate=10.4mpps | wt=2 | rxq=1
-
-| tc05-1518B-2t2c-eth-l2xcbase-pdrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2XC 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 ${rate}.
-| | ...
-| | [Tags] | 1518B | 2T2C | MTHREAD
-| | ...
-| | [Template] | Check PDR for L2 xconnect
-| | framesize=${1518} | rate=812743pps | wt=2 | rxq=1
-
-| tc06-9000B-2t2c-eth-l2xcbase-pdrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2XC 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 ${rate}.
-| | ...
-| | [Tags] | 9000B | 2T2C | MTHREAD
-| | ...
-| | [Template] | Check PDR for L2 xconnect
-| | framesize=${9000} | rate=100000pps | wt=2 | rxq=1
-
-| tc07-64B-4t4c-eth-l2xcbase-pdrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2XC 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 ${rate}.
-| | ...
-| | [Tags] | 64B | 4T4C | MTHREAD
-| | ...
-| | [Template] | Check PDR for L2 xconnect
-| | framesize=${64} | rate=10.4mpps | wt=4 | rxq=2
-
-| tc08-1518B-4t4c-eth-l2xcbase-pdrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2XC 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 ${rate}.
-| | ...
-| | [Tags] | 1518B | 4T4C | MTHREAD
-| | ...
-| | [Template] | Check PDR for L2 xconnect
-| | framesize=${1518} | rate=812743pps | wt=4 | rxq=2
-
-| tc09-9000B-4t4c-eth-l2xcbase-pdrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2XC 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 ${rate}.
-| | ...
-| | [Tags] | 9000B | 4T4C | MTHREAD
-| | ...
-| | [Template] | Check PDR for L2 xconnect
-| | framesize=${9000} | rate=138580pps | wt=4 | rxq=2
diff --git a/tests/vpp/perf/vm_vhost/10ge2p1x520-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-pdrchk.robot b/tests/vpp/perf/vm_vhost/10ge2p1x520-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-pdrchk.robot
deleted file mode 100644
index ac99167eb3..0000000000
--- a/tests/vpp/perf/vm_vhost/10ge2p1x520-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-pdrchk.robot
+++ /dev/null
@@ -1,213 +0,0 @@
-# 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:
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-*** Settings ***
-| Resource | resources/libraries/robot/performance/performance_setup.robot
-| Library | resources.libraries.python.QemuUtils
-| ...
-| Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | PDRCHK
-| ... | NIC_Intel-X520-DA2 | DOT1Q | L2BDMACLRN | BASE | VHOST | VM | VHOST_1024
-| ...
-| Suite Setup | Set up 3-node performance topology with DUT's NIC model
-| ... | L2 | Intel-X520-DA2
-| Suite Teardown | Tear down 3-node performance topology
-| ...
-| Test Setup | Set up performance test
-| Test Teardown | Tear down performance pdrchk test with vhost and VM with dpdk-testpmd
-| ... | ${rate}pps | ${framesize} | ${traffic_profile}
-| ... | dut1_node=${dut1} | dut1_vm_refs=${dut1_vm_refs}
-| ... | dut2_node=${dut2} | dut2_vm_refs=${dut2_vm_refs}
-| ...
-| Documentation | *RFC2544: Packet throughput L2BD test cases with vhost*
-| ...
-| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology
-| ... | with single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 switching of IPv4. 802.1q
-| ... | tagging is applied on link between DUT1 and DUT2.
-| ... | *[Cfg] DUT configuration:* DUT1 and DUT2 are configured with L2 bridge-
-| ... | domain and MAC learning enabled. Qemu Guest is connected to VPP via
-| ... | vhost-user interfaces. Guest is running DPDK testpmd interconnecting
-| ... | vhost-user interfaces using 5 cores pinned to cpus 5-9 and 2048M
-| ... | memory. Testpmd is using socket-mem=1024M (512x2M hugepages), 5 cores
-| ... | (1 main core and 4 cores dedicated for io), forwarding mode is set to
-| ... | io, rxd/txd=256, burst=64. DUT1, DUT2 are tested with 2p10GE NIC X520
-| ... | Niantic by Intel.
-| ... | *[Ver] TG verification:* TG verifies throughput PDR (Partial Drop
-| ... | Rate) with non-zero packet loss tolerance (LT) expressed in percentage
-| ... | of packets transmitted. Ref-PDR value is periodically updated acording to
-| ... | formula: ref-PDR = 0.9x PDR, where PDR is found in RFC2544 long
-| ... | performance tests for the same DUT configuration. Test packets are
-| ... | generated by TG on links to DUTs. TG traffic profile contains two L3
-| ... | flow-groups (flow-group per direction, 253 flows per flow-group) with
-| ... | all packets containing Ethernet header, IPv4 header with IP protocol=61
-| ... | and static payload. MAC addresses are matching MAC addresses of the
-| ... | TG node interfaces.
-| ... | *[Ref] Applicable standard specifications:* RFC2544.
-
-*** Variables ***
-| ${perf_qemu_qsz}= | 1024
-| ${subid}= | 10
-| ${tag_rewrite}= | pop-1
-# Socket names
-| ${bd_id1}= | 1
-| ${bd_id2}= | 2
-| ${sock1}= | /tmp/sock-1-${bd_id1}
-| ${sock2}= | /tmp/sock-1-${bd_id2}
-# Traffic profile:
-| ${traffic_profile}= | trex-sl-3n-ethip4-ip4src254
-
-*** Keywords ***
-| Check PDR for L2 bridge domain with vhost and VM with dpdk-testpmd
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config with ${wt} thread, ${wt} phy\
-| | ... | core, ${rxq} receive queue per NIC port.
-| | ... | [Ver] Verify ref-PDR for ${framesize} Byte frames using single trial\
-| | ... | throughput test at 2x ${rate}.
-| | ...
-| | [Arguments] | ${framesize} | ${rate} | ${wt} | ${rxq}
-| | ...
-| | # Test Variables required for test and test teardown
-| | Set Test Variable | ${framesize}
-| | Set Test Variable | ${rate}
-| | ${get_framesize}= | Get Frame Size | ${framesize}
-| | ${dut1_vm_refs}= | Create Dictionary
-| | ${dut2_vm_refs}= | Create Dictionary
-| | Set Test Variable | ${dut1_vm_refs}
-| | Set Test Variable | ${dut2_vm_refs}
-| | ...
-| | Given Add '${wt}' worker threads and '${rxq}' rxqueues in 3-node single-link circular topology
-| | And Add PCI devices to DUTs in 3-node single link topology
-| | And Run Keyword If | ${get_framesize} < ${1522}
-| | ... | Add no multi seg to all DUTs
-| | And Apply startup configuration on all VPP DUTs
-| | When Initialize L2 bridge domains with Vhost-User and VLAN in a 3-node circular topology
-| | ... | ${bd_id1} | ${bd_id2} | ${sock1} | ${sock2} | ${subid}
-| | ... | ${tag_rewrite}
-| | ${vm1}= | And Configure guest VM with dpdk-testpmd connected via vhost-user
-| | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1
-| | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1}
-| | ${vm2}= | And Configure guest VM with dpdk-testpmd connected via vhost-user
-| | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
-| | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
-| | Then Traffic should pass with partial loss | ${perf_trial_duration}
-| | ... | ${rate} | ${framesize} | ${traffic_profile}
-| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
-
-*** Test Cases ***
-| tc01-64B-1t1c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-pdrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config with 1 thread, 1 phy\
-| | ... | core, 1 receive queue per NIC port.
-| | ... | [Ver] Verify ref-PDR for 64 Byte frames using single trial\
-| | ... | throughput test at 2x ${rate}.
-| | ...
-| | [Tags] | 64B | 1T1C | STHREAD
-| | ...
-| | [Template] | Check PDR for L2 bridge domain with vhost and VM with dpdk-testpmd
-| | framesize=${64} | rate=1.2mpps | wt=1 | rxq=1
-
-| tc02-1518B-1t1c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-pdrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config with 1 thread, 1 phy\
-| | ... | core, 1 receive queue per NIC port.
-| | ... | [Ver] Verify ref-PDR for 1518 Byte frames using single trial\
-| | ... | throughput test at 2x ${rate}.
-| | ...
-| | [Tags] | 1518B | 1T1C | STHREAD
-| | ...
-| | [Template] | Check PDR for L2 bridge domain with vhost and VM with dpdk-testpmd
-| | framesize=${1518} | rate=350000pps | wt=1 | rxq=1
-
-| tc03-IMIX-1t1c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-pdrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config with 1 thread, 1 phy\
-| | ... | core, 1 receive queue per NIC port.
-| | ... | [Ver] Verify ref-PDR for 64 Byte frames using single trial\
-| | ... | throughput test at 2x ${rate}.
-| | ...
-| | [Tags] | IMIX | 1T1C | STHREAD
-| | ...
-| | [Template] | Check PDR for L2 bridge domain with vhost and VM with dpdk-testpmd
-| | framesize=IMIX_v4_1 | rate=0.9mpps | wt=1 | rxq=1
-
-| tc04-64B-2t2c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-pdrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config with 2 threads, 2 phy\
-| | ... | cores, 1 receive queue per NIC port.
-| | ... | [Ver] Verify ref-PDR for 64 Byte frames using single trial\
-| | ... | throughput test at 2x ${rate}.
-| | ...
-| | [Tags] | 64B | 2T2C | MTHREAD
-| | ...
-| | [Template] | Check PDR for L2 bridge domain with vhost and VM with dpdk-testpmd
-| | framesize=${64} | rate=2.2mpps | wt=2 | rxq=1
-
-| tc05-1518B-2t2c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-pdrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config with 2 threads, 2 phy\
-| | ... | cores, 1 receive queue per NIC port.
-| | ... | [Ver] Verify ref-PDR for 1518 Byte frames using single trial\
-| | ... | throughput test at 2x ${rate}.
-| | ...
-| | [Tags] | 1518B | 2T2C | MTHREAD
-| | ...
-| | [Template] | Check PDR for L2 bridge domain with vhost and VM with dpdk-testpmd
-| | framesize=${1518} | rate=0.6mpps | wt=2 | rxq=1
-
-| tc06-IMIX-2t2c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-pdrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config with 2 threads, 2 phy\
-| | ... | cores, 1 receive queue per NIC port.
-| | ... | [Ver] Verify ref-PDR for 64 Byte frames using single trial\
-| | ... | throughput test at 2x ${rate}.
-| | ...
-| | [Tags] | IMIX | 2T2C | MTHREAD
-| | ...
-| | [Template] | Check PDR for L2 bridge domain with vhost and VM with dpdk-testpmd
-| | framesize=IMIX_v4_1 | rate=1.5pps | wt=2 | rxq=1
-
-| tc07-64B-4t4c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-pdrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config with 4 threads, 4 phy\
-| | ... | cores, 2 receive queues per NIC port.
-| | ... | [Ver] Verify ref-PDR for 64 Byte frames using single trial\
-| | ... | throughput test at 2x ${rate}.
-| | ...
-| | [Tags] | 64B | 4T4C | MTHREAD
-| | ...
-| | [Template] | Check PDR for L2 bridge domain with vhost and VM with dpdk-testpmd
-| | framesize=${64} | rate=3.4mpps | wt=4 | rxq=2
-
-| tc08-1518B-4t4c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-pdrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config with 4 threads, 4 phy\
-| | ... | cores, 2 receive queues per NIC port.
-| | ... | [Ver] Verify ref-PDR for 1518 Byte frames using single trial\
-| | ... | throughput test at 2x ${rate}.
-| | ...
-| | [Tags] | 1518B | 4T4C | MTHREAD
-| | ...
-| | [Template] | Check PDR for L2 bridge domain with vhost and VM with dpdk-testpmd
-| | framesize=${1518} | rate=0.7mpps | wt=4 | rxq=2
-
-| tc09-IMIX-4t4c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-pdrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config with 4 threads, 4 phy\
-| | ... | cores, 2 receive queues per NIC port.
-| | ... | [Ver] Verify ref-PDR for 64 Byte frames using single trial\
-| | ... | throughput test at 2x ${rate}.
-| | ...
-| | [Tags] | IMIX | 4T4C | MTHREAD
-| | ...
-| | [Template] | Check PDR for L2 bridge domain with vhost and VM with dpdk-testpmd
-| | framesize=IMIX_v4_1 | rate=2.2mpps | wt=4 | rxq=2
diff --git a/tests/vpp/perf/vm_vhost/10ge2p1x520-dot1q-l2xcbase-eth-2vhostvr1024-1vm-pdrchk.robot b/tests/vpp/perf/vm_vhost/10ge2p1x520-dot1q-l2xcbase-eth-2vhostvr1024-1vm-pdrchk.robot
deleted file mode 100644
index f05f80b427..0000000000
--- a/tests/vpp/perf/vm_vhost/10ge2p1x520-dot1q-l2xcbase-eth-2vhostvr1024-1vm-pdrchk.robot
+++ /dev/null
@@ -1,210 +0,0 @@
-# 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:
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-*** Settings ***
-| Resource | resources/libraries/robot/performance/performance_setup.robot
-| Library | resources.libraries.python.QemuUtils
-| ...
-| Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | PDRCHK
-| ... | NIC_Intel-X520-DA2 | DOT1Q | L2XCFWD | BASE | VHOST | VM | VHOST_1024
-| ...
-| Suite Setup | Set up 3-node performance topology with DUT's NIC model
-| ... | L2 | Intel-X520-DA2
-| Suite Teardown | Tear down 3-node performance topology
-| ...
-| Test Setup | Set up performance test
-| Test Teardown | Tear down performance pdrchk test with vhost and VM with dpdk-testpmd
-| ... | ${rate}pps | ${framesize} | ${traffic_profile}
-| ... | dut1_node=${dut1} | dut1_vm_refs=${dut1_vm_refs}
-| ... | dut2_node=${dut2} | dut2_vm_refs=${dut2_vm_refs}
-| ...
-| Documentation | *RFC2544: Packet throughput L2XC test cases with vhost*
-| ...
-| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology
-| ... | with single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 switching of IPv4. 802.1q
-| ... | tagging is applied on link between DUT1 and DUT2.
-| ... | *[Cfg] DUT configuration:* DUT1 and DUT2 are configured with L2 cross-
-| ... | connect. Qemu Guest is connected to VPP via
-| ... | vhost-user interfaces. Guest is running DPDK testpmd interconnecting
-| ... | vhost-user interfaces using 5 cores pinned to cpus 5-9 and 2048M
-| ... | memory. Testpmd is using socket-mem=1024M (512x2M hugepages), 5 cores
-| ... | (1 main core and 4 cores dedicated for io), forwarding mode is set to
-| ... | io, rxd/txd=256, burst=64. DUT1, DUT2 are tested with 2p10GE NIC X520
-| ... | Niantic by Intel.
-| ... | *[Ver] TG verification:* TG verifies throughput PDR (Partial Drop
-| ... | Rate) with non-zero packet loss tolerance (LT) expressed in percentage
-| ... | of packets transmitted. Ref-PDR value is periodically updated acording to
-| ... | formula: ref-PDR = 0.9x PDR, where PDR is found in RFC2544 long
-| ... | performance tests for the same DUT configuration. Test packets are
-| ... | generated by TG on links to DUTs. TG traffic profile contains two L3
-| ... | flow-groups (flow-group per direction, 253 flows per flow-group) with
-| ... | all packets containing Ethernet header, IPv4 header with IP protocol=61
-| ... | and static payload. MAC addresses are matching MAC addresses of the
-| ... | TG node interfaces.
-| ... | *[Ref] Applicable standard specifications:* RFC2544.
-
-*** Variables ***
-| ${perf_qemu_qsz}= | 1024
-| ${subid}= | 10
-| ${tag_rewrite}= | pop-1
-# Socket names
-| ${sock1}= | /tmp/sock-1
-| ${sock2}= | /tmp/sock-2
-# Traffic profile:
-| ${traffic_profile}= | trex-sl-3n-ethip4-ip4src254
-
-*** Keywords ***
-| Check PDR for L2XC with vhost and VM with dpdk-testpmd
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with ${wt} thread, ${wt} phy\
-| | ... | core, ${rxq} receive queue per NIC port.
-| | ... | [Ver] Verify ref-PDR for ${framesize} Byte frames using single trial\
-| | ... | throughput test at 2x ${rate}.
-| | ...
-| | [Arguments] | ${framesize} | ${rate} | ${wt} | ${rxq}
-| | ...
-| | # Test Variables required for test and test teardown
-| | Set Test Variable | ${framesize}
-| | Set Test Variable | ${rate}
-| | ${get_framesize}= | Get Frame Size | ${framesize}
-| | ${dut1_vm_refs}= | Create Dictionary
-| | ${dut2_vm_refs}= | Create Dictionary
-| | Set Test Variable | ${dut1_vm_refs}
-| | Set Test Variable | ${dut2_vm_refs}
-| | ...
-| | Given Add '${wt}' worker threads and '${rxq}' rxqueues in 3-node single-link circular topology
-| | And Add PCI devices to DUTs in 3-node single link topology
-| | And Run Keyword If | ${get_framesize} < ${1522}
-| | ... | Add no multi seg to all DUTs
-| | And Apply startup configuration on all VPP DUTs
-| | When Initialize L2 xconnect with Vhost-User and VLAN in 3-node circular topology
-| | ... | ${sock1} | ${sock2} | ${subid} | ${tag_rewrite}
-| | ${vm1}= | And Configure guest VM with dpdk-testpmd connected via vhost-user
-| | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1
-| | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1}
-| | ${vm2}= | And Configure guest VM with dpdk-testpmd connected via vhost-user
-| | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
-| | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
-| | Then Traffic should pass with partial loss | ${perf_trial_duration}
-| | ... | ${rate} | ${framesize} | ${traffic_profile}
-| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
-
-*** Test Cases ***
-| tc01-64B-1t1c-dot1q-l2xcbase-eth-2vhostvr1024-1vm-pdrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 1 thread, 1 phy\
-| | ... | core, 1 receive queue per NIC port.
-| | ... | [Ver] Verify ref-PDR for 64 Byte frames using single trial\
-| | ... | throughput test at 2x ${rate}.
-| | ...
-| | [Tags] | 64B | 1T1C | STHREAD
-| | ...
-| | [Template] | Check PDR for L2XC with vhost and VM with dpdk-testpmd
-| | framesize=${64} | rate=1.4mpps | wt=1 | rxq=1
-
-| tc02-1518B-1t1c-dot1q-l2xcbase-eth-2vhostvr1024-1vm-pdrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 1 thread, 1 phy\
-| | ... | core, 1 receive queue per NIC port.
-| | ... | [Ver] Verify ref-PDR for 1518 Byte frames using single trial\
-| | ... | throughput test at 2x ${rate}.
-| | ...
-| | [Tags] | 1518B | 1T1C | STHREAD
-| | ...
-| | [Template] | Check PDR for L2XC with vhost and VM with dpdk-testpmd
-| | framesize=${1518} | rate=330000pps | wt=1 | rxq=1
-
-| tc03-IMIX-1t1c-dot1q-l2xcbase-eth-2vhostvr1024-1vm-pdrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 1 thread, 1 phy\
-| | ... | core, 1 receive queue per NIC port.
-| | ... | [Ver] Verify ref-PDR for 64 Byte frames using single trial\
-| | ... | throughput test at 2x ${rate}.
-| | ...
-| | [Tags] | IMIX | 1T1C | STHREAD
-| | ...
-| | [Template] | Check PDR for L2XC with vhost and VM with dpdk-testpmd
-| | framesize=IMIX_v4_1 | rate=1.0mpps | wt=1 | rxq=1
-
-| tc04-64B-2t2c-dot1q-l2xcbase-eth-2vhostvr1024-1vm-pdrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 2 threads, 2 phy\
-| | ... | cores, 1 receive queue per NIC port.
-| | ... | [Ver] Verify ref-PDR for 64 Byte frames using single trial\
-| | ... | throughput test at 2x ${rate}.
-| | ...
-| | [Tags] | 64B | 2T2C | MTHREAD
-| | ...
-| | [Template] | Check PDR for L2XC with vhost and VM with dpdk-testpmd
-| | framesize=${64} | rate=1.4mpps | wt=2 | rxq=1
-
-| tc05-1518B-2t2c-dot1q-l2xcbase-eth-2vhostvr1024-1vm-pdrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 2 threads, 2 phy\
-| | ... | cores, 1 receive queue per NIC port.
-| | ... | [Ver] Verify ref-PDR for 1518 Byte frames using single trial\
-| | ... | throughput test at 2x ${rate}.
-| | ...
-| | [Tags] | 1518B | 2T2C | MTHREAD
-| | ...
-| | [Template] | Check PDR for L2XC with vhost and VM with dpdk-testpmd
-| | framesize=${1518} | rate=0.7mpps | wt=2 | rxq=1
-
-| tc06-IMIX-2t2c-dot1q-l2xcbase-eth-2vhostvr1024-1vm-pdrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 2 threads, 2 phy\
-| | ... | cores, 1 receive queue per NIC port.
-| | ... | [Ver] Verify ref-PDR for 64 Byte frames using single trial\
-| | ... | throughput test at 2x ${rate}.
-| | ...
-| | [Tags] | IMIX | 2T2C | MTHREAD
-| | ...
-| | [Template] | Check PDR for L2XC with vhost and VM with dpdk-testpmd
-| | framesize=IMIX_v4_1 | rate=1.6mpps | wt=2 | rxq=1
-
-| tc07-64B-4t4c-dot1q-l2xcbase-eth-2vhostvr1024-1vm-pdrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 4 threads, 4 phy\
-| | ... | cores, 2 receive queues per NIC port.
-| | ... | [Ver] Verify ref-PDR for 64 Byte frames using single trial\
-| | ... | throughput test at 2x ${rate}.
-| | ...
-| | [Tags] | 64B | 4T4C | MTHREAD
-| | ...
-| | [Template] | Check PDR for L2XC with vhost and VM with dpdk-testpmd
-| | framesize=${64} | rate=4.0mpps | wt=4 | rxq=2
-
-| tc08-1518B-4t4c-dot1q-l2xcbase-eth-2vhostvr1024-1vm-pdrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 4 threads, 4 phy\
-| | ... | cores, 2 receive queues per NIC port.
-| | ... | [Ver] Verify ref-PDR for 1518 Byte frames using single trial\
-| | ... | throughput test at 2x ${rate}.
-| | ...
-| | [Tags] | 1518B | 4T4C | MTHREAD
-| | ...
-| | [Template] | Check PDR for L2XC with vhost and VM with dpdk-testpmd
-| | framesize=${1518} | rate=0.7mpps | wt=4 | rxq=2
-
-| tc09-IMIX-4t4c-dot1q-l2xcbase-eth-2vhostvr1024-1vm-pdrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 4 threads, 4 phy\
-| | ... | cores, 2 receive queues per NIC port.
-| | ... | [Ver] Verify ref-PDR for 64 Byte frames using single trial\
-| | ... | throughput test at 2x ${rate}.
-| | ...
-| | [Tags] | IMIX | 4T4C | MTHREAD
-| | ...
-| | [Template] | Check PDR for L2XC with vhost and VM with dpdk-testpmd
-| | framesize=IMIX_v4_1 | rate=2.4mpps | wt=4 | rxq=2
diff --git a/tests/vpp/perf/vm_vhost/10ge2p1x520-eth-l2xcbase-eth-2vhostvr1024-1vm-pdrchk.robot b/tests/vpp/perf/vm_vhost/10ge2p1x520-eth-l2xcbase-eth-2vhostvr1024-1vm-pdrchk.robot
deleted file mode 100644
index a71f904208..0000000000
--- a/tests/vpp/perf/vm_vhost/10ge2p1x520-eth-l2xcbase-eth-2vhostvr1024-1vm-pdrchk.robot
+++ /dev/null
@@ -1,209 +0,0 @@
-# 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:
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-*** Settings ***
-| Resource | resources/libraries/robot/performance/performance_setup.robot
-| Library | resources.libraries.python.QemuUtils
-| ...
-| Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | PDRCHK
-| ... | NIC_Intel-X520-DA2 | ETH | L2XCFWD | BASE | VHOST | VM | VHOST_1024
-| ...
-| Suite Setup | Set up 3-node performance topology with DUT's NIC model
-| ... | L2 | Intel-X520-DA2
-| Suite Teardown | Tear down 3-node performance topology
-| ...
-| Test Setup | Set up performance test
-| Test Teardown | Tear down performance pdrchk test with vhost and VM with dpdk-testpmd
-| ... | ${rate}pps | ${framesize} | ${traffic_profile}
-| ... | dut1_node=${dut1} | dut1_vm_refs=${dut1_vm_refs}
-| ... | dut2_node=${dut2} | dut2_vm_refs=${dut2_vm_refs}
-| ...
-| Documentation | *RFC2544: Packet throughput L2XC test cases with vhost*
-| ...
-| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology
-| ... | with single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 switching of IPv4. 802.1q
-| ... | tagging is applied on link between DUT1 and DUT2.
-| ... | *[Cfg] DUT configuration:* DUT1 and DUT2 are configured with L2 cross-
-| ... | connect. Qemu Guest is connected to VPP via
-| ... | vhost-user interfaces. Guest is running DPDK testpmd interconnecting
-| ... | vhost-user interfaces using 5 cores pinned to cpus 5-9 and 2048M
-| ... | memory. Testpmd is using socket-mem=1024M (512x2M hugepages), 5 cores
-| ... | (1 main core and 4 cores dedicated for io), forwarding mode is set to
-| ... | io, rxd/txd=1024, burst=64. DUT1, DUT2 are tested with 2p10GE NIC X520
-| ... | Niantic by Intel.
-| ... | *[Ver] TG verification:* TG verifies throughput PDR (Partial Drop
-| ... | Rate) with non-zero packet loss tolerance (LT) expressed in percentage
-| ... | of packets transmitted. Ref-PDR value is periodically updated acording to
-| ... | formula: ref-PDR = 0.9x PDR, where PDR is found in RFC2544 long
-| ... | performance tests for the same DUT configuration. Test packets are
-| ... | generated by TG on links to DUTs. TG traffic profile contains two L3
-| ... | flow-groups (flow-group per direction, 253 flows per flow-group) with
-| ... | all packets containing Ethernet header, IPv4 header with IP protocol=61
-| ... | and static payload. MAC addresses are matching MAC addresses of the
-| ... | TG node interfaces.
-| ... | *[Ref] Applicable standard specifications:* RFC2544.
-
-*** Variables ***
-| ${perf_qemu_qsz}= | 1024
-| ${bd_id1}= | 1
-| ${bd_id2}= | 2
-| ${sock1}= | /tmp/sock-1-${bd_id1}
-| ${sock2}= | /tmp/sock-1-${bd_id2}
-# Traffic profile:
-| ${traffic_profile}= | trex-sl-3n-ethip4-ip4src254
-
-*** Keywords ***
-| Check PDR for L2XC with vhost and VM with dpdk-testpmd
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with ${wt} thread, ${wt} phy\
-| | ... | core, ${rxq} receive queue per NIC port.
-| | ... | [Ver] Verify ref-PDR for ${framesize} Byte frames using single trial\
-| | ... | throughput test at 2x ${rate}.
-| | ...
-| | [Arguments] | ${framesize} | ${rate} | ${wt} | ${rxq}
-| | ...
-| | # Test Variables required for test and test teardown
-| | Set Test Variable | ${framesize}
-| | Set Test Variable | ${rate}
-| | ${get_framesize}= | Get Frame Size | ${framesize}
-| | ${dut1_vm_refs}= | Create Dictionary
-| | ${dut2_vm_refs}= | Create Dictionary
-| | Set Test Variable | ${dut1_vm_refs}
-| | Set Test Variable | ${dut2_vm_refs}
-| | ...
-| | Given Add '${wt}' worker threads and '${rxq}' rxqueues in 3-node single-link circular topology
-| | And Add PCI devices to DUTs in 3-node single link topology
-| | And Run Keyword If | ${get_framesize} < ${1522}
-| | ... | Add no multi seg to all DUTs
-| | And Apply startup configuration on all VPP DUTs
-| | When Initialize L2 xconnect with Vhost-User in 3-node circular topology
-| | ... | ${sock1} | ${sock2}
-| | ${vm1}= | And Configure guest VM with dpdk-testpmd connected via vhost-user
-| | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1
-| | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1}
-| | ${vm2}= | And Configure guest VM with dpdk-testpmd connected via vhost-user
-| | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1
-| | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
-| | Then Traffic should pass with partial loss | ${perf_trial_duration}
-| | ... | ${rate} | ${framesize} | ${traffic_profile}
-| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
-
-*** Test Cases ***
-| tc01-64B-1t1c-eth-l2xcbase-eth-2vhostvr1024-1vm-pdrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 1 thread, 1 phy\
-| | ... | core, 1 receive queue per NIC port.
-| | ... | [Ver] Verify ref-PDR for 64 Byte frames using single trial\
-| | ... | throughput test at 2x ${rate}.
-| | ...
-| | [Tags] | 64B | 1T1C | STHREAD
-| | ...
-| | [Template] | Check PDR for L2XC with vhost and VM with dpdk-testpmd
-| | framesize=${64} | rate=1.6mpps | wt=1 | rxq=1
-
-| tc02-1518B-1t1c-eth-l2xcbase-eth-2vhostvr1024-1vm-pdrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 1 thread, 1 phy\
-| | ... | core, 1 receive queue per NIC port.
-| | ... | [Ver] Verify ref-PDR for 1518 Byte frames using single trial\
-| | ... | throughput test at 2x ${rate}.
-| | ...
-| | [Tags] | 1518B | 1T1C | STHREAD
-| | ...
-| | [Template] | Check PDR for L2XC with vhost and VM with dpdk-testpmd
-| | framesize=${1518} | rate=400000pps | wt=1 | rxq=1
-
-| tc03-IMIX-1t1c-eth-l2xcbase-eth-2vhostvr1024-1vm-pdrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 1 thread, 1 phy\
-| | ... | core, 1 receive queue per NIC port.
-| | ... | [Ver] Verify ref-PDR for 64 Byte frames using single trial\
-| | ... | throughput test at 2x ${rate}.
-| | ...
-| | [Tags] | IMIX | 1T1C | STHREAD
-| | ...
-| | [Template] | Check PDR for L2XC with vhost and VM with dpdk-testpmd
-| | framesize=IMIX_v4_1 | rate=1.0mpps | wt=1 | rxq=1
-
-| tc04-64B-2t2c-eth-l2xcbase-eth-2vhostvr1024-1vm-pdrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 2 threads, 2 phy\
-| | ... | cores, 1 receive queue per NIC port.
-| | ... | [Ver] Verify ref-PDR for 64 Byte frames using single trial\
-| | ... | throughput test at 2x ${rate}.
-| | ...
-| | [Tags] | 64B | 2T2C | MTHREAD
-| | ...
-| | [Template] | Check PDR for L2XC with vhost and VM with dpdk-testpmd
-| | framesize=${64} | rate=3.0mpps | wt=2 | rxq=1
-
-| tc05-1518B-2t2c-eth-l2xcbase-eth-2vhostvr1024-1vm-pdrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 2 threads, 2 phy\
-| | ... | cores, 1 receive queue per NIC port.
-| | ... | [Ver] Verify ref-PDR for 1518 Byte frames using single trial\
-| | ... | throughput test at 2x ${rate}.
-| | ...
-| | [Tags] | 1518B | 2T2C | MTHREAD
-| | ...
-| | [Template] | Check PDR for L2XC with vhost and VM with dpdk-testpmd
-| | framesize=${1518} | rate=0.7mpps | wt=2 | rxq=1
-
-| tc06-IMIX-2t2c-eth-l2xcbase-eth-2vhostvr1024-1vm-pdrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 2 threads, 2 phy\
-| | ... | cores, 1 receive queue per NIC port.
-| | ... | [Ver] Verify ref-PDR for 64 Byte frames using single trial\
-| | ... | throughput test at 2x ${rate}.
-| | ...
-| | [Tags] | IMIX | 2T2C | MTHREAD
-| | ...
-| | [Template] | Check PDR for L2XC with vhost and VM with dpdk-testpmd
-| | framesize=IMIX_v4_1 | rate=2.0mpps | wt=2 | rxq=1
-
-| tc07-64B-4t4c-eth-l2xcbase-eth-2vhostvr1024-1vm-pdrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 4 threads, 4 phy\
-| | ... | cores, 2 receive queues per NIC port.
-| | ... | [Ver] Verify ref-PDR for 64 Byte frames using single trial\
-| | ... | throughput test at 2x ${rate}.
-| | ...
-| | [Tags] | 64B | 4T4C | MTHREAD
-| | ...
-| | [Template] | Check PDR for L2XC with vhost and VM with dpdk-testpmd
-| | framesize=${64} | rate=4.2mpps | wt=4 | rxq=2
-
-| tc08-1518B-4t4c-eth-l2xcbase-eth-2vhostvr1024-1vm-pdrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 4 threads, 4 phy\
-| | ... | cores, 2 receive queues per NIC port.
-| | ... | [Ver] Verify ref-PDR for 1518 Byte frames using single trial\
-| | ... | throughput test at 2x ${rate}.
-| | ...
-| | [Tags] | 1518B | 4T4C | MTHREAD
-| | ...
-| | [Template] | Check PDR for L2XC with vhost and VM with dpdk-testpmd
-| | framesize=${1518} | rate=0.7mpps | wt=4 | rxq=2
-
-| tc09-IMIX-4t4c-eth-l2xcbase-eth-2vhostvr1024-1vm-pdrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2XC switching config with 4 threads, 4 phy\
-| | ... | cores, 2 receive queues per NIC port.
-| | ... | [Ver] Verify ref-PDR for 64 Byte frames using single trial\
-| | ... | throughput test at 2x ${rate}.
-| | ...
-| | [Tags] | IMIX | 4T4C | MTHREAD
-| | ...
-| | [Template] | Check PDR for L2XC with vhost and VM with dpdk-testpmd
-| | framesize=IMIX_v4_1 | rate=3.0mpps | wt=4 | rxq=2
diff --git a/tests/vpp/perf/vm_vhost/10ge2p1x520-ethip4-ip4base-eth-2vhostvr1024-1vm-pdrchk.robot b/tests/vpp/perf/vm_vhost/10ge2p1x520-ethip4-ip4base-eth-2vhostvr1024-1vm-pdrchk.robot
deleted file mode 100644
index e47e9bc541..0000000000
--- a/tests/vpp/perf/vm_vhost/10ge2p1x520-ethip4-ip4base-eth-2vhostvr1024-1vm-pdrchk.robot
+++ /dev/null
@@ -1,210 +0,0 @@
-# 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:
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-*** Settings ***
-| Resource | resources/libraries/robot/performance/performance_setup.robot
-| Library | resources.libraries.python.QemuUtils
-| ...
-| Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | PDRCHK
-| ... | NIC_Intel-X520-DA2 | ETH | IP4FWD | BASE | VHOST | VM | VHOST_1024
-| ...
-| Suite Setup | Set up 3-node performance topology with DUT's NIC model
-| ... | L3 | Intel-X520-DA2
-| Suite Teardown | Tear down 3-node performance topology
-| ...
-| Test Setup | Set up performance test
-| Test Teardown | Tear down performance pdrchk test with vhost and VM with dpdk-testpmd
-| ... | ${rate}pps | ${framesize} | ${traffic_profile}
-| ... | dut1_node=${dut1} | dut1_vm_refs=${dut1_vm_refs}
-| ... | dut2_node=${dut2} | dut2_vm_refs=${dut2_vm_refs}
-| ...
-| Documentation | *RFC2544: Pkt throughput IPv4 test cases with vhost*
-| ...
-| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology
-| ... | with single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for IPv4 routing.
-| ... | *[Cfg] DUT configuration:* DUT1 and DUT2 are configured with IPv4
-| ... | routing and two static IPv4 /24 route entries. Qemu Guest is connected
-| ... | to VPP via vhost-user interfaces. Guest is running DPDK testpmd
-| ... | interconnecting vhost-user interfaces using 5 cores pinned to cpus 5-9
-| ... | and 2048M memory. Testpmd is using socket-mem=1024M (512x2M hugepages),
-| ... | 5 cores (1 main core and 4 cores dedicated for io), forwarding mode is
-| ... | set to mac, rxd/txd=1024, burst=64. DUT1, DUT2 are tested with 2p10GE
-| ... | NIC X520 Niantic by Intel.
-| ... | *[Ver] TG verification:* TG verifies throughput PDR (Partial Drop
-| ... | Rate) with non-zero packet loss tolerance (LT) expressed in percentage
-| ... | of packets transmitted. Ref-PDR value is periodically updated acording to
-| ... | formula: ref-PDR = 0.9x PDR, where PDR is found in RFC2544 long
-| ... | performance tests for the same DUT configuration. Test packets are
-| ... | generated by TG on links to DUTs. TG traffic profile contains two L3
-| ... | flow-groups (flow-group per direction, 253 flows per flow-group) with
-| ... | all packets containing Ethernet header, IPv4 header with IP protocol=61
-| ... | and static payload. MAC addresses are matching MAC addresses of the
-| ... | TG node interfaces.
-| ... | *[Ref] Applicable standard specifications:* RFC2544.
-
-*** Variables ***
-| ${perf_qemu_qsz}= | 1024
-| ${sock1}= | /tmp/sock-1
-| ${sock2}= | /tmp/sock-2
-| ${fib_table_1}= | 100
-| ${fib_table_2}= | 101
-# Traffic profile:
-| ${traffic_profile}= | trex-sl-3n-ethip4-ip4src253
-
-*** Keywords ***
-| Check PDR for IPv4 routing with vhost and VM with dpdk-testpmd
-| | [Documentation]
-| | ... | [Cfg] DUT runs IPv4 routing config with ${wt} thread, ${wt} phy\
-| | ... | core, ${rxq} receive queue per NIC port.
-| | ... | [Ver] Verify ref-PDR for ${framesize} Byte frames using single trial\
-| | ... | throughput test at 2x ${rate}.
-| | ...
-| | [Arguments] | ${framesize} | ${rate} | ${wt} | ${rxq}
-| | ...
-| | # Test Variables required for test and test teardown
-| | Set Test Variable | ${framesize}
-| | Set Test Variable | ${rate}
-| | ${get_framesize}= | Get Frame Size | ${framesize}
-| | ${dut1_vm_refs}= | Create Dictionary
-| | ${dut2_vm_refs}= | Create Dictionary
-| | Set Test Variable | ${dut1_vm_refs}
-| | Set Test Variable | ${dut2_vm_refs}
-| | ...
-| | Given Add '${wt}' worker threads and '${rxq}' rxqueues in 3-node single-link circular topology
-| | And Add PCI devices to DUTs in 3-node single link topology
-| | And Run Keyword If | ${get_framesize} < ${1522}
-| | ... | Add no multi seg to all DUTs
-| | And Apply startup configuration on all VPP DUTs
-| | When Initialize IPv4 forwarding with vhost in 3-node circular topology
-| | ... | ${sock1} | ${sock2}
-| | ${vm1}= | And Configure guest VM with dpdk-testpmd-mac connected via vhost-user
-| | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1 | ${dut1_vif1_mac}
-| | ... | ${dut1_vif2_mac}
-| | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1}
-| | ${vm2}= | And Configure guest VM with dpdk-testpmd-mac connected via vhost-user
-| | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | ${dut2_vif1_mac}
-| | ... | ${dut2_vif2_mac}
-| | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2}
-| | Then Traffic should pass with partial loss | ${perf_trial_duration}
-| | ... | ${rate} | ${framesize} | ${traffic_profile}
-| | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type}
-
-*** Test Cases ***
-| tc01-64B-1t1c-eth-ip4base-eth-2vhostvr1024-1vm-pdrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs IPv4 routing config with 1 thread, 1 phy\
-| | ... | core, 1 receive queue per NIC port.
-| | ... | [Ver] Verify ref-PDR for 64 Byte frames using single trial\
-| | ... | throughput test at 2x ${rate}.
-| | ...
-| | [Tags] | 64B | 1T1C | STHREAD
-| | ...
-| | [Template] | Check PDR for IPv4 routing with vhost and VM with dpdk-testpmd
-| | framesize=${64} | rate=2.5mpps | wt=1 | rxq=1
-
-| tc02-1518B-1t1c-eth-ip4base-eth-2vhostvr1024-1vm-pdrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs IPv4 routing config with 1 thread, 1 phy\
-| | ... | core, 1 receive queue per NIC port.
-| | ... | [Ver] Verify ref-PDR for 1518 Byte frames using single trial\
-| | ... | throughput test at 2x ${rate}.
-| | ...
-| | [Tags] | 1518B | 1T1C | STHREAD
-| | ...
-| | [Template] | Check PDR for IPv4 routing with vhost and VM with dpdk-testpmd
-| | framesize=${1518} | rate=300000pps | wt=1 | rxq=1
-
-| tc03-IMIX-1t1c-eth-ip4base-eth-2vhostvr1024-1vm-pdrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs IPv4 routing config with 1 thread, 1 phy\
-| | ... | core, 1 receive queue per NIC port.
-| | ... | [Ver] Verify ref-PDR for 64 Byte frames using single trial\
-| | ... | throughput test at 2x ${rate}.
-| | ...
-| | [Tags] | IMIX | 1T1C | STHREAD
-| | ...
-| | [Template] | Check PDR for IPv4 routing with vhost and VM with dpdk-testpmd
-| | framesize=IMIX_v4_1 | rate=0.9mpps | wt=1 | rxq=1
-
-| tc04-64B-2t2c-eth-ip4base-eth-2vhostvr1024-1vm-pdrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs IPv4 routing config with 2 threads, 2 phy\
-| | ... | cores, 1 receive queue per NIC port.
-| | ... | [Ver] Verify ref-PDR for 64 Byte frames using single trial\
-| | ... | throughput test at 2x ${rate}.
-| | ...
-| | [Tags] | 64B | 2T2C | MTHREAD
-| | ...
-| | [Template] | Check PDR for IPv4 routing with vhost and VM with dpdk-testpmd
-| | framesize=${64} | rate=3.0mpps | wt=2 | rxq=1
-
-| tc05-1518B-2t2c-eth-ip4base-eth-2vhostvr1024-1vm-pdrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs IPv4 routing config with 2 threads, 2 phy\
-| | ... | cores, 1 receive queue per NIC port.
-| | ... | [Ver] Verify ref-PDR for 1518 Byte frames using single trial\
-| | ... | throughput test at 2x ${rate}.
-| | ...
-| | [Tags] | 1518B | 2T2C | MTHREAD
-| | ...
-| | [Template] | Check PDR for IPv4 routing with vhost and VM with dpdk-testpmd
-| | framesize=${1518} | rate=350000pps | wt=2 | rxq=1
-
-| tc06-IMIX-2t2c-eth-ip4base-eth-2vhostvr1024-1vm-pdrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs IPv4 routing config with 2 threads, 2 phy\
-| | ... | cores, 1 receive queue per NIC port.
-| | ... | [Ver] Verify ref-PDR for 64 Byte frames using single trial\
-| | ... | throughput test at 2x ${rate}.
-| | ...
-| | [Tags] | IMIX | 2T2C | MTHREAD
-| | ...
-| | [Template] | Check PDR for IPv4 routing with vhost and VM with dpdk-testpmd
-| | framesize=IMIX_v4_1 | rate=2.0mpps | wt=2 | rxq=1
-
-| tc07-64B-4t4c-eth-ip4base-eth-2vhostvr1024-1vm-pdrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs IPv4 routing config with 4 threads, 4 phy\
-| | ... | cores, 2 receive queues per NIC port.
-| | ... | [Ver] Verify ref-PDR for 64 Byte frames using single trial\
-| | ... | throughput test at 2x ${rate}.
-| | ...
-| | [Tags] | 64B | 4T4C | MTHREAD
-| | ...
-| | [Template] | Check PDR for IPv4 routing with vhost and VM with dpdk-testpmd
-| | framesize=${64} | rate=3.8mpps | wt=4 | rxq=2
-
-| tc08-1518B-4t4c-eth-ip4base-eth-2vhostvr1024-1vm-pdrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs IPv4 routing config with 4 threads, 4 phy\
-| | ... | cores, 2 receive queues per NIC port.
-| | ... | [Ver] Verify ref-PDR for 1518 Byte frames using single trial\
-| | ... | throughput test at 2x ${rate}.
-| | ...
-| | [Tags] | 1518B | 4T4C | MTHREAD
-| | ...
-| | [Template] | Check PDR for IPv4 routing with vhost and VM with dpdk-testpmd
-| | framesize=${1518} | rate=350000pps | wt=4 | rxq=2
-
-| tc09-IMIX-4t4c-eth-ip4base-eth-2vhostvr1024-1vm-pdrchk
-| | [Documentation]
-| | ... | [Cfg] DUT runs IPv4 routing config with 4 threads, 4 phy\
-| | ... | cores, 2 receive queues per NIC port.
-| | ... | [Ver] Verify ref-PDR for 64 Byte frames using single trial\
-| | ... | throughput test at 2x ${rate}.
-| | ...
-| | [Tags] | IMIX | 4T4C | MTHREAD
-| | ...
-| | [Template] | Check PDR for IPv4 routing with vhost and VM with dpdk-testpmd
-| | framesize=IMIX_v4_1 | rate=3.0mpps | wt=4 | rxq=2