Remove obsolete NDRPDR checks

Change-Id: If495493f4dce8d2eecfb8c06bcd587f315b70b1d
Signed-off-by: Peter Mikus <pmikus@cisco.com>

7 files changed, 0 insertions, 1480 deletions

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