aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
Diffstat (limited to 'tests')
-rw-r--r--tests/vpp/perf/ip4/10ge2p1x82599es-dot1q-ip4base-mrr.robot134
-rw-r--r--tests/vpp/perf/ip4/10ge2p1x82599es-dot1q-ip4base-ndrpdr.robot141
-rw-r--r--tests/vpp/perf/ip4/10ge2p1x82599es-ethip4-ip4base-copwhtlistbase-mrr.robot136
-rw-r--r--tests/vpp/perf/ip4/10ge2p1x82599es-ethip4-ip4base-copwhtlistbase-ndrpdr.robot142
-rw-r--r--tests/vpp/perf/ip4/10ge2p1x82599es-ethip4-ip4base-ipolicemarkbase-mrr.robot134
-rw-r--r--tests/vpp/perf/ip4/10ge2p1x82599es-ethip4-ip4base-ipolicemarkbase-ndrpdr.robot139
-rw-r--r--tests/vpp/perf/ip4/10ge2p1x82599es-ethip4-ip4base-mrr.robot125
-rw-r--r--tests/vpp/perf/ip4/10ge2p1x82599es-ethip4-ip4base-ndrpdr.robot131
-rw-r--r--tests/vpp/perf/ip4/10ge2p1x82599es-ethip4-ip4scale200k-mrr.robot128
-rw-r--r--tests/vpp/perf/ip4/10ge2p1x82599es-ethip4-ip4scale200k-ndrpdr.robot134
-rw-r--r--tests/vpp/perf/ip4/10ge2p1x82599es-ethip4-ip4scale20k-mrr.robot128
-rw-r--r--tests/vpp/perf/ip4/10ge2p1x82599es-ethip4-ip4scale20k-ndrpdr.robot134
-rw-r--r--tests/vpp/perf/ip4/10ge2p1x82599es-ethip4-ip4scale2m-mrr.robot128
-rw-r--r--tests/vpp/perf/ip4/10ge2p1x82599es-ethip4-ip4scale2m-ndrpdr.robot134
-rw-r--r--tests/vpp/perf/ip4/10ge2p1x82599es-ethip4udp-ip4base-iacl50sf-10kflows-mrr.robot147
-rw-r--r--tests/vpp/perf/ip4/10ge2p1x82599es-ethip4udp-ip4base-iacl50sf-10kflows-ndrpdr.robot153
-rw-r--r--tests/vpp/perf/ip4/10ge2p1x82599es-ethip4udp-ip4base-iacl50sl-10kflows-mrr.robot147
-rw-r--r--tests/vpp/perf/ip4/10ge2p1x82599es-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr.robot153
-rw-r--r--tests/vpp/perf/ip4/10ge2p1x82599es-ethip4udp-ip4base-nat44-mrr.robot131
-rw-r--r--tests/vpp/perf/ip4/10ge2p1x82599es-ethip4udp-ip4base-nat44-ndrpdr.robot137
-rw-r--r--tests/vpp/perf/ip4/10ge2p1x82599es-ethip4udp-ip4scale1000-udpsrcscale15-nat44-mrr.robot132
-rw-r--r--tests/vpp/perf/ip4/10ge2p1x82599es-ethip4udp-ip4scale1000-udpsrcscale15-nat44-ndrpdr.robot138
-rw-r--r--tests/vpp/perf/ip4_tunnels/10ge2p1x82599es-dot1q--ethip4vxlan-l2bdscale1kl2bd1kvlan1kvxlan-mrr.robot132
-rw-r--r--tests/vpp/perf/ip4_tunnels/10ge2p1x82599es-dot1q--ethip4vxlan-l2bdscale1kl2bd1kvlan1kvxlan-ndrpdr.robot139
-rw-r--r--tests/vpp/perf/l2/10ge2p1x82599es-dot1ad-l2xcbase-mrr.robot144
-rw-r--r--tests/vpp/perf/l2/10ge2p1x82599es-dot1ad-l2xcbase-ndrpdr.robot150
-rw-r--r--tests/vpp/perf/l2/10ge2p1x82599es-dot1q-l2bdbasemaclrn-mrr.robot134
-rw-r--r--tests/vpp/perf/l2/10ge2p1x82599es-dot1q-l2bdbasemaclrn-ndrpdr.robot140
-rw-r--r--tests/vpp/perf/l2/10ge2p1x82599es-eth-l2bdbasemaclrn-iacl50sf-10kflows-mrr.robot148
-rw-r--r--tests/vpp/perf/l2/10ge2p1x82599es-eth-l2bdbasemaclrn-iacl50sf-10kflows-ndrpdr.robot154
-rw-r--r--tests/vpp/perf/l2/10ge2p1x82599es-eth-l2bdbasemaclrn-iacl50sl-10kflows-mrr.robot148
-rw-r--r--tests/vpp/perf/l2/10ge2p1x82599es-eth-l2bdbasemaclrn-iacl50sl-10kflows-ndrpdr.robot154
-rw-r--r--tests/vpp/perf/l2/10ge2p1x82599es-eth-l2bdbasemaclrn-mrr.robot126
-rw-r--r--tests/vpp/perf/l2/10ge2p1x82599es-eth-l2bdbasemaclrn-ndrpdr.robot132
-rw-r--r--tests/vpp/perf/l2/10ge2p1x82599es-eth-l2bdscale100kmaclrn-mrr.robot130
-rw-r--r--tests/vpp/perf/l2/10ge2p1x82599es-eth-l2bdscale100kmaclrn-ndrpdr.robot136
-rw-r--r--tests/vpp/perf/l2/10ge2p1x82599es-eth-l2bdscale10kmaclrn-mrr.robot130
-rw-r--r--tests/vpp/perf/l2/10ge2p1x82599es-eth-l2bdscale10kmaclrn-ndrpdr.robot136
-rw-r--r--tests/vpp/perf/l2/10ge2p1x82599es-eth-l2bdscale1mmaclrn-mrr.robot130
-rw-r--r--tests/vpp/perf/l2/10ge2p1x82599es-eth-l2bdscale1mmaclrn-ndrpdr.robot136
-rw-r--r--tests/vpp/perf/l2/10ge2p1x82599es-eth-l2patch-mrr.robot127
-rw-r--r--tests/vpp/perf/l2/10ge2p1x82599es-eth-l2patch-ndrpdr.robot133
-rw-r--r--tests/vpp/perf/l2/10ge2p1x82599es-eth-l2xcbase-mrr.robot125
-rw-r--r--tests/vpp/perf/l2/10ge2p1x82599es-eth-l2xcbase-ndrpdr.robot131
44 files changed, 0 insertions, 6021 deletions
diff --git a/tests/vpp/perf/ip4/10ge2p1x82599es-dot1q-ip4base-mrr.robot b/tests/vpp/perf/ip4/10ge2p1x82599es-dot1q-ip4base-mrr.robot
deleted file mode 100644
index dc09f00233..0000000000
--- a/tests/vpp/perf/ip4/10ge2p1x82599es-dot1q-ip4base-mrr.robot
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright (c) 2019 PANTHEON.tech 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 | MRR
-| ... | NIC_Intel-82599ES | ETH | IP4FWD | BASE | DOT1Q | IP4BASE
-| ...
-| Suite Setup | Set up 3-node performance topology with DUT's NIC model
-| ... | L3 | Intel-82599ES
-| ...
-| Suite Teardown | Tear down 3-node performance topology
-| ...
-| Test Setup | Set up performance test
-| ...
-| Test Teardown | Tear down performance mrr test
-| ...
-| Test Template | Local Template
-| ...
-| Documentation | *Raw results IPv4 routing with IEEE 802.1Q 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. IEEE 802.1Q\
-| ... | tagging is applied on link between DUT1 and DUT2.
-| ... | *[Cfg] DUT configuration:* DUT1 and DUT2 are configured with IPv4\
-| ... | routing and two static IPv4 /30 route entries. DUT1 and DUT2 tested\
-| ... | with 2p10GE NIC 82599ES by Intel.
-| ... | *[Ver] TG verification:* In MaxReceivedRate test TG sends traffic\
-| ... | at line rate and reports total received/sent packets over trial period.\
-| ... | 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 ***
-| ${subid}= | 10
-| ${tag_rewrite}= | pop-1
-| ${overhead}= | ${4}
-# 82599ES bandwidth limit
-| ${s_limit}= | ${10000000000}
-# TG subnets used by T-Rex
-| ${tg_if1_net}= | 10.10.10.0
-| ${tg_if2_net}= | 20.20.20.0
-# Traffic profile:
-| ${traffic_profile}= | trex-sl-3n-ethip4-ip4src254
-
-*** Keywords ***
-| Local Template
-| | [Documentation]
-| | ... | [Cfg] Each DUT runs IPv4 routing with VLAN and uses ${phy_cores}\
-| | ... | physical core(s) for worker threads.
-| | ... | [Ver] Measure MaxReceivedRate for ${framesize}B frames using single\
-| | ... | trial throughput test.
-| | ...
-| | ... | *Arguments:*
-| | ... | - framesize - Framesize in Bytes in integer or string (IMIX_v4_1).
-| | ... | Type: integer, string
-| | ... | - phy_cores - Number of physical cores. Type: integer
-| | ... | - rxq - Number of RX queues, default value: ${None}. Type: integer
-| | ...
-| | [Arguments] | ${framesize} | ${phy_cores} | ${rxq}=${None}
-| | ...
-| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
-| | And Add PCI devices to all DUTs
-| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
-| | ... | ${s_limit} | ${framesize} | overhead=${overhead}
-| | And Apply startup configuration on all VPP DUTs
-| | When Initialize IPv4 forwarding with VLAN dot1q sub-interfaces in circular topology
-| | ... | ${tg_if1_net} | ${tg_if2_net} | ${subid} | ${tag_rewrite}
-| | Then Traffic should pass with maximum rate
-| | ... | ${max_rate}pps | ${framesize} | ${traffic_profile}
-
-*** Test Cases ***
-| tc01-64B-1c-dot1q-ip4base-mrr
-| | [Tags] | 64B | 1C
-| | framesize=${64} | phy_cores=${1}
-
-| tc02-64B-2c-dot1q-ip4base-mrr
-| | [Tags] | 64B | 2C
-| | framesize=${64} | phy_cores=${2}
-
-| tc03-64B-4c-dot1q-ip4base-mrr
-| | [Tags] | 64B | 4C
-| | framesize=${64} | phy_cores=${4}
-
-| tc04-1518B-1c-dot1q-ip4base-mrr
-| | [Tags] | 1518B | 1C
-| | framesize=${1518} | phy_cores=${1}
-
-| tc05-1518B-2c-dot1q-ip4base-mrr
-| | [Tags] | 1518B | 2C
-| | framesize=${1518} | phy_cores=${2}
-
-| tc06-1518B-4c-dot1q-ip4base-mrr
-| | [Tags] | 1518B | 4C
-| | framesize=${1518} | phy_cores=${4}
-
-| tc07-9000B-1c-dot1q-ip4base-mrr
-| | [Tags] | 9000B | 1C
-| | framesize=${9000} | phy_cores=${1}
-
-| tc08-9000B-2c-dot1q-ip4base-mrr
-| | [Tags] | 9000B | 2C
-| | framesize=${9000} | phy_cores=${2}
-
-| tc09-9000B-4c-dot1q-ip4base-mrr
-| | [Tags] | 9000B | 4C
-| | framesize=${9000} | phy_cores=${4}
-
-| tc10-IMIX-1c-dot1q-ip4base-mrr
-| | [Tags] | IMIX | 1C
-| | framesize=IMIX_v4_1 | phy_cores=${1}
-
-| tc11-IMIX-2c-dot1q-ip4base-mrr
-| | [Tags] | IMIX | 2C
-| | framesize=IMIX_v4_1 | phy_cores=${2}
-
-| tc12-IMIX-4c-dot1q-ip4base-mrr
-| | [Tags] | IMIX | 4C
-| | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/ip4/10ge2p1x82599es-dot1q-ip4base-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x82599es-dot1q-ip4base-ndrpdr.robot
deleted file mode 100644
index 2b65609d7b..0000000000
--- a/tests/vpp/perf/ip4/10ge2p1x82599es-dot1q-ip4base-ndrpdr.robot
+++ /dev/null
@@ -1,141 +0,0 @@
-# Copyright (c) 2019 PANTHEON.tech 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 | NDRPDR
-| ... | NIC_Intel-82599ES | ETH | IP4FWD | BASE | DOT1Q | IP4BASE
-| ...
-| Suite Setup | Set up 3-node performance topology with DUT's NIC model
-| ... | L3 | Intel-82599ES
-| ...
-| Suite Teardown | Tear down 3-node performance topology
-| ...
-| Test Setup | Set up performance test
-| ...
-| Test Teardown | Tear down performance discovery test | ${min_rate}pps
-| ... | ${framesize} | ${traffic_profile}
-| ...
-| Test Template | Local Template
-| ...
-| Documentation | *RFC2544: Pkt throughput IPv4 routing with IEEE 802.1Q 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. IEEE 802.1Q\
-| ... | tagging is applied on link between DUT1 and DUT2.
-| ... | *[Cfg] DUT configuration:* DUT1 and DUT2 are configured with IPv4\
-| ... | routing and two static IPv4 /30 route entries. DUT1 and DUT2 tested\
-| ... | with 2p10GE NIC 82599ES by Intel.
-| ... | *[Ver] TG verification:* TG finds and reports throughput NDR (Non Drop\
-| ... | Rate) with zero packet loss tolerance or throughput PDR (Partial Drop\
-| ... | Rate) with non-zero packet loss tolerance (LT) expressed in percentage\
-| ... | of packets transmitted. NDR and PDR are discovered for different\
-| ... | Ethernet L2 frame sizes using MLRsearch library. 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 ***
-| ${subid}= | 10
-| ${tag_rewrite}= | pop-1
-| ${overhead}= | ${4}
-# 82599ES bandwidth limit
-| ${s_limit}= | ${10000000000}
-# TG subnets used by T-Rex
-| ${tg_if1_net}= | 10.10.10.0
-| ${tg_if2_net}= | 20.20.20.0
-# Traffic profile:
-| ${traffic_profile}= | trex-sl-3n-ethip4-ip4src254
-
-*** Keywords ***
-| Local Template
-| | [Documentation]
-| | ... | [Cfg] Each DUT runs IPv4 routing with VLAN and uses ${phy_cores}\
-| | ... | physical core(s) for worker threads.
-| | ... | [Ver] Measure NDR and PDR values using MLRsearch algorithm.
-| | ...
-| | ... | *Arguments:*
-| | ... | - framesize - Framesize in Bytes in integer or string (IMIX_v4_1).
-| | ... | Type: integer, string
-| | ... | - phy_cores - Number of physical cores. Type: integer
-| | ... | - rxq - Number of RX queues, default value: ${None}. Type: integer
-| | ...
-| | [Arguments] | ${framesize} | ${phy_cores} | ${rxq}=${None}
-| | ...
-| | Set Test Variable | ${framesize}
-| | Set Test Variable | ${min_rate} | ${10000}
-| | ...
-| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
-| | And Add PCI devices to all DUTs
-| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
-| | ... | ${s_limit} | ${framesize} | overhead=${overhead}
-| | And Apply startup configuration on all VPP DUTs
-| | When Initialize IPv4 forwarding with VLAN dot1q sub-interfaces in circular topology
-| | ... | ${tg_if1_net} | ${tg_if2_net} | ${subid} | ${tag_rewrite}
-| | Then Find NDR and PDR intervals using optimized search
-| | ... | ${framesize} | ${traffic_profile} | ${min_rate} | ${max_rate}
-
-*** Test Cases ***
-| tc01-64B-1c-dot1q-ip4base-ndrpdr
-| | [Tags] | 64B | 1C
-| | framesize=${64} | phy_cores=${1}
-
-| tc02-64B-2c-dot1q-ip4base-ndrpdr
-| | [Tags] | 64B | 2C
-| | framesize=${64} | phy_cores=${2}
-
-| tc03-64B-4c-dot1q-ip4base-ndrpdr
-| | [Tags] | 64B | 4C
-| | framesize=${64} | phy_cores=${4}
-
-| tc04-1518B-1c-dot1q-ip4base-ndrpdr
-| | [Tags] | 1518B | 1C
-| | framesize=${1518} | phy_cores=${1}
-
-| tc05-1518B-2c-dot1q-ip4base-ndrpdr
-| | [Tags] | 1518B | 2C
-| | framesize=${1518} | phy_cores=${2}
-
-| tc06-1518B-4c-dot1q-ip4base-ndrpdr
-| | [Tags] | 1518B | 4C
-| | framesize=${1518} | phy_cores=${4}
-
-| tc07-9000B-1c-dot1q-ip4base-ndrpdr
-| | [Tags] | 9000B | 1C
-| | framesize=${9000} | phy_cores=${1}
-
-| tc08-9000B-2c-dot1q-ip4base-ndrpdr
-| | [Tags] | 9000B | 2C
-| | framesize=${9000} | phy_cores=${2}
-
-| tc09-9000B-4c-dot1q-ip4base-ndrpdr
-| | [Tags] | 9000B | 4C
-| | framesize=${9000} | phy_cores=${4}
-
-| tc10-IMIX-1c-dot1q-ip4base-ndrpdr
-| | [Tags] | IMIX | 1C
-| | framesize=IMIX_v4_1 | phy_cores=${1}
-
-| tc11-IMIX-2c-dot1q-ip4base-ndrpdr
-| | [Tags] | IMIX | 2C
-| | framesize=IMIX_v4_1 | phy_cores=${2}
-
-| tc12-IMIX-4c-dot1q-ip4base-ndrpdr
-| | [Tags] | IMIX | 4C
-| | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/ip4/10ge2p1x82599es-ethip4-ip4base-copwhtlistbase-mrr.robot b/tests/vpp/perf/ip4/10ge2p1x82599es-ethip4-ip4base-copwhtlistbase-mrr.robot
deleted file mode 100644
index 7deca2a14b..0000000000
--- a/tests/vpp/perf/ip4/10ge2p1x82599es-ethip4-ip4base-copwhtlistbase-mrr.robot
+++ /dev/null
@@ -1,136 +0,0 @@
-# Copyright (c) 2019 PANTHEON.tech 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 | MRR
-| ... | NIC_Intel-82599ES | ETH | IP4FWD | FEATURE | COPWHLIST
-| ...
-| Suite Setup | Set up 3-node performance topology with DUT's NIC model
-| ... | L3 | Intel-82599ES
-| Suite Teardown | Tear down 3-node performance topology
-| ...
-| Test Setup | Set up performance test
-| ...
-| Test Teardown | Tear down performance mrr test
-| ...
-| Test Template | Local Template
-| ...
-| Documentation | *Raw results IPv4 whitelist 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 82599ES by Intel.
-| ... | *[Ver] TG verification:* In MaxReceivedRate test TG sends traffic
-| ... | at line rate and reports total received/sent packets over trial period.
-| ... | 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 ***
-# 82599ES bandwidth limit
-| ${s_limit}= | ${10000000000}
-# Traffic profile:
-| ${traffic_profile}= | trex-sl-3n-ethip4-ip4src253
-
-*** Keywords ***
-| Local Template
-| | ...
-| | [Documentation]
-| | ... | [Cfg] DUT runs IPv4 routing config.
-| | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads.
-| | ... | [Ver] Measure MaxReceivedRate for ${framesize}B frames using single\
-| | ... | trial throughput test.
-| | ...
-| | ... | *Arguments:*
-| | ... | - framesize - Framesize in Bytes in integer or string (IMIX_v4_1).
-| | ... | Type: integer, string
-| | ... | - phy_cores - Number of physical cores. Type: integer
-| | ... | - rxq - Number of RX queues, default value: ${None}. Type: integer
-| | ...
-| | [Arguments] | ${framesize} | ${phy_cores} | ${rxq}=${None}
-| | ...
-| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
-| | And Add PCI devices to all DUTs
-| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
-| | ... | ${s_limit} | ${framesize}
-| | And Apply startup configuration on all VPP DUTs
-| | When Initialize IPv4 forwarding in 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 maximum rate
-| | ... | ${max_rate}pps | ${framesize} | ${traffic_profile}
-
-*** Test Cases ***
-| tc01-64B-1c-ethip4-ip4base-copwhtlistbase-mrr
-| | [Tags] | 64B | 1C
-| | framesize=${64} | phy_cores=${1}
-
-| tc02-64B-2c-ethip4-ip4base-copwhtlistbase-mrr
-| | [Tags] | 64B | 2C
-| | framesize=${64} | phy_cores=${2}
-
-| tc03-64B-4c-ethip4-ip4base-copwhtlistbase-mrr
-| | [Tags] | 64B | 4C
-| | framesize=${64} | phy_cores=${4}
-
-| tc04-1518B-1c-ethip4-ip4base-copwhtlistbase-mrr
-| | [Tags] | 1518B | 1C
-| | framesize=${1518} | phy_cores=${1}
-
-| tc05-1518B-2c-ethip4-ip4base-copwhtlistbase-mrr
-| | [Tags] | 1518B | 2C
-| | framesize=${1518} | phy_cores=${2}
-
-| tc06-1518B-4c-ethip4-ip4base-copwhtlistbase-mrr
-| | [Tags] | 1518B | 4C
-| | framesize=${1518} | phy_cores=${4}
-
-| tc07-9000B-1c-ethip4-ip4base-copwhtlistbase-mrr
-| | [Tags] | 9000B | 1C
-| | framesize=${9000} | phy_cores=${1}
-
-| tc08-9000B-2c-ethip4-ip4base-copwhtlistbase-mrr
-| | [Tags] | 9000B | 2C
-| | framesize=${9000} | phy_cores=${2}
-
-| tc09-9000B-4c-ethip4-ip4base-copwhtlistbase-mrr
-| | [Tags] | 9000B | 4C
-| | framesize=${9000} | phy_cores=${4}
-
-| tc10-IMIX-1c-ethip4-ip4base-copwhtlistbase-mrr
-| | [Tags] | IMIX | 1C
-| | framesize=IMIX_v4_1 | phy_cores=${1}
-
-| tc11-IMIX-2c-ethip4-ip4base-copwhtlistbase-mrr
-| | [Tags] | IMIX | 2C
-| | framesize=IMIX_v4_1 | phy_cores=${2}
-
-| tc12-IMIX-4c-ethip4-ip4base-copwhtlistbase-mrr
-| | [Tags] | IMIX | 4C
-| | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/ip4/10ge2p1x82599es-ethip4-ip4base-copwhtlistbase-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x82599es-ethip4-ip4base-copwhtlistbase-ndrpdr.robot
deleted file mode 100644
index 73ccee2c76..0000000000
--- a/tests/vpp/perf/ip4/10ge2p1x82599es-ethip4-ip4base-copwhtlistbase-ndrpdr.robot
+++ /dev/null
@@ -1,142 +0,0 @@
-# Copyright (c) 2019 PANTHEON.tech 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 | NDRPDR
-| ... | NIC_Intel-82599ES | ETH | IP4FWD | FEATURE | COPWHLIST
-| ...
-| Suite Setup | Set up 3-node performance topology with DUT's NIC model
-| ... | L3 | Intel-82599ES
-| Suite Teardown | Tear down 3-node performance topology
-| ...
-| Test Setup | Set up performance test
-| ...
-| Test Teardown | Tear down performance discovery test | ${min_rate}pps
-| ... | ${framesize} | ${traffic_profile}
-| ...
-| Test Template | Local Template
-| ...
-| Documentation | *RFC2544: Pkt throughput IPv4 whitelist 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 82599ES by Intel.
-| ... | *[Ver] TG verification:* TG finds and reports throughput NDR (Non Drop
-| ... | Rate) with zero packet loss tolerance or throughput PDR (Partial Drop
-| ... | Rate) with non-zero packet loss tolerance (LT) expressed in percentage
-| ... | of packets transmitted. NDR and PDR are discovered for different
-| ... | Ethernet L2 frame sizes using MLRsearch library.
-| ... | 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 ***
-# 82599ES bandwidth limit
-| ${s_limit}= | ${10000000000}
-# Traffic profile:
-| ${traffic_profile}= | trex-sl-3n-ethip4-ip4src253
-
-*** Keywords ***
-| Local Template
-| | ...
-| | [Documentation]
-| | ... | [Cfg] DUT runs IPv4 routing config.
-| | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads.
-| | ... | [Ver] Measure NDR and PDR values using MLRsearch algorithm.\
-| | ...
-| | ... | *Arguments:*
-| | ... | - framesize - Framesize in Bytes in integer or string (IMIX_v4_1).
-| | ... | Type: integer, string
-| | ... | - phy_cores - Number of physical cores. Type: integer
-| | ... | - rxq - Number of RX queues, default value: ${None}. Type: integer
-| | ...
-| | [Arguments] | ${framesize} | ${phy_cores} | ${rxq}=${None}
-| | ...
-| | Set Test Variable | ${framesize}
-| | Set Test Variable | ${min_rate} | ${10000}
-| | ...
-| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
-| | And Add PCI devices to all DUTs
-| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
-| | ... | ${s_limit} | ${framesize}
-| | And Apply startup configuration on all VPP DUTs
-| | When Initialize IPv4 forwarding in 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 Find NDR and PDR intervals using optimized search
-| | ... | ${framesize} | ${traffic_profile} | ${min_rate} | ${max_rate}
-
-*** Test Cases ***
-| tc01-64B-1c-ethip4-ip4base-copwhtlistbase-ndrpdr
-| | [Tags] | 64B | 1C
-| | framesize=${64} | phy_cores=${1}
-
-| tc02-64B-2c-ethip4-ip4base-copwhtlistbase-ndrpdr
-| | [Tags] | 64B | 2C
-| | framesize=${64} | phy_cores=${2}
-
-| tc03-64B-4c-ethip4-ip4base-copwhtlistbase-ndrpdr
-| | [Tags] | 64B | 4C
-| | framesize=${64} | phy_cores=${4}
-
-| tc04-1518B-1c-ethip4-ip4base-copwhtlistbase-ndrpdr
-| | [Tags] | 1518B | 1C
-| | framesize=${1518} | phy_cores=${1}
-
-| tc05-1518B-2c-ethip4-ip4base-copwhtlistbase-ndrpdr
-| | [Tags] | 1518B | 2C
-| | framesize=${1518} | phy_cores=${2}
-
-| tc06-1518B-4c-ethip4-ip4base-copwhtlistbase-ndrpdr
-| | [Tags] | 1518B | 4C
-| | framesize=${1518} | phy_cores=${4}
-
-| tc07-9000B-1c-ethip4-ip4base-copwhtlistbase-ndrpdr
-| | [Tags] | 9000B | 1C
-| | framesize=${9000} | phy_cores=${1}
-
-| tc08-9000B-2c-ethip4-ip4base-copwhtlistbase-ndrpdr
-| | [Tags] | 9000B | 2C
-| | framesize=${9000} | phy_cores=${2}
-
-| tc09-9000B-4c-ethip4-ip4base-copwhtlistbase-ndrpdr
-| | [Tags] | 9000B | 4C
-| | framesize=${9000} | phy_cores=${4}
-
-| tc10-IMIX-1c-ethip4-ip4base-copwhtlistbase-ndrpdr
-| | [Tags] | IMIX | 1C
-| | framesize=IMIX_v4_1 | phy_cores=${1}
-
-| tc11-IMIX-2c-ethip4-ip4base-copwhtlistbase-ndrpdr
-| | [Tags] | IMIX | 2C
-| | framesize=IMIX_v4_1 | phy_cores=${2}
-
-| tc12-IMIX-4c-ethip4-ip4base-copwhtlistbase-ndrpdr
-| | [Tags] | IMIX | 4C
-| | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/ip4/10ge2p1x82599es-ethip4-ip4base-ipolicemarkbase-mrr.robot b/tests/vpp/perf/ip4/10ge2p1x82599es-ethip4-ip4base-ipolicemarkbase-mrr.robot
deleted file mode 100644
index 7df1bcd994..0000000000
--- a/tests/vpp/perf/ip4/10ge2p1x82599es-ethip4-ip4base-ipolicemarkbase-mrr.robot
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright (c) 2019 PANTHEON.tech 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 | MRR
-| ... | NIC_Intel-82599ES | IP4FWD | FEATURE | POLICE_MARK
-| ...
-| Suite Setup | Set up 3-node performance topology with DUT's NIC model
-| ... | L3 | Intel-82599ES
-| Suite Teardown | Tear down 3-node performance topology
-| ...
-| Test Setup | Set up performance test
-| ...
-| Test Teardown | Tear down performance mrr test
-| ...
-| Test Template | Local Template
-| ...
-| Documentation | *Raw results IPv4 policer 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 82599ES by Intel.
-| ... | *[Ver] TG verification:* In MaxReceivedRate tests TG sends traffic\
-| ... | at line rate and reports total received/sent packets over trial period.\
-| ... | 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. MAC addresses are matching MAC addresses
-| ... | of the TG node interfaces.
-| ... | *[Ref] Applicable standard specifications:* RFC2544, RFC2698.
-
-*** Variables ***
-# 82599ES bandwidth limit
-| ${s_limit}= | ${10000000000}
-| ${cir}= | ${100}
-| ${eir}= | ${150}
-# Traffic profile:
-| ${traffic_profile}= | trex-sl-3n-ethip4-ip4src253
-
-*** Keywords ***
-| Local Template
-| | ...
-| | [Documentation]
-| | ... | [Cfg] DUT runs IPv4 routing config.
-| | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads.
-| | ... | [Ver] Measure MaxReceivedRate for ${framesize}B frames using single\
-| | ... | trial throughput test.
-| | ...
-| | ... | *Arguments:*
-| | ... | - framesize - Framesize in Bytes in integer or string (IMIX_v4_1).
-| | ... | Type: integer, string
-| | ... | - phy_cores - Number of physical cores. Type: integer
-| | ... | - rxq - Number of RX queues, default value: ${None}. Type: integer
-| | ...
-| | [Arguments] | ${framesize} | ${phy_cores} | ${rxq}=${None}
-| | ...
-| | Set Test Variable | ${cb} | ${framesize}
-| | Set Test Variable | ${eb} | ${framesize}
-| | ...
-| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
-| | And Add PCI devices to all DUTs
-| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
-| | ... | ${s_limit} | ${framesize}
-| | And Apply startup configuration on all VPP DUTs
-| | When Initialize IPv4 forwarding in circular topology
-| | And Initialize IPv4 policer 2r3c-'ca' in circular topology
-| | Then Traffic should pass with maximum rate
-| | ... | ${max_rate}pps | ${framesize} | ${traffic_profile}
-
-*** Test Cases ***
-| tc01-64B-1c-ethip4-ip4base-ipolicemarkbase-mrr
-| | [Tags] | 64B | 1C
-| | framesize=${64} | phy_cores=${1}
-
-| tc02-64B-2c-ethip4-ip4base-ipolicemarkbase-mrr
-| | [Tags] | 64B | 2C
-| | framesize=${64} | phy_cores=${2}
-
-| tc03-64B-4c-ethip4-ip4base-ipolicemarkbase-mrr
-| | [Tags] | 64B | 4C
-| | framesize=${64} | phy_cores=${4}
-
-| tc04-1518B-1c-ethip4-ip4base-ipolicemarkbase-mrr
-| | [Tags] | 1518B | 1C
-| | framesize=${1518} | phy_cores=${1}
-
-| tc05-1518B-2c-ethip4-ip4base-ipolicemarkbase-mrr
-| | [Tags] | 1518B | 2C
-| | framesize=${1518} | phy_cores=${2}
-
-| tc06-1518B-4c-ethip4-ip4base-ipolicemarkbase-mrr
-| | [Tags] | 1518B | 4C
-| | framesize=${1518} | phy_cores=${4}
-
-| tc07-9000B-1c-ethip4-ip4base-ipolicemarkbase-mrr
-| | [Tags] | 9000B | 1C
-| | framesize=${9000} | phy_cores=${1}
-
-| tc08-9000B-2c-ethip4-ip4base-ipolicemarkbase-mrr
-| | [Tags] | 9000B | 2C
-| | framesize=${9000} | phy_cores=${2}
-
-| tc09-9000B-4c-ethip4-ip4base-ipolicemarkbase-mrr
-| | [Tags] | 9000B | 4C
-| | framesize=${9000} | phy_cores=${4}
-
-| tc10-IMIX-1c-ethip4-ip4base-ipolicemarkbase-mrr
-| | [Tags] | IMIX | 1C
-| | framesize=IMIX_v4_1 | phy_cores=${1}
-
-| tc11-IMIX-2c-ethip4-ip4base-ipolicemarkbase-mrr
-| | [Tags] | IMIX | 2C
-| | framesize=IMIX_v4_1 | phy_cores=${2}
-
-| tc12-IMIX-4c-ethip4-ip4base-ipolicemarkbase-mrr
-| | [Tags] | IMIX | 4C
-| | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/ip4/10ge2p1x82599es-ethip4-ip4base-ipolicemarkbase-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x82599es-ethip4-ip4base-ipolicemarkbase-ndrpdr.robot
deleted file mode 100644
index 49f1ea5d14..0000000000
--- a/tests/vpp/perf/ip4/10ge2p1x82599es-ethip4-ip4base-ipolicemarkbase-ndrpdr.robot
+++ /dev/null
@@ -1,139 +0,0 @@
-# Copyright (c) 2019 PANTHEON.tech 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 | NDRPDR
-| ... | NIC_Intel-82599ES | IP4FWD | FEATURE | POLICE_MARK
-| ...
-| Suite Setup | Set up 3-node performance topology with DUT's NIC model
-| ... | L3 | Intel-82599ES
-| Suite Teardown | Tear down 3-node performance topology
-| ...
-| Test Setup | Set up performance test
-| ...
-| Test Teardown | Tear down performance discovery test | ${min_rate}pps
-| ... | ${framesize} | ${traffic_profile}
-| ...
-| Test Template | Local Template
-| ...
-| Documentation | *RFC2544: Pkt throughput IPv4 policer 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 82599ES by Intel.
-| ... | *[Ver] TG verification:* TG finds and reports throughput NDR (Non Drop
-| ... | Rate) with zero packet loss tolerance or throughput PDR (Partial Drop
-| ... | Rate) with non-zero packet loss tolerance (LT) expressed in percentage
-| ... | of packets transmitted. NDR and PDR are discovered for different
-| ... | Ethernet L2 frame sizes using MLRsearch library.
-| ... | 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. MAC addresses are matching MAC addresses
-| ... | of the TG node interfaces.
-| ... | *[Ref] Applicable standard specifications:* RFC2544, RFC2698.
-
-*** Variables ***
-# 82599ES bandwidth limit
-| ${s_limit}= | ${10000000000}
-| ${cir}= | ${100}
-| ${eir}= | ${150}
-# Traffic profile:
-| ${traffic_profile}= | trex-sl-3n-ethip4-ip4src253
-
-*** Keywords ***
-| Local Template
-| | ...
-| | [Documentation]
-| | ... | [Cfg] DUT runs IPv4 routing config.
-| | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads.
-| | ... | [Ver] Measure NDR and PDR values using MLRsearch algorithm.\
-| | ...
-| | ... | *Arguments:*
-| | ... | - framesize - Framesize in Bytes in integer or string (IMIX_v4_1).
-| | ... | Type: integer, string
-| | ... | - phy_cores - Number of physical cores. Type: integer
-| | ... | - rxq - Number of RX queues, default value: ${None}. Type: integer
-| | ...
-| | [Arguments] | ${framesize} | ${phy_cores} | ${rxq}=${None}
-| | ...
-| | Set Test Variable | ${framesize}
-| | Set Test Variable | ${min_rate} | ${10000}
-| | Set Test Variable | ${cb} | ${framesize}
-| | Set Test Variable | ${eb} | ${framesize}
-| | ...
-| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
-| | And Add PCI devices to all DUTs
-| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
-| | ... | ${s_limit} | ${framesize}
-| | And Apply startup configuration on all VPP DUTs
-| | When Initialize IPv4 forwarding in circular topology
-| | And Initialize IPv4 policer 2r3c-'ca' in circular topology
-| | Then Find NDR and PDR intervals using optimized search
-| | ... | ${framesize} | ${traffic_profile} | ${min_rate} | ${max_rate}
-
-*** Test Cases ***
-| tc01-64B-1c-ethip4-ip4base-ipolicemarkbase-ndrpdr
-| | [Tags] | 64B | 1C
-| | framesize=${64} | phy_cores=${1}
-
-| tc02-64B-2c-ethip4-ip4base-ipolicemarkbase-ndrpdr
-| | [Tags] | 64B | 2C
-| | framesize=${64} | phy_cores=${2}
-
-| tc03-64B-4c-ethip4-ip4base-ipolicemarkbase-ndrpdr
-| | [Tags] | 64B | 4C
-| | framesize=${64} | phy_cores=${4}
-
-| tc04-1518B-1c-ethip4-ip4base-ipolicemarkbase-ndrpdr
-| | [Tags] | 1518B | 1C
-| | framesize=${1518} | phy_cores=${1}
-
-| tc05-1518B-2c-ethip4-ip4base-ipolicemarkbase-ndrpdr
-| | [Tags] | 1518B | 2C
-| | framesize=${1518} | phy_cores=${2}
-
-| tc06-1518B-4c-ethip4-ip4base-ipolicemarkbase-ndrpdr
-| | [Tags] | 1518B | 4C
-| | framesize=${1518} | phy_cores=${4}
-
-| tc07-9000B-1c-ethip4-ip4base-ipolicemarkbase-ndrpdr
-| | [Tags] | 9000B | 1C
-| | framesize=${9000} | phy_cores=${1}
-
-| tc08-9000B-2c-ethip4-ip4base-ipolicemarkbase-ndrpdr
-| | [Tags] | 9000B | 2C
-| | framesize=${9000} | phy_cores=${2}
-
-| tc09-9000B-4c-ethip4-ip4base-ipolicemarkbase-ndrpdr
-| | [Tags] | 9000B | 4C
-| | framesize=${9000} | phy_cores=${4}
-
-| tc10-IMIX-1c-ethip4-ip4base-ipolicemarkbase-ndrpdr
-| | [Tags] | IMIX | 1C
-| | framesize=IMIX_v4_1 | phy_cores=${1}
-
-| tc11-IMIX-2c-ethip4-ip4base-ipolicemarkbase-ndrpdr
-| | [Tags] | IMIX | 2C
-| | framesize=IMIX_v4_1 | phy_cores=${2}
-
-| tc12-IMIX-4c-ethip4-ip4base-ipolicemarkbase-ndrpdr
-| | [Tags] | IMIX | 4C
-| | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/ip4/10ge2p1x82599es-ethip4-ip4base-mrr.robot b/tests/vpp/perf/ip4/10ge2p1x82599es-ethip4-ip4base-mrr.robot
deleted file mode 100644
index a318298a7a..0000000000
--- a/tests/vpp/perf/ip4/10ge2p1x82599es-ethip4-ip4base-mrr.robot
+++ /dev/null
@@ -1,125 +0,0 @@
-# Copyright (c) 2019 PANTHEON.tech 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 | MRR
-| ... | NIC_Intel-82599ES | ETH | IP4FWD | BASE | IP4BASE
-| ...
-| Suite Setup | Set up 3-node performance topology with DUT's NIC model
-| ... | L3 | Intel-82599ES
-| Suite Teardown | Tear down 3-node performance topology
-| ...
-| Test Setup | Set up performance test
-| Test Teardown | Tear down performance mrr test
-| ...
-| Test Template | Local Template
-| ...
-| Documentation | *Raw results IPv4 routing 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 82599ES by Intel.
-| ... | *[Ver] TG verification:* In MaxReceivedRate test TG sends traffic
-| ... | at line rate and reports total received/sent packets over trial period.
-| ... | 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 ***
-# 82599ES bandwidth limit
-| ${s_limit}= | ${10000000000}
-# Traffic profile:
-| ${traffic_profile}= | trex-sl-3n-ethip4-ip4src253
-
-*** Keywords ***
-| Local Template
-| | ...
-| | [Documentation]
-| | ... | [Cfg] DUT runs IPv4 routing config.
-| | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads.
-| | ... | [Ver] Measure MaxReceivedRate for ${framesize}B frames using single\
-| | ... | trial throughput test.
-| | ...
-| | ... | *Arguments:*
-| | ... | - framesize - Framesize in Bytes in integer or string (IMIX_v4_1).
-| | ... | Type: integer, string
-| | ... | - phy_cores - Number of physical cores. Type: integer
-| | ... | - rxq - Number of RX queues, default value: ${None}. Type: integer
-| | ...
-| | [Arguments] | ${framesize} | ${phy_cores} | ${rxq}=${None}
-| | ...
-| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
-| | And Add PCI devices to all DUTs
-| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
-| | ... | ${s_limit} | ${framesize}
-| | And Apply startup configuration on all VPP DUTs
-| | When Initialize IPv4 forwarding in circular topology
-| | Then Traffic should pass with maximum rate
-| | ... | ${max_rate}pps | ${framesize} | ${traffic_profile}
-
-*** Test Cases ***
-| tc01-64B-1c-ethip4-ip4base-mrr
-| | [Tags] | 64B | 1C
-| | framesize=${64} | phy_cores=${1}
-
-| tc02-64B-2c-ethip4-ip4base-mrr
-| | [Tags] | 64B | 2C
-| | framesize=${64} | phy_cores=${2}
-
-| tc03-64B-4c-ethip4-ip4base-mrr
-| | [Tags] | 64B | 4C
-| | framesize=${64} | phy_cores=${4}
-
-| tc04-1518B-1c-ethip4-ip4base-mrr
-| | [Tags] | 1518B | 1C
-| | framesize=${1518} | phy_cores=${1}
-
-| tc05-1518B-2c-ethip4-ip4base-mrr
-| | [Tags] | 1518B | 2C
-| | framesize=${1518} | phy_cores=${2}
-
-| tc06-1518B-4c-ethip4-ip4base-mrr
-| | [Tags] | 1518B | 4C
-| | framesize=${1518} | phy_cores=${4}
-
-| tc07-9000B-1c-ethip4-ip4base-mrr
-| | [Tags] | 9000B | 1C
-| | framesize=${9000} | phy_cores=${1}
-
-| tc08-9000B-2c-ethip4-ip4base-mrr
-| | [Tags] | 9000B | 2C
-| | framesize=${9000} | phy_cores=${2}
-
-| tc09-9000B-4c-ethip4-ip4base-mrr
-| | [Tags] | 9000B | 4C
-| | framesize=${9000} | phy_cores=${4}
-
-| tc10-IMIX-1c-ethip4-ip4base-mrr
-| | [Tags] | IMIX | 1C
-| | framesize=IMIX_v4_1 | phy_cores=${1}
-
-| tc11-IMIX-2c-ethip4-ip4base-mrr
-| | [Tags] | IMIX | 2C
-| | framesize=IMIX_v4_1 | phy_cores=${2}
-
-| tc12-IMIX-4c-ethip4-ip4base-mrr
-| | [Tags] | IMIX | 4C
-| | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/ip4/10ge2p1x82599es-ethip4-ip4base-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x82599es-ethip4-ip4base-ndrpdr.robot
deleted file mode 100644
index 0faaa2f378..0000000000
--- a/tests/vpp/perf/ip4/10ge2p1x82599es-ethip4-ip4base-ndrpdr.robot
+++ /dev/null
@@ -1,131 +0,0 @@
-# Copyright (c) 2019 PANTHEON.tech 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 | NDRPDR
-| ... | NIC_Intel-82599ES | ETH | IP4FWD | BASE | IP4BASE
-| ...
-| Suite Setup | Set up 3-node performance topology with DUT's NIC model
-| ... | L3 | Intel-82599ES
-| Suite Teardown | Tear down 3-node performance topology
-| ...
-| Test Setup | Set up performance test
-| Test Teardown | Tear down performance discovery test | ${min_rate}pps
-| ... | ${framesize} | ${traffic_profile}
-| ...
-| Test Template | Local Template
-| ...
-| Documentation | *RFC2544: Pkt throughput IPv4 routing 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 82599ES by Intel.
-| ... | *[Ver] TG verification:* TG finds and reports throughput NDR (Non Drop
-| ... | Rate) with zero packet loss tolerance or throughput PDR (Partial Drop
-| ... | Rate) with non-zero packet loss tolerance (LT) expressed in percentage
-| ... | of packets transmitted. NDR and PDR are discovered for different
-| ... | Ethernet L2 frame sizes using MLRsearch library.
-| ... | 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 ***
-# 82599ES bandwidth limit
-| ${s_limit}= | ${10000000000}
-# Traffic profile:
-| ${traffic_profile}= | trex-sl-3n-ethip4-ip4src253
-
-*** Keywords ***
-| Local Template
-| | ...
-| | [Documentation]
-| | ... | [Cfg] DUT runs IPv4 routing config.
-| | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads.
-| | ... | [Ver] Measure NDR and PDR values using MLRsearch algorithm.\
-| | ...
-| | ... | *Arguments:*
-| | ... | - framesize - Framesize in Bytes in integer or string (IMIX_v4_1).
-| | ... | Type: integer, string
-| | ... | - phy_cores - Number of physical cores. Type: integer
-| | ... | - rxq - Number of RX queues, default value: ${None}. Type: integer
-| | ...
-| | [Arguments] | ${framesize} | ${phy_cores} | ${rxq}=${None}
-| | ...
-| | Set Test Variable | ${framesize}
-| | Set Test Variable | ${min_rate} | ${10000}
-| | ...
-| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
-| | And Add PCI devices to all DUTs
-| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
-| | ... | ${s_limit} | ${framesize}
-| | And Apply startup configuration on all VPP DUTs
-| | When Initialize IPv4 forwarding in circular topology
-| | Then Find NDR and PDR intervals using optimized search
-| | ... | ${framesize} | ${traffic_profile} | ${min_rate} | ${max_rate}
-
-*** Test Cases ***
-| tc01-64B-1c-ethip4-ip4base-ndrpdr
-| | [Tags] | 64B | 1C
-| | framesize=${64} | phy_cores=${1}
-
-| tc02-64B-2c-ethip4-ip4base-ndrpdr
-| | [Tags] | 64B | 2C
-| | framesize=${64} | phy_cores=${2}
-
-| tc03-64B-4c-ethip4-ip4base-ndrpdr
-| | [Tags] | 64B | 4C
-| | framesize=${64} | phy_cores=${4}
-
-| tc04-1518B-1c-ethip4-ip4base-ndrpdr
-| | [Tags] | 1518B | 1C
-| | framesize=${1518} | phy_cores=${1}
-
-| tc05-1518B-2c-ethip4-ip4base-ndrpdr
-| | [Tags] | 1518B | 2C
-| | framesize=${1518} | phy_cores=${2}
-
-| tc06-1518B-4c-ethip4-ip4base-ndrpdr
-| | [Tags] | 1518B | 4C
-| | framesize=${1518} | phy_cores=${4}
-
-| tc07-9000B-1c-ethip4-ip4base-ndrpdr
-| | [Tags] | 9000B | 1C
-| | framesize=${9000} | phy_cores=${1}
-
-| tc08-9000B-2c-ethip4-ip4base-ndrpdr
-| | [Tags] | 9000B | 2C
-| | framesize=${9000} | phy_cores=${2}
-
-| tc09-9000B-4c-ethip4-ip4base-ndrpdr
-| | [Tags] | 9000B | 4C
-| | framesize=${9000} | phy_cores=${4}
-
-| tc10-IMIX-1c-ethip4-ip4base-ndrpdr
-| | [Tags] | IMIX | 1C
-| | framesize=IMIX_v4_1 | phy_cores=${1}
-
-| tc11-IMIX-2c-ethip4-ip4base-ndrpdr
-| | [Tags] | IMIX | 2C
-| | framesize=IMIX_v4_1 | phy_cores=${2}
-
-| tc12-IMIX-4c-ethip4-ip4base-ndrpdr
-| | [Tags] | IMIX | 4C
-| | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/ip4/10ge2p1x82599es-ethip4-ip4scale200k-mrr.robot b/tests/vpp/perf/ip4/10ge2p1x82599es-ethip4-ip4scale200k-mrr.robot
deleted file mode 100644
index 9a44555ecc..0000000000
--- a/tests/vpp/perf/ip4/10ge2p1x82599es-ethip4-ip4scale200k-mrr.robot
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright (c) 2019 PANTHEON.tech 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 | MRR
-| ... | NIC_Intel-82599ES | ETH | IP4FWD | SCALE | FIB_200K
-| ...
-| Suite Setup | Set up 3-node performance topology with DUT's NIC model
-| ... | L3 | Intel-82599ES
-| Suite Teardown | Tear down 3-node performance topology
-| ...
-| Test Setup | Set up performance test
-| ...
-| Test Teardown | Tear down performance mrr test
-| ...
-| Test Template | Local Template
-| ...
-| Documentation | *Raw results IPv4 routing 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 82599ES by Intel.
-| ... | *[Ver] TG verification:* In MaxReceivedRate test TG sends traffic\
-| ... | at line rate and reports total received/sent packets over trial period.\
-| ... | 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. MAC addresses are matching MAC\
-| ... | addresses of the TG node interfaces.
-| ... | *[Ref] Applicable standard specifications:* RFC2544.
-
-*** Variables ***
-# 82599ES bandwidth limit
-| ${s_limit}= | ${10000000000}
-| ${rts_per_flow}= | ${100000}
-# Traffic profile:
-| ${traffic_profile}= | trex-sl-3n-ethip4-ip4dst${rts_per_flow}
-
-*** Keywords ***
-| Local Template
-| | ...
-| | [Documentation]
-| | ... | [Cfg] DUT runs IPv4 routing config.
-| | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads.
-| | ... | [Ver] Measure MaxReceivedRate for ${framesize}B frames using single\
-| | ... | trial throughput test.
-| | ...
-| | ... | *Arguments:*
-| | ... | - framesize - Framesize in Bytes in integer or string (IMIX_v4_1).
-| | ... | Type: integer, string
-| | ... | - phy_cores - Number of physical cores. Type: integer
-| | ... | - rxq - Number of RX queues, default value: ${None}. Type: integer
-| | ...
-| | [Arguments] | ${framesize} | ${phy_cores} | ${rxq}=${None}
-| | ...
-| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
-| | And Add PCI devices to all DUTs
-| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
-| | ... | ${s_limit} | ${framesize}
-| | And Apply startup configuration on all VPP DUTs
-| | When Initialize IPv4 forwarding with scaling in circular topology
-| | ... | ${rts_per_flow}
-| | Then Traffic should pass with maximum rate
-| | ... | ${max_rate}pps | ${framesize} | ${traffic_profile}
-
-*** Test Cases ***
-| tc01-64B-1c-ethip4-ip4scale200k-mrr
-| | [Tags] | 64B | 1C
-| | framesize=${64} | phy_cores=${1}
-
-| tc02-64B-2c-ethip4-ip4scale200k-mrr
-| | [Tags] | 64B | 2C
-| | framesize=${64} | phy_cores=${2}
-
-| tc03-64B-4c-ethip4-ip4scale200k-mrr
-| | [Tags] | 64B | 4C
-| | framesize=${64} | phy_cores=${4}
-
-| tc04-1518B-1c-ethip4-ip4scale200k-mrr
-| | [Tags] | 1518B | 1C
-| | framesize=${1518} | phy_cores=${1}
-
-| tc05-1518B-2c-ethip4-ip4scale200k-mrr
-| | [Tags] | 1518B | 2C
-| | framesize=${1518} | phy_cores=${2}
-
-| tc06-1518B-4c-ethip4-ip4scale200k-mrr
-| | [Tags] | 1518B | 4C
-| | framesize=${1518} | phy_cores=${4}
-
-| tc07-9000B-1c-ethip4-ip4scale200k-mrr
-| | [Tags] | 9000B | 1C
-| | framesize=${9000} | phy_cores=${1}
-
-| tc08-9000B-2c-ethip4-ip4scale200k-mrr
-| | [Tags] | 9000B | 2C
-| | framesize=${9000} | phy_cores=${2}
-
-| tc09-9000B-4c-ethip4-ip4scale200k-mrr
-| | [Tags] | 9000B | 4C
-| | framesize=${9000} | phy_cores=${4}
-
-| tc10-IMIX-1c-ethip4-ip4scale200k-mrr
-| | [Tags] | IMIX | 1C
-| | framesize=IMIX_v4_1 | phy_cores=${1}
-
-| tc11-IMIX-2c-ethip4-ip4scale200k-mrr
-| | [Tags] | IMIX | 2C
-| | framesize=IMIX_v4_1 | phy_cores=${2}
-
-| tc12-IMIX-4c-ethip4-ip4scale200k-mrr
-| | [Tags] | IMIX | 4C
-| | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/ip4/10ge2p1x82599es-ethip4-ip4scale200k-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x82599es-ethip4-ip4scale200k-ndrpdr.robot
deleted file mode 100644
index 86ef486c5b..0000000000
--- a/tests/vpp/perf/ip4/10ge2p1x82599es-ethip4-ip4scale200k-ndrpdr.robot
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright (c) 2019 PANTHEON.tech 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 | NDRPDR
-| ... | NIC_Intel-82599ES | ETH | IP4FWD | SCALE | FIB_200K
-| ...
-| Suite Setup | Set up 3-node performance topology with DUT's NIC model
-| ... | L3 | Intel-82599ES
-| Suite Teardown | Tear down 3-node performance topology
-| ...
-| Test Setup | Set up performance test
-| ...
-| Test Teardown | Tear down performance discovery test | ${min_rate}pps
-| ... | ${framesize} | ${traffic_profile}
-| ...
-| Test Template | Local Template
-| ...
-| Documentation | *RFC2544: Pkt throughput IPv4 routing 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 82599ES by Intel.
-| ... | *[Ver] TG verification:* TG finds and reports throughput NDR (Non Drop\
-| ... | Rate) with zero packet loss tolerance or throughput PDR (Partial Drop\
-| ... | Rate) with non-zero packet loss tolerance (LT) expressed in percentage\
-| ... | of packets transmitted. NDR and PDR are discovered for different\
-| ... | Ethernet L2 frame sizes using MLRsearch library.\
-| ... | 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. MAC addresses are matching MAC\
-| ... | addresses of the TG node interfaces.
-| ... | *[Ref] Applicable standard specifications:* RFC2544.
-
-*** Variables ***
-# 82599ES bandwidth limit
-| ${s_limit}= | ${10000000000}
-| ${rts_per_flow}= | ${100000}
-# Traffic profile:
-| ${traffic_profile}= | trex-sl-3n-ethip4-ip4dst${rts_per_flow}
-
-*** Keywords ***
-| Local Template
-| | ...
-| | [Documentation]
-| | ... | [Cfg] DUT runs IPv4 routing config.
-| | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads.
-| | ... | [Ver] Measure NDR and PDR values using MLRsearch algorithm.\
-| | ...
-| | ... | *Arguments:*
-| | ... | - framesize - Framesize in Bytes in integer or string (IMIX_v4_1).
-| | ... | Type: integer, string
-| | ... | - phy_cores - Number of physical cores. Type: integer
-| | ... | - rxq - Number of RX queues, default value: ${None}. Type: integer
-| | ...
-| | [Arguments] | ${framesize} | ${phy_cores} | ${rxq}=${None}
-| | ...
-| | Set Test Variable | ${framesize}
-| | Set Test Variable | ${min_rate} | ${10000}
-| | ...
-| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
-| | And Add PCI devices to all DUTs
-| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
-| | ... | ${s_limit} | ${framesize}
-| | And Apply startup configuration on all VPP DUTs
-| | When Initialize IPv4 forwarding with scaling in circular topology
-| | ... | ${rts_per_flow}
-| | Then Find NDR and PDR intervals using optimized search
-| | ... | ${framesize} | ${traffic_profile} | ${min_rate} | ${max_rate}
-
-*** Test Cases ***
-| tc01-64B-1c-ethip4-ip4scale200k-ndrpdr
-| | [Tags] | 64B | 1C
-| | framesize=${64} | phy_cores=${1}
-
-| tc02-64B-2c-ethip4-ip4scale200k-ndrpdr
-| | [Tags] | 64B | 2C
-| | framesize=${64} | phy_cores=${2}
-
-| tc03-64B-4c-ethip4-ip4scale200k-ndrpdr
-| | [Tags] | 64B | 4C
-| | framesize=${64} | phy_cores=${4}
-
-| tc04-1518B-1c-ethip4-ip4scale200k-ndrpdr
-| | [Tags] | 1518B | 1C
-| | framesize=${1518} | phy_cores=${1}
-
-| tc05-1518B-2c-ethip4-ip4scale200k-ndrpdr
-| | [Tags] | 1518B | 2C
-| | framesize=${1518} | phy_cores=${2}
-
-| tc06-1518B-4c-ethip4-ip4scale200k-ndrpdr
-| | [Tags] | 1518B | 4C
-| | framesize=${1518} | phy_cores=${4}
-
-| tc07-9000B-1c-ethip4-ip4scale200k-ndrpdr
-| | [Tags] | 9000B | 1C
-| | framesize=${9000} | phy_cores=${1}
-
-| tc08-9000B-2c-ethip4-ip4scale200k-ndrpdr
-| | [Tags] | 9000B | 2C
-| | framesize=${9000} | phy_cores=${2}
-
-| tc09-9000B-4c-ethip4-ip4scale200k-ndrpdr
-| | [Tags] | 9000B | 4C
-| | framesize=${9000} | phy_cores=${4}
-
-| tc10-IMIX-1c-ethip4-ip4scale200k-ndrpdr
-| | [Tags] | IMIX | 1C
-| | framesize=IMIX_v4_1 | phy_cores=${1}
-
-| tc11-IMIX-2c-ethip4-ip4scale200k-ndrpdr
-| | [Tags] | IMIX | 2C
-| | framesize=IMIX_v4_1 | phy_cores=${2}
-
-| tc12-IMIX-4c-ethip4-ip4scale200k-ndrpdr
-| | [Tags] | IMIX | 4C
-| | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/ip4/10ge2p1x82599es-ethip4-ip4scale20k-mrr.robot b/tests/vpp/perf/ip4/10ge2p1x82599es-ethip4-ip4scale20k-mrr.robot
deleted file mode 100644
index 797e2a4b21..0000000000
--- a/tests/vpp/perf/ip4/10ge2p1x82599es-ethip4-ip4scale20k-mrr.robot
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright (c) 2019 PANTHEON.tech 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 | MRR
-| ... | NIC_Intel-82599ES | ETH | IP4FWD | SCALE | FIB_20K
-| ...
-| Suite Setup | Set up 3-node performance topology with DUT's NIC model
-| ... | L3 | Intel-82599ES
-| Suite Teardown | Tear down 3-node performance topology
-| ...
-| Test Setup | Set up performance test
-| ...
-| Test Teardown | Tear down performance mrr test
-| ...
-| Test Template | Local Template
-| ...
-| Documentation | *Raw results IPv4 routing 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 82599ES by Intel.
-| ... | *[Ver] TG verification:* In MaxReceivedRate test TG sends traffic\
-| ... | at line rate and reports total received/sent packets over trial period.\
-| ... | 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. MAC addresses are matching MAC\
-| ... | addresses of the TG node interfaces.
-| ... | *[Ref] Applicable standard specifications:* RFC2544.
-
-*** Variables ***
-# 82599ES bandwidth limit
-| ${s_limit}= | ${10000000000}
-| ${rts_per_flow}= | ${10000}
-# Traffic profile:
-| ${traffic_profile}= | trex-sl-3n-ethip4-ip4dst${rts_per_flow}
-
-*** Keywords ***
-| Local Template
-| | ...
-| | [Documentation]
-| | ... | [Cfg] DUT runs IPv4 routing config.
-| | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads.
-| | ... | [Ver] Measure MaxReceivedRate for ${framesize}B frames using single\
-| | ... | trial throughput test.
-| | ...
-| | ... | *Arguments:*
-| | ... | - framesize - Framesize in Bytes in integer or string (IMIX_v4_1).
-| | ... | Type: integer, string
-| | ... | - phy_cores - Number of physical cores. Type: integer
-| | ... | - rxq - Number of RX queues, default value: ${None}. Type: integer
-| | ...
-| | [Arguments] | ${framesize} | ${phy_cores} | ${rxq}=${None}
-| | ...
-| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
-| | And Add PCI devices to all DUTs
-| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
-| | ... | ${s_limit} | ${framesize}
-| | And Apply startup configuration on all VPP DUTs
-| | When Initialize IPv4 forwarding with scaling in circular topology
-| | ... | ${rts_per_flow}
-| | Then Traffic should pass with maximum rate
-| | ... | ${max_rate}pps | ${framesize} | ${traffic_profile}
-
-*** Test Cases ***
-| tc01-64B-1c-ethip4-ip4scale20k-mrr
-| | [Tags] | 64B | 1C
-| | framesize=${64} | phy_cores=${1}
-
-| tc02-64B-2c-ethip4-ip4scale20k-mrr
-| | [Tags] | 64B | 2C
-| | framesize=${64} | phy_cores=${2}
-
-| tc03-64B-4c-ethip4-ip4scale20k-mrr
-| | [Tags] | 64B | 4C
-| | framesize=${64} | phy_cores=${4}
-
-| tc04-1518B-1c-ethip4-ip4scale20k-mrr
-| | [Tags] | 1518B | 1C
-| | framesize=${1518} | phy_cores=${1}
-
-| tc05-1518B-2c-ethip4-ip4scale20k-mrr
-| | [Tags] | 1518B | 2C
-| | framesize=${1518} | phy_cores=${2}
-
-| tc06-1518B-4c-ethip4-ip4scale20k-mrr
-| | [Tags] | 1518B | 4C
-| | framesize=${1518} | phy_cores=${4}
-
-| tc07-9000B-1c-ethip4-ip4scale20k-mrr
-| | [Tags] | 9000B | 1C
-| | framesize=${9000} | phy_cores=${1}
-
-| tc08-9000B-2c-ethip4-ip4scale20k-mrr
-| | [Tags] | 9000B | 2C
-| | framesize=${9000} | phy_cores=${2}
-
-| tc09-9000B-4c-ethip4-ip4scale20k-mrr
-| | [Tags] | 9000B | 4C
-| | framesize=${9000} | phy_cores=${4}
-
-| tc10-IMIX-1c-ethip4-ip4scale20k-mrr
-| | [Tags] | IMIX | 1C
-| | framesize=IMIX_v4_1 | phy_cores=${1}
-
-| tc11-IMIX-2c-ethip4-ip4scale20k-mrr
-| | [Tags] | IMIX | 2C
-| | framesize=IMIX_v4_1 | phy_cores=${2}
-
-| tc12-IMIX-4c-ethip4-ip4scale20k-mrr
-| | [Tags] | IMIX | 4C
-| | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/ip4/10ge2p1x82599es-ethip4-ip4scale20k-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x82599es-ethip4-ip4scale20k-ndrpdr.robot
deleted file mode 100644
index 97dbaa1b75..0000000000
--- a/tests/vpp/perf/ip4/10ge2p1x82599es-ethip4-ip4scale20k-ndrpdr.robot
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright (c) 2019 PANTHEON.tech 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 | NDRPDR
-| ... | NIC_Intel-82599ES | ETH | IP4FWD | SCALE | FIB_20K
-| ...
-| Suite Setup | Set up 3-node performance topology with DUT's NIC model
-| ... | L3 | Intel-82599ES
-| Suite Teardown | Tear down 3-node performance topology
-| ...
-| Test Setup | Set up performance test
-| ...
-| Test Teardown | Tear down performance discovery test | ${min_rate}pps
-| ... | ${framesize} | ${traffic_profile}
-| ...
-| Test Template | Local Template
-| ...
-| Documentation | *RFC2544: Pkt throughput IPv4 routing 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 82599ES by Intel.
-| ... | *[Ver] TG verification:* TG finds and reports throughput NDR (Non Drop\
-| ... | Rate) with zero packet loss tolerance or throughput PDR (Partial Drop\
-| ... | Rate) with non-zero packet loss tolerance (LT) expressed in percentage\
-| ... | of packets transmitted. NDR and PDR are discovered for different\
-| ... | Ethernet L2 frame sizes using MLRsearch library.\
-| ... | 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. MAC addresses are matching MAC\
-| ... | addresses of the TG node interfaces.
-| ... | *[Ref] Applicable standard specifications:* RFC2544.
-
-*** Variables ***
-# 82599ES bandwidth limit
-| ${s_limit}= | ${10000000000}
-| ${rts_per_flow}= | ${10000}
-# Traffic profile:
-| ${traffic_profile}= | trex-sl-3n-ethip4-ip4dst${rts_per_flow}
-
-*** Keywords ***
-| Local Template
-| | ...
-| | [Documentation]
-| | ... | [Cfg] DUT runs IPv4 routing config.
-| | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads.
-| | ... | [Ver] Measure NDR and PDR values using MLRsearch algorithm.\
-| | ...
-| | ... | *Arguments:*
-| | ... | - framesize - Framesize in Bytes in integer or string (IMIX_v4_1).
-| | ... | Type: integer, string
-| | ... | - phy_cores - Number of physical cores. Type: integer
-| | ... | - rxq - Number of RX queues, default value: ${None}. Type: integer
-| | ...
-| | [Arguments] | ${framesize} | ${phy_cores} | ${rxq}=${None}
-| | ...
-| | Set Test Variable | ${framesize}
-| | Set Test Variable | ${min_rate} | ${10000}
-| | ...
-| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
-| | And Add PCI devices to all DUTs
-| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
-| | ... | ${s_limit} | ${framesize}
-| | And Apply startup configuration on all VPP DUTs
-| | When Initialize IPv4 forwarding with scaling in circular topology
-| | ... | ${rts_per_flow}
-| | Then Find NDR and PDR intervals using optimized search
-| | ... | ${framesize} | ${traffic_profile} | ${min_rate} | ${max_rate}
-
-*** Test Cases ***
-| tc01-64B-1c-ethip4-ip4scale20k-ndrpdr
-| | [Tags] | 64B | 1C
-| | framesize=${64} | phy_cores=${1}
-
-| tc02-64B-2c-ethip4-ip4scale20k-ndrpdr
-| | [Tags] | 64B | 2C
-| | framesize=${64} | phy_cores=${2}
-
-| tc03-64B-4c-ethip4-ip4scale20k-ndrpdr
-| | [Tags] | 64B | 4C
-| | framesize=${64} | phy_cores=${4}
-
-| tc04-1518B-1c-ethip4-ip4scale20k-ndrpdr
-| | [Tags] | 1518B | 1C
-| | framesize=${1518} | phy_cores=${1}
-
-| tc05-1518B-2c-ethip4-ip4scale20k-ndrpdr
-| | [Tags] | 1518B | 2C
-| | framesize=${1518} | phy_cores=${2}
-
-| tc06-1518B-4c-ethip4-ip4scale20k-ndrpdr
-| | [Tags] | 1518B | 4C
-| | framesize=${1518} | phy_cores=${4}
-
-| tc07-9000B-1c-ethip4-ip4scale20k-ndrpdr
-| | [Tags] | 9000B | 1C
-| | framesize=${9000} | phy_cores=${1}
-
-| tc08-9000B-2c-ethip4-ip4scale20k-ndrpdr
-| | [Tags] | 9000B | 2C
-| | framesize=${9000} | phy_cores=${2}
-
-| tc09-9000B-4c-ethip4-ip4scale20k-ndrpdr
-| | [Tags] | 9000B | 4C
-| | framesize=${9000} | phy_cores=${4}
-
-| tc10-IMIX-1c-ethip4-ip4scale20k-ndrpdr
-| | [Tags] | IMIX | 1C
-| | framesize=IMIX_v4_1 | phy_cores=${1}
-
-| tc11-IMIX-2c-ethip4-ip4scale20k-ndrpdr
-| | [Tags] | IMIX | 2C
-| | framesize=IMIX_v4_1 | phy_cores=${2}
-
-| tc12-IMIX-4c-ethip4-ip4scale20k-ndrpdr
-| | [Tags] | IMIX | 4C
-| | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/ip4/10ge2p1x82599es-ethip4-ip4scale2m-mrr.robot b/tests/vpp/perf/ip4/10ge2p1x82599es-ethip4-ip4scale2m-mrr.robot
deleted file mode 100644
index 9e55382739..0000000000
--- a/tests/vpp/perf/ip4/10ge2p1x82599es-ethip4-ip4scale2m-mrr.robot
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright (c) 2019 PANTHEON.tech 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 | MRR
-| ... | NIC_Intel-82599ES | ETH | IP4FWD | SCALE | FIB_2M
-| ...
-| Suite Setup | Set up 3-node performance topology with DUT's NIC model
-| ... | L3 | Intel-82599ES
-| Suite Teardown | Tear down 3-node performance topology
-| ...
-| Test Setup | Set up performance test
-| ...
-| Test Teardown | Tear down performance mrr test
-| ...
-| Test Template | Local Template
-| ...
-| Documentation | *Raw results IPv4 routing 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 82599ES by Intel.
-| ... | *[Ver] TG verification:* In MaxReceivedRate test TG sends traffic\
-| ... | at line rate and reports total received/sent packets over trial period.\
-| ... | 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. MAC addresses are matching MAC\
-| ... | addresses of the TG node interfaces.
-| ... | *[Ref] Applicable standard specifications:* RFC2544.
-
-*** Variables ***
-# 82599ES bandwidth limit
-| ${s_limit}= | ${10000000000}
-| ${rts_per_flow}= | ${1000000}
-# Traffic profile:
-| ${traffic_profile}= | trex-sl-3n-ethip4-ip4dst${rts_per_flow}
-
-*** Keywords ***
-| Local Template
-| | ...
-| | [Documentation]
-| | ... | [Cfg] DUT runs IPv4 routing config.
-| | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads.
-| | ... | [Ver] Measure MaxReceivedRate for ${framesize}B frames using single\
-| | ... | trial throughput test.
-| | ...
-| | ... | *Arguments:*
-| | ... | - framesize - Framesize in Bytes in integer or string (IMIX_v4_1).
-| | ... | Type: integer, string
-| | ... | - phy_cores - Number of physical cores. Type: integer
-| | ... | - rxq - Number of RX queues, default value: ${None}. Type: integer
-| | ...
-| | [Arguments] | ${framesize} | ${phy_cores} | ${rxq}=${None}
-| | ...
-| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
-| | And Add PCI devices to all DUTs
-| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
-| | ... | ${s_limit} | ${framesize}
-| | And Apply startup configuration on all VPP DUTs
-| | When Initialize IPv4 forwarding with scaling in circular topology
-| | ... | ${rts_per_flow}
-| | Then Traffic should pass with maximum rate
-| | ... | ${max_rate}pps | ${framesize} | ${traffic_profile}
-
-*** Test Cases ***
-| tc01-64B-1c-ethip4-ip4scale2m-mrr
-| | [Tags] | 64B | 1C
-| | framesize=${64} | phy_cores=${1}
-
-| tc02-64B-2c-ethip4-ip4scale2m-mrr
-| | [Tags] | 64B | 2C
-| | framesize=${64} | phy_cores=${2}
-
-| tc03-64B-4c-ethip4-ip4scale2m-mrr
-| | [Tags] | 64B | 4C
-| | framesize=${64} | phy_cores=${4}
-
-| tc04-1518B-1c-ethip4-ip4scale2m-mrr
-| | [Tags] | 1518B | 1C
-| | framesize=${1518} | phy_cores=${1}
-
-| tc05-1518B-2c-ethip4-ip4scale2m-mrr
-| | [Tags] | 1518B | 2C
-| | framesize=${1518} | phy_cores=${2}
-
-| tc06-1518B-4c-ethip4-ip4scale2m-mrr
-| | [Tags] | 1518B | 4C
-| | framesize=${1518} | phy_cores=${4}
-
-| tc07-9000B-1c-ethip4-ip4scale2m-mrr
-| | [Tags] | 9000B | 1C
-| | framesize=${9000} | phy_cores=${1}
-
-| tc08-9000B-2c-ethip4-ip4scale2m-mrr
-| | [Tags] | 9000B | 2C
-| | framesize=${9000} | phy_cores=${2}
-
-| tc09-9000B-4c-ethip4-ip4scale2m-mrr
-| | [Tags] | 9000B | 4C
-| | framesize=${9000} | phy_cores=${4}
-
-| tc10-IMIX-1c-ethip4-ip4scale2m-mrr
-| | [Tags] | IMIX | 1C
-| | framesize=IMIX_v4_1 | phy_cores=${1}
-
-| tc11-IMIX-2c-ethip4-ip4scale2m-mrr
-| | [Tags] | IMIX | 2C
-| | framesize=IMIX_v4_1 | phy_cores=${2}
-
-| tc12-IMIX-4c-ethip4-ip4scale2m-mrr
-| | [Tags] | IMIX | 4C
-| | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/ip4/10ge2p1x82599es-ethip4-ip4scale2m-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x82599es-ethip4-ip4scale2m-ndrpdr.robot
deleted file mode 100644
index 9c11f1f3f0..0000000000
--- a/tests/vpp/perf/ip4/10ge2p1x82599es-ethip4-ip4scale2m-ndrpdr.robot
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright (c) 2019 PANTHEON.tech 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 | NDRPDR
-| ... | NIC_Intel-82599ES | ETH | IP4FWD | SCALE | FIB_2M
-| ...
-| Suite Setup | Set up 3-node performance topology with DUT's NIC model
-| ... | L3 | Intel-82599ES
-| Suite Teardown | Tear down 3-node performance topology
-| ...
-| Test Setup | Set up performance test
-| ...
-| Test Teardown | Tear down performance discovery test | ${min_rate}pps
-| ... | ${framesize} | ${traffic_profile}
-| ...
-| Test Template | Local Template
-| ...
-| Documentation | *RFC2544: Pkt throughput IPv4 routing 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 82599ES by Intel.
-| ... | *[Ver] TG verification:* TG finds and reports throughput NDR (Non Drop\
-| ... | Rate) with zero packet loss tolerance or throughput PDR (Partial Drop\
-| ... | Rate) with non-zero packet loss tolerance (LT) expressed in percentage\
-| ... | of packets transmitted. NDR and PDR are discovered for different\
-| ... | Ethernet L2 frame sizes using MLRsearch library.\
-| ... | 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. MAC addresses are matching MAC\
-| ... | addresses of the TG node interfaces.
-| ... | *[Ref] Applicable standard specifications:* RFC2544.
-
-*** Variables ***
-# 82599ES bandwidth limit
-| ${s_limit}= | ${10000000000}
-| ${rts_per_flow}= | ${1000000}
-# Traffic profile:
-| ${traffic_profile}= | trex-sl-3n-ethip4-ip4dst${rts_per_flow}
-
-*** Keywords ***
-| Local Template
-| | ...
-| | [Documentation]
-| | ... | [Cfg] DUT runs IPv4 routing config.
-| | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads.
-| | ... | [Ver] Measure NDR and PDR values using MLRsearch algorithm.\
-| | ...
-| | ... | *Arguments:*
-| | ... | - framesize - Framesize in Bytes in integer or string (IMIX_v4_1).
-| | ... | Type: integer, string
-| | ... | - phy_cores - Number of physical cores. Type: integer
-| | ... | - rxq - Number of RX queues, default value: ${None}. Type: integer
-| | ...
-| | [Arguments] | ${framesize} | ${phy_cores} | ${rxq}=${None}
-| | ...
-| | Set Test Variable | ${framesize}
-| | Set Test Variable | ${min_rate} | ${10000}
-| | ...
-| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
-| | And Add PCI devices to all DUTs
-| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
-| | ... | ${s_limit} | ${framesize}
-| | And Apply startup configuration on all VPP DUTs
-| | When Initialize IPv4 forwarding with scaling in circular topology
-| | ... | ${rts_per_flow}
-| | Then Find NDR and PDR intervals using optimized search
-| | ... | ${framesize} | ${traffic_profile} | ${min_rate} | ${max_rate}
-
-*** Test Cases ***
-| tc01-64B-1c-ethip4-ip4scale2m-ndrpdr
-| | [Tags] | 64B | 1C
-| | framesize=${64} | phy_cores=${1}
-
-| tc02-64B-2c-ethip4-ip4scale2m-ndrpdr
-| | [Tags] | 64B | 2C
-| | framesize=${64} | phy_cores=${2}
-
-| tc03-64B-4c-ethip4-ip4scale2m-ndrpdr
-| | [Tags] | 64B | 4C
-| | framesize=${64} | phy_cores=${4}
-
-| tc04-1518B-1c-ethip4-ip4scale2m-ndrpdr
-| | [Tags] | 1518B | 1C
-| | framesize=${1518} | phy_cores=${1}
-
-| tc05-1518B-2c-ethip4-ip4scale2m-ndrpdr
-| | [Tags] | 1518B | 2C
-| | framesize=${1518} | phy_cores=${2}
-
-| tc06-1518B-4c-ethip4-ip4scale2m-ndrpdr
-| | [Tags] | 1518B | 4C
-| | framesize=${1518} | phy_cores=${4}
-
-| tc07-9000B-1c-ethip4-ip4scale2m-ndrpdr
-| | [Tags] | 9000B | 1C
-| | framesize=${9000} | phy_cores=${1}
-
-| tc08-9000B-2c-ethip4-ip4scale2m-ndrpdr
-| | [Tags] | 9000B | 2C
-| | framesize=${9000} | phy_cores=${2}
-
-| tc09-9000B-4c-ethip4-ip4scale2m-ndrpdr
-| | [Tags] | 9000B | 4C
-| | framesize=${9000} | phy_cores=${4}
-
-| tc10-IMIX-1c-ethip4-ip4scale2m-ndrpdr
-| | [Tags] | IMIX | 1C
-| | framesize=IMIX_v4_1 | phy_cores=${1}
-
-| tc11-IMIX-2c-ethip4-ip4scale2m-ndrpdr
-| | [Tags] | IMIX | 2C
-| | framesize=IMIX_v4_1 | phy_cores=${2}
-
-| tc12-IMIX-4c-ethip4-ip4scale2m-ndrpdr
-| | [Tags] | IMIX | 4C
-| | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/ip4/10ge2p1x82599es-ethip4udp-ip4base-iacl50sf-10kflows-mrr.robot b/tests/vpp/perf/ip4/10ge2p1x82599es-ethip4udp-ip4base-iacl50sf-10kflows-mrr.robot
deleted file mode 100644
index 749f11a813..0000000000
--- a/tests/vpp/perf/ip4/10ge2p1x82599es-ethip4udp-ip4base-iacl50sf-10kflows-mrr.robot
+++ /dev/null
@@ -1,147 +0,0 @@
-# Copyright (c) 2019 PANTHEON.tech 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 | MRR
-| ... | NIC_Intel-82599ES | ETH | IP4FWD | FEATURE | ACL | ACL_STATEFUL
-| ... | IACL | ACL50 | 10k_FLOWS
-| ...
-| Suite Setup | Run Keywords
-| ... | Set up 3-node performance topology with DUT's NIC model | L3
-| ... | Intel-82599ES
-| ... | AND | Set up performance test suite with ACL
-| Suite Teardown | Tear down 3-node performance topology
-| ...
-| Test Setup | Set up performance test
-| ...
-| Test Teardown | Tear down performance mrr test
-| ...
-| Test Template | Local Template
-| ...
-| Documentation | *Raw results IPv4 test cases with ACL*
-| ...
-| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology\
-| ... | with single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4-UDP for IPv4 routing.
-| ... | *[Cfg] DUT configuration:* DUT1 and DUT2 are configured with IPv4\
-| ... | routing and one static IPv4 /24 route entries. Required ACL rules are\
-| ... | applied to input paths of both DUT1 intefaces. DUT1 and DUT2 are tested\
-| ... | with 2p10GE NIC 82599ES Niantic by Intel.
-| ... | *[Ver] TG verification:* In MaxReceivedRate test TG sends traffic\
-| ... | at line rate and reports total received/sent packets over trial period.\
-| ... | Test packets are generated by TG on links to DUTs. TG traffic profile\
-| ... | contains two L3 flow-groups (flow-group per direction, ${flows_per_dir}\
-| ... | 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 ***
-# 82599ES bandwidth limit
-| ${s_limit}= | ${10000000000}
-
-# ACL test setup
-| ${acl_action}= | permit+reflect
-| ${acl_apply_type}= | input
-| ${no_hit_aces_number}= | 50
-| ${flows_per_dir}= | 10k
-
-# starting points for non-hitting ACLs
-| ${src_ip_start}= | 30.30.30.1
-| ${dst_ip_start}= | 40.40.40.1
-| ${ip_step}= | ${1}
-| ${sport_start}= | ${1000}
-| ${dport_start}= | ${1000}
-| ${port_step}= | ${1}
-| ${trex_stream1_subnet}= | 10.10.10.0/24
-| ${trex_stream2_subnet}= | 20.20.20.0/24
-
-| ${traffic_profile}= | trex-sl-3n-ethip4udp-10u1000p-conc
-
-*** Keywords ***
-| Local Template
-| | ...
-| | [Documentation]
-| | ... | [Cfg] DUT runs IPv4 routing config.
-| | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads.
-| | ... | [Ver] Measure MaxReceivedRate for ${framesize}B frames using single\
-| | ... | trial throughput test.
-| | ...
-| | ... | *Arguments:*
-| | ... | - framesize - Framesize in Bytes in integer or string (IMIX_v4_1).
-| | ... | Type: integer, string
-| | ... | - phy_cores - Number of physical cores. Type: integer
-| | ... | - rxq - Number of RX queues, default value: ${None}. Type: integer
-| | ...
-| | [Arguments] | ${framesize} | ${phy_cores} | ${rxq}=${None}
-| | ...
-| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
-| | And Add PCI devices to all DUTs
-| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
-| | ... | ${s_limit} | ${framesize}
-| | And Apply startup configuration on all VPP DUTs
-| | ${ip_nr}= | Set Variable | 10
-| | When Initialize IPv4 routing for '${ip_nr}' addresses with IPv4 ACLs on DUT1 in circular topology
-| | Then Traffic should pass with maximum rate
-| | ... | ${max_rate}pps | ${framesize} | ${traffic_profile}
-
-*** Test Cases ***
-| tc01-64B-1c-ethip4udp-ip4base-iacl50sf-10kflows-mrr
-| | [Tags] | 64B | 1C
-| | framesize=${64} | phy_cores=${1}
-
-| tc02-64B-2c-ethip4udp-ip4base-iacl50sf-10kflows-mrr
-| | [Tags] | 64B | 2C
-| | framesize=${64} | phy_cores=${2}
-
-| tc03-64B-4c-ethip4udp-ip4base-iacl50sf-10kflows-mrr
-| | [Tags] | 64B | 4C
-| | framesize=${64} | phy_cores=${4}
-
-| tc04-1518B-1c-ethip4udp-ip4base-iacl50sf-10kflows-mrr
-| | [Tags] | 1518B | 1C
-| | framesize=${1518} | phy_cores=${1}
-
-| tc05-1518B-2c-ethip4udp-ip4base-iacl50sf-10kflows-mrr
-| | [Tags] | 1518B | 2C
-| | framesize=${1518} | phy_cores=${2}
-
-| tc06-1518B-4c-ethip4udp-ip4base-iacl50sf-10kflows-mrr
-| | [Tags] | 1518B | 4C
-| | framesize=${1518} | phy_cores=${4}
-
-| tc07-9000B-1c-ethip4udp-ip4base-iacl50sf-10kflows-mrr
-| | [Tags] | 9000B | 1C
-| | framesize=${9000} | phy_cores=${1}
-
-| tc08-9000B-2c-ethip4udp-ip4base-iacl50sf-10kflows-mrr
-| | [Tags] | 9000B | 2C
-| | framesize=${9000} | phy_cores=${2}
-
-| tc09-9000B-4c-ethip4udp-ip4base-iacl50sf-10kflows-mrr
-| | [Tags] | 9000B | 4C
-| | framesize=${9000} | phy_cores=${4}
-
-| tc10-IMIX-1c-ethip4udp-ip4base-iacl50sf-10kflows-mrr
-| | [Tags] | IMIX | 1C
-| | framesize=IMIX_v4_1 | phy_cores=${1}
-
-| tc11-IMIX-2c-ethip4udp-ip4base-iacl50sf-10kflows-mrr
-| | [Tags] | IMIX | 2C
-| | framesize=IMIX_v4_1 | phy_cores=${2}
-
-| tc12-IMIX-4c-ethip4udp-ip4base-iacl50sf-10kflows-mrr
-| | [Tags] | IMIX | 4C
-| | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/ip4/10ge2p1x82599es-ethip4udp-ip4base-iacl50sf-10kflows-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x82599es-ethip4udp-ip4base-iacl50sf-10kflows-ndrpdr.robot
deleted file mode 100644
index 3d17e93d4b..0000000000
--- a/tests/vpp/perf/ip4/10ge2p1x82599es-ethip4udp-ip4base-iacl50sf-10kflows-ndrpdr.robot
+++ /dev/null
@@ -1,153 +0,0 @@
-# Copyright (c) 2019 PANTHEON.tech 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 | NDRPDR
-| ... | NIC_Intel-82599ES | ETH | IP4FWD | FEATURE | ACL | ACL_STATEFUL
-| ... | IACL | ACL50 | 10k_FLOWS
-| ...
-| Suite Setup | Run Keywords
-| ... | Set up 3-node performance topology with DUT's NIC model | L3
-| ... | Intel-82599ES
-| ... | AND | Set up performance test suite with ACL
-| Suite Teardown | Tear down 3-node performance topology
-| ...
-| Test Setup | Set up performance test
-| ...
-| Test Teardown | Tear down performance discovery test | ${min_rate}pps
-| ... | ${framesize} | ${traffic_profile}
-| ...
-| Test Template | Local Template
-| ...
-| Documentation | *RFC2544: Pkt throughput IPv4 test cases with ACL*
-| ...
-| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology\
-| ... | with single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4-UDP for IPv4 routing.
-| ... | *[Cfg] DUT configuration:* DUT1 and DUT2 are configured with IPv4\
-| ... | routing and one static IPv4 /24 route entries. Required ACL rules are\
-| ... | applied to input paths of both DUT1 intefaces. DUT1 and DUT2 are tested\
-| ... | with 2p10GE NIC 82599ES Niantic by Intel.
-| ... | *[Ver] TG verification:* TG finds and reports throughput NDR (Non Drop\
-| ... | Rate) with zero packet loss tolerance or throughput PDR (Partial Drop\
-| ... | Rate) with non-zero packet loss tolerance (LT) expressed in percentage\
-| ... | of packets transmitted. NDR and PDR are discovered for different\
-| ... | Ethernet L2 frame sizes using MLRsearch library.\
-| ... | Test packets are generated by TG on links to DUTs. TG traffic profile\
-| ... | contains two L3 flow-groups (flow-group per direction, ${flows_per_dir}\
-| ... | 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 ***
-# 82599ES bandwidth limit
-| ${s_limit}= | ${10000000000}
-
-# ACL test setup
-| ${acl_action}= | permit+reflect
-| ${acl_apply_type}= | input
-| ${no_hit_aces_number}= | 50
-| ${flows_per_dir}= | 10k
-
-# starting points for non-hitting ACLs
-| ${src_ip_start}= | 30.30.30.1
-| ${dst_ip_start}= | 40.40.40.1
-| ${ip_step}= | ${1}
-| ${sport_start}= | ${1000}
-| ${dport_start}= | ${1000}
-| ${port_step}= | ${1}
-| ${trex_stream1_subnet}= | 10.10.10.0/24
-| ${trex_stream2_subnet}= | 20.20.20.0/24
-
-| ${traffic_profile}= | trex-sl-3n-ethip4udp-10u1000p-conc
-
-*** Keywords ***
-| Local Template
-| | ...
-| | [Documentation]
-| | ... | [Cfg] DUT runs IPv4 routing config.
-| | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads.
-| | ... | [Ver] Measure NDR and PDR values using MLRsearch algorithm.\
-| | ...
-| | ... | *Arguments:*
-| | ... | - framesize - Framesize in Bytes in integer or string (IMIX_v4_1).
-| | ... | Type: integer, string
-| | ... | - phy_cores - Number of physical cores. Type: integer
-| | ... | - rxq - Number of RX queues, default value: ${None}. Type: integer
-| | ...
-| | [Arguments] | ${framesize} | ${phy_cores} | ${rxq}=${None}
-| | ...
-| | Set Test Variable | ${framesize}
-| | Set Test Variable | ${min_rate} | ${10000}
-| | ...
-| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
-| | And Add PCI devices to all DUTs
-| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
-| | ... | ${s_limit} | ${framesize}
-| | And Apply startup configuration on all VPP DUTs
-| | ${ip_nr}= | Set Variable | 10
-| | When Initialize IPv4 routing for '${ip_nr}' addresses with IPv4 ACLs on DUT1 in circular topology
-| | Then Find NDR and PDR intervals using optimized search
-| | ... | ${framesize} | ${traffic_profile} | ${min_rate} | ${max_rate}
-
-*** Test Cases ***
-| tc01-64B-1c-ethip4udp-ip4base-iacl50sf-10kflows-ndrpdr
-| | [Tags] | 64B | 1C
-| | framesize=${64} | phy_cores=${1}
-
-| tc02-64B-2c-ethip4udp-ip4base-iacl50sf-10kflows-ndrpdr
-| | [Tags] | 64B | 2C
-| | framesize=${64} | phy_cores=${2}
-
-| tc03-64B-4c-ethip4udp-ip4base-iacl50sf-10kflows-ndrpdr
-| | [Tags] | 64B | 4C
-| | framesize=${64} | phy_cores=${4}
-
-| tc04-1518B-1c-ethip4udp-ip4base-iacl50sf-10kflows-ndrpdr
-| | [Tags] | 1518B | 1C
-| | framesize=${1518} | phy_cores=${1}
-
-| tc05-1518B-2c-ethip4udp-ip4base-iacl50sf-10kflows-ndrpdr
-| | [Tags] | 1518B | 2C
-| | framesize=${1518} | phy_cores=${2}
-
-| tc06-1518B-4c-ethip4udp-ip4base-iacl50sf-10kflows-ndrpdr
-| | [Tags] | 1518B | 4C
-| | framesize=${1518} | phy_cores=${4}
-
-| tc07-9000B-1c-ethip4udp-ip4base-iacl50sf-10kflows-ndrpdr
-| | [Tags] | 9000B | 1C
-| | framesize=${9000} | phy_cores=${1}
-
-| tc08-9000B-2c-ethip4udp-ip4base-iacl50sf-10kflows-ndrpdr
-| | [Tags] | 9000B | 2C
-| | framesize=${9000} | phy_cores=${2}
-
-| tc09-9000B-4c-ethip4udp-ip4base-iacl50sf-10kflows-ndrpdr
-| | [Tags] | 9000B | 4C
-| | framesize=${9000} | phy_cores=${4}
-
-| tc10-IMIX-1c-ethip4udp-ip4base-iacl50sf-10kflows-ndrpdr
-| | [Tags] | IMIX | 1C
-| | framesize=IMIX_v4_1 | phy_cores=${1}
-
-| tc11-IMIX-2c-ethip4udp-ip4base-iacl50sf-10kflows-ndrpdr
-| | [Tags] | IMIX | 2C
-| | framesize=IMIX_v4_1 | phy_cores=${2}
-
-| tc12-IMIX-4c-ethip4udp-ip4base-iacl50sf-10kflows-ndrpdr
-| | [Tags] | IMIX | 4C
-| | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/ip4/10ge2p1x82599es-ethip4udp-ip4base-iacl50sl-10kflows-mrr.robot b/tests/vpp/perf/ip4/10ge2p1x82599es-ethip4udp-ip4base-iacl50sl-10kflows-mrr.robot
deleted file mode 100644
index d6f420db07..0000000000
--- a/tests/vpp/perf/ip4/10ge2p1x82599es-ethip4udp-ip4base-iacl50sl-10kflows-mrr.robot
+++ /dev/null
@@ -1,147 +0,0 @@
-# Copyright (c) 2019 PANTHEON.tech 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 | MRR
-| ... | NIC_Intel-82599ES | ETH | IP4FWD | FEATURE | ACL | ACL_STATELESS
-| ... | IACL | ACL50 | 10k_FLOWS
-| ...
-| Suite Setup | Run Keywords
-| ... | Set up 3-node performance topology with DUT's NIC model | L3
-| ... | Intel-82599ES
-| ... | AND | Set up performance test suite with ACL
-| Suite Teardown | Tear down 3-node performance topology
-| ...
-| Test Setup | Set up performance test
-| ...
-| Test Teardown | Tear down performance mrr test
-| ...
-| Test Template | Local Template
-| ...
-| Documentation | *Raw results IPv4 test cases with ACL*
-| ...
-| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology\
-| ... | with single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4-UDP for IPv4 routing.
-| ... | *[Cfg] DUT configuration:* DUT1 and DUT2 are configured with IPv4\
-| ... | routing and one static IPv4 /24 route entries. Required ACL rules are\
-| ... | applied to input paths of both DUT1 intefaces. DUT1 and DUT2 are tested\
-| ... | with 2p10GE NIC 82599ES Niantic by Intel.
-| ... | *[Ver] TG verification:* In MaxReceivedRate test TG sends traffic\
-| ... | at line rate and reports total received/sent packets over trial period.\
-| ... | Test packets are generated by TG on links to DUTs. TG traffic profile\
-| ... | contains two L3 flow-groups (flow-group per direction, ${flows_per_dir}\
-| ... | 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 ***
-# 82599ES bandwidth limit
-| ${s_limit}= | ${10000000000}
-
-# ACL test setup
-| ${acl_action}= | permit
-| ${acl_apply_type}= | input
-| ${no_hit_aces_number}= | 50
-| ${flows_per_dir}= | 10k
-
-# starting points for non-hitting ACLs
-| ${src_ip_start}= | 30.30.30.1
-| ${dst_ip_start}= | 40.40.40.1
-| ${ip_step}= | ${1}
-| ${sport_start}= | ${1000}
-| ${dport_start}= | ${1000}
-| ${port_step}= | ${1}
-| ${trex_stream1_subnet}= | 10.10.10.0/24
-| ${trex_stream2_subnet}= | 20.20.20.0/24
-
-| ${traffic_profile}= | trex-sl-3n-ethip4udp-10u1000p-conc
-
-*** Keywords ***
-| Local Template
-| | ...
-| | [Documentation]
-| | ... | [Cfg] DUT runs IPv4 routing config.
-| | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads.
-| | ... | [Ver] Measure MaxReceivedRate for ${framesize}B frames using single\
-| | ... | trial throughput test.
-| | ...
-| | ... | *Arguments:*
-| | ... | - framesize - Framesize in Bytes in integer or string (IMIX_v4_1).
-| | ... | Type: integer, string
-| | ... | - phy_cores - Number of physical cores. Type: integer
-| | ... | - rxq - Number of RX queues, default value: ${None}. Type: integer
-| | ...
-| | [Arguments] | ${framesize} | ${phy_cores} | ${rxq}=${None}
-| | ...
-| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
-| | And Add PCI devices to all DUTs
-| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
-| | ... | ${s_limit} | ${framesize}
-| | And Apply startup configuration on all VPP DUTs
-| | ${ip_nr}= | Set Variable | 10
-| | When Initialize IPv4 routing for '${ip_nr}' addresses with IPv4 ACLs on DUT1 in circular topology
-| | Then Traffic should pass with maximum rate
-| | ... | ${max_rate}pps | ${framesize} | ${traffic_profile}
-
-*** Test Cases ***
-| tc01-64B-1c-ethip4udp-ip4base-iacl50sl-10kflows-mrr
-| | [Tags] | 64B | 1C
-| | framesize=${64} | phy_cores=${1}
-
-| tc02-64B-2c-ethip4udp-ip4base-iacl50sl-10kflows-mrr
-| | [Tags] | 64B | 2C
-| | framesize=${64} | phy_cores=${2}
-
-| tc03-64B-4c-ethip4udp-ip4base-iacl50sl-10kflows-mrr
-| | [Tags] | 64B | 4C
-| | framesize=${64} | phy_cores=${4}
-
-| tc04-1518B-1c-ethip4udp-ip4base-iacl50sl-10kflows-mrr
-| | [Tags] | 1518B | 1C
-| | framesize=${1518} | phy_cores=${1}
-
-| tc05-1518B-2c-ethip4udp-ip4base-iacl50sl-10kflows-mrr
-| | [Tags] | 1518B | 2C
-| | framesize=${1518} | phy_cores=${2}
-
-| tc06-1518B-4c-ethip4udp-ip4base-iacl50sl-10kflows-mrr
-| | [Tags] | 1518B | 4C
-| | framesize=${1518} | phy_cores=${4}
-
-| tc07-9000B-1c-ethip4udp-ip4base-iacl50sl-10kflows-mrr
-| | [Tags] | 9000B | 1C
-| | framesize=${9000} | phy_cores=${1}
-
-| tc08-9000B-2c-ethip4udp-ip4base-iacl50sl-10kflows-mrr
-| | [Tags] | 9000B | 2C
-| | framesize=${9000} | phy_cores=${2}
-
-| tc09-9000B-4c-ethip4udp-ip4base-iacl50sl-10kflows-mrr
-| | [Tags] | 9000B | 4C
-| | framesize=${9000} | phy_cores=${4}
-
-| tc10-IMIX-1c-ethip4udp-ip4base-iacl50sl-10kflows-mrr
-| | [Tags] | IMIX | 1C
-| | framesize=IMIX_v4_1 | phy_cores=${1}
-
-| tc11-IMIX-2c-ethip4udp-ip4base-iacl50sl-10kflows-mrr
-| | [Tags] | IMIX | 2C
-| | framesize=IMIX_v4_1 | phy_cores=${2}
-
-| tc12-IMIX-4c-ethip4udp-ip4base-iacl50sl-10kflows-mrr
-| | [Tags] | IMIX | 4C
-| | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/ip4/10ge2p1x82599es-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x82599es-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr.robot
deleted file mode 100644
index f122dfa5c8..0000000000
--- a/tests/vpp/perf/ip4/10ge2p1x82599es-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr.robot
+++ /dev/null
@@ -1,153 +0,0 @@
-# Copyright (c) 2019 PANTHEON.tech 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 | NDRPDR
-| ... | NIC_Intel-82599ES | ETH | IP4FWD | FEATURE | ACL | ACL_STATELESS
-| ... | IACL | ACL50 | 10k_FLOWS
-| ...
-| Suite Setup | Run Keywords
-| ... | Set up 3-node performance topology with DUT's NIC model | L3
-| ... | Intel-82599ES
-| ... | AND | Set up performance test suite with ACL
-| Suite Teardown | Tear down 3-node performance topology
-| ...
-| Test Setup | Set up performance test
-| ...
-| Test Teardown | Tear down performance discovery test | ${min_rate}pps
-| ... | ${framesize} | ${traffic_profile}
-| ...
-| Test Template | Local Template
-| ...
-| Documentation | *RFC2544: Pkt throughput IPv4 test cases with ACL*
-| ...
-| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology\
-| ... | with single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4-UDP for IPv4 routing.
-| ... | *[Cfg] DUT configuration:* DUT1 and DUT2 are configured with IPv4\
-| ... | routing and one static IPv4 /24 route entries. Required ACL rules are\
-| ... | applied to input paths of both DUT1 intefaces. DUT1 and DUT2 are tested\
-| ... | with 2p10GE NIC 82599ES Niantic by Intel.
-| ... | *[Ver] TG verification:* TG finds and reports throughput NDR (Non Drop\
-| ... | Rate) with zero packet loss tolerance or throughput PDR (Partial Drop\
-| ... | Rate) with non-zero packet loss tolerance (LT) expressed in percentage\
-| ... | of packets transmitted. NDR and PDR are discovered for different\
-| ... | Ethernet L2 frame sizes using MLRsearch library.\
-| ... | Test packets are generated by TG on links to DUTs. TG traffic profile\
-| ... | contains two L3 flow-groups (flow-group per direction, ${flows_per_dir}\
-| ... | 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 ***
-# 82599ES bandwidth limit
-| ${s_limit}= | ${10000000000}
-
-# ACL test setup
-| ${acl_action}= | permit
-| ${acl_apply_type}= | input
-| ${no_hit_aces_number}= | 50
-| ${flows_per_dir}= | 10k
-
-# starting points for non-hitting ACLs
-| ${src_ip_start}= | 30.30.30.1
-| ${dst_ip_start}= | 40.40.40.1
-| ${ip_step}= | ${1}
-| ${sport_start}= | ${1000}
-| ${dport_start}= | ${1000}
-| ${port_step}= | ${1}
-| ${trex_stream1_subnet}= | 10.10.10.0/24
-| ${trex_stream2_subnet}= | 20.20.20.0/24
-
-| ${traffic_profile}= | trex-sl-3n-ethip4udp-10u1000p-conc
-
-*** Keywords ***
-| Local Template
-| | ...
-| | [Documentation]
-| | ... | [Cfg] DUT runs IPv4 routing config.
-| | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads.
-| | ... | [Ver] Measure NDR and PDR values using MLRsearch algorithm.\
-| | ...
-| | ... | *Arguments:*
-| | ... | - framesize - Framesize in Bytes in integer or string (IMIX_v4_1).
-| | ... | Type: integer, string
-| | ... | - phy_cores - Number of physical cores. Type: integer
-| | ... | - rxq - Number of RX queues, default value: ${None}. Type: integer
-| | ...
-| | [Arguments] | ${framesize} | ${phy_cores} | ${rxq}=${None}
-| | ...
-| | Set Test Variable | ${framesize}
-| | Set Test Variable | ${min_rate} | ${10000}
-| | ...
-| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
-| | And Add PCI devices to all DUTs
-| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
-| | ... | ${s_limit} | ${framesize}
-| | And Apply startup configuration on all VPP DUTs
-| | ${ip_nr}= | Set Variable | 10
-| | When Initialize IPv4 routing for '${ip_nr}' addresses with IPv4 ACLs on DUT1 in circular topology
-| | Then Find NDR and PDR intervals using optimized search
-| | ... | ${framesize} | ${traffic_profile} | ${min_rate} | ${max_rate}
-
-*** Test Cases ***
-| tc01-64B-1c-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr
-| | [Tags] | 64B | 1C
-| | framesize=${64} | phy_cores=${1}
-
-| tc02-64B-2c-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr
-| | [Tags] | 64B | 2C
-| | framesize=${64} | phy_cores=${2}
-
-| tc03-64B-4c-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr
-| | [Tags] | 64B | 4C
-| | framesize=${64} | phy_cores=${4}
-
-| tc04-1518B-1c-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr
-| | [Tags] | 1518B | 1C
-| | framesize=${1518} | phy_cores=${1}
-
-| tc05-1518B-2c-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr
-| | [Tags] | 1518B | 2C
-| | framesize=${1518} | phy_cores=${2}
-
-| tc06-1518B-4c-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr
-| | [Tags] | 1518B | 4C
-| | framesize=${1518} | phy_cores=${4}
-
-| tc07-9000B-1c-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr
-| | [Tags] | 9000B | 1C
-| | framesize=${9000} | phy_cores=${1}
-
-| tc08-9000B-2c-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr
-| | [Tags] | 9000B | 2C
-| | framesize=${9000} | phy_cores=${2}
-
-| tc09-9000B-4c-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr
-| | [Tags] | 9000B | 4C
-| | framesize=${9000} | phy_cores=${4}
-
-| tc10-IMIX-1c-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr
-| | [Tags] | IMIX | 1C
-| | framesize=IMIX_v4_1 | phy_cores=${1}
-
-| tc11-IMIX-2c-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr
-| | [Tags] | IMIX | 2C
-| | framesize=IMIX_v4_1 | phy_cores=${2}
-
-| tc12-IMIX-4c-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr
-| | [Tags] | IMIX | 4C
-| | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/ip4/10ge2p1x82599es-ethip4udp-ip4base-nat44-mrr.robot b/tests/vpp/perf/ip4/10ge2p1x82599es-ethip4udp-ip4base-nat44-mrr.robot
deleted file mode 100644
index b62048f4f3..0000000000
--- a/tests/vpp/perf/ip4/10ge2p1x82599es-ethip4udp-ip4base-nat44-mrr.robot
+++ /dev/null
@@ -1,131 +0,0 @@
-# Copyright (c) 2019 PANTHEON.tech 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/ip/nat.robot
-| Resource | resources/libraries/robot/shared/traffic.robot
-| ...
-| Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | MRR
-| ... | NIC_Intel-82599ES | ETH | IP4FWD | FEATURE | NAT44 | BASE
-| ...
-| Suite Setup | Run Keywords
-| ... | Set up 3-node performance topology with DUT's NIC model | L3
-| ... | Intel-82599ES
-| ... | AND | Set up performance test suite with NAT
-| Suite Teardown | Tear down 3-node performance topology
-| ...
-| Test Setup | Set up performance test
-| ...
-| Test Teardown | Tear down performance mrr test
-| ...
-| Test Template | Local Template
-| ...
-| Documentation | *Raw results NAT44 performance test cases*
-| ...
-| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology
-| ... | with single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4-UDP for IPv4 routing.
-| ... | *[Cfg] DUT configuration:* DUT1 and DUT2 are configured with IPv4
-| ... | routing and two static IPv4 /24 and IPv4/20 route entries. DUT1 and DUT2
-| ... | tested with 2p10GE NIC 82599ES by Intel.
-| ... | *[Ver] TG verification:* In MaxReceivedRate test TG sends traffic
-| ... | at line rate and reports total received/sent packets over trial period.
-| ... | 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 ***
-# 82599ES bandwidth limit
-| ${s_limit}= | ${10000000000}
-# Traffic profile:
-| ${traffic_profile}= | trex-sl-3n-ethip4udp-1u1p
-
-*** Keywords ***
-| Local Template
-| | ...
-| | [Documentation]
-| | ... | [Cfg] DUT runs IPv4 routing config.
-| | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads.
-| | ... | [Ver] Measure MaxReceivedRate for ${framesize}B frames using single\
-| | ... | trial throughput test.
-| | ...
-| | ... | *Arguments:*
-| | ... | - framesize - Framesize in Bytes in integer or string (IMIX_v4_1).
-| | ... | Type: integer, string
-| | ... | - phy_cores - Number of physical cores. Type: integer
-| | ... | - rxq - Number of RX queues, default value: ${None}. Type: integer
-| | ...
-| | [Arguments] | ${framesize} | ${phy_cores} | ${rxq}=${None}
-| | ...
-| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
-| | And Add PCI devices to all DUTs
-| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
-| | ... | ${s_limit} | ${framesize}
-| | And Add NAT to all DUTs
-| | And Apply startup configuration on all VPP DUTs
-| | When Initialize NAT44 in circular topology
-| | Then Traffic should pass with maximum rate
-| | ... | ${max_rate}pps | ${framesize} | ${traffic_profile}
-
-*** Test Cases ***
-| tc01-64B-1c-ethip4udp-ip4base-nat44-mrr
-| | [Tags] | 64B | 1C
-| | framesize=${64} | phy_cores=${1}
-
-| tc02-64B-2c-ethip4udp-ip4base-nat44-mrr
-| | [Tags] | 64B | 2C
-| | framesize=${64} | phy_cores=${2}
-
-| tc03-64B-4c-ethip4udp-ip4base-nat44-mrr
-| | [Tags] | 64B | 4C
-| | framesize=${64} | phy_cores=${4}
-
-| tc04-1518B-1c-ethip4udp-ip4base-nat44-mrr
-| | [Tags] | 1518B | 1C
-| | framesize=${1518} | phy_cores=${1}
-
-| tc05-1518B-2c-ethip4udp-ip4base-nat44-mrr
-| | [Tags] | 1518B | 2C
-| | framesize=${1518} | phy_cores=${2}
-
-| tc06-1518B-4c-ethip4udp-ip4base-nat44-mrr
-| | [Tags] | 1518B | 4C
-| | framesize=${1518} | phy_cores=${4}
-
-| tc07-9000B-1c-ethip4udp-ip4base-nat44-mrr
-| | [Tags] | 9000B | 1C
-| | framesize=${9000} | phy_cores=${1}
-
-| tc08-9000B-2c-ethip4udp-ip4base-nat44-mrr
-| | [Tags] | 9000B | 2C
-| | framesize=${9000} | phy_cores=${2}
-
-| tc09-9000B-4c-ethip4udp-ip4base-nat44-mrr
-| | [Tags] | 9000B | 4C
-| | framesize=${9000} | phy_cores=${4}
-
-| tc10-IMIX-1c-ethip4udp-ip4base-nat44-mrr
-| | [Tags] | IMIX | 1C
-| | framesize=IMIX_v4_1 | phy_cores=${1}
-
-| tc11-IMIX-2c-ethip4udp-ip4base-nat44-mrr
-| | [Tags] | IMIX | 2C
-| | framesize=IMIX_v4_1 | phy_cores=${2}
-
-| tc12-IMIX-4c-ethip4udp-ip4base-nat44-mrr
-| | [Tags] | IMIX | 4C
-| | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/ip4/10ge2p1x82599es-ethip4udp-ip4base-nat44-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x82599es-ethip4udp-ip4base-nat44-ndrpdr.robot
deleted file mode 100644
index f5b4c25293..0000000000
--- a/tests/vpp/perf/ip4/10ge2p1x82599es-ethip4udp-ip4base-nat44-ndrpdr.robot
+++ /dev/null
@@ -1,137 +0,0 @@
-# Copyright (c) 2019 PANTHEON.tech 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/ip/nat.robot
-| Resource | resources/libraries/robot/shared/traffic.robot
-| ...
-| Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR
-| ... | NIC_Intel-82599ES | ETH | IP4FWD | FEATURE | NAT44 | BASE
-| ...
-| Suite Setup | Run Keywords
-| ... | Set up 3-node performance topology with DUT's NIC model | L3
-| ... | Intel-82599ES
-| ... | AND | Set up performance test suite with NAT
-| Suite Teardown | Tear down 3-node performance topology
-| ...
-| Test Setup | Set up performance test
-| ...
-| Test Teardown | Tear down performance discovery test | ${min_rate}pps
-| ... | ${framesize} | ${traffic_profile}
-| ...
-| Test Template | Local Template
-| ...
-| Documentation | *RFC2544: Pkt throughput NAT44 performance test cases*
-| ...
-| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology
-| ... | with single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4-UDP for IPv4 routing.
-| ... | *[Cfg] DUT configuration:* DUT1 and DUT2 are configured with IPv4
-| ... | routing and two static IPv4 /24 and IPv4/20 route entries. DUT1 and DUT2
-| ... | tested with 2p10GE NIC 82599ES by Intel.
-| ... | *[Ver] TG verification:* TG finds and reports throughput NDR (Non Drop
-| ... | Rate) with zero packet loss tolerance or throughput PDR (Partial Drop
-| ... | Rate) with non-zero packet loss tolerance (LT) expressed in percentage
-| ... | of packets transmitted. NDR and PDR are discovered for different
-| ... | Ethernet L2 frame sizes using MLRsearch library.
-| ... | 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 ***
-# 82599ES bandwidth limit
-| ${s_limit}= | ${10000000000}
-# Traffic profile:
-| ${traffic_profile}= | trex-sl-3n-ethip4udp-1u1p
-
-*** Keywords ***
-| Local Template
-| | ...
-| | [Documentation]
-| | ... | [Cfg] DUT runs IPv4 routing config.
-| | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads.
-| | ... | [Ver] Measure NDR and PDR values using MLRsearch algorithm.\
-| | ...
-| | ... | *Arguments:*
-| | ... | - framesize - Framesize in Bytes in integer or string (IMIX_v4_1).
-| | ... | Type: integer, string
-| | ... | - phy_cores - Number of physical cores. Type: integer
-| | ... | - rxq - Number of RX queues, default value: ${None}. Type: integer
-| | ...
-| | [Arguments] | ${framesize} | ${phy_cores} | ${rxq}=${None}
-| | ...
-| | Set Test Variable | ${framesize}
-| | Set Test Variable | ${min_rate} | ${10000}
-| | ...
-| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
-| | And Add PCI devices to all DUTs
-| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
-| | ... | ${s_limit} | ${framesize}
-| | And Add NAT to all DUTs
-| | And Apply startup configuration on all VPP DUTs
-| | When Initialize NAT44 in circular topology
-| | Then Find NDR and PDR intervals using optimized search
-| | ... | ${framesize} | ${traffic_profile} | ${min_rate} | ${max_rate}
-
-*** Test Cases ***
-| tc01-64B-1c-ethip4udp-ip4base-nat44-ndrpdr
-| | [Tags] | 64B | 1C
-| | framesize=${64} | phy_cores=${1}
-
-| tc02-64B-2c-ethip4udp-ip4base-nat44-ndrpdr
-| | [Tags] | 64B | 2C
-| | framesize=${64} | phy_cores=${2}
-
-| tc03-64B-4c-ethip4udp-ip4base-nat44-ndrpdr
-| | [Tags] | 64B | 4C
-| | framesize=${64} | phy_cores=${4}
-
-| tc04-1518B-1c-ethip4udp-ip4base-nat44-ndrpdr
-| | [Tags] | 1518B | 1C
-| | framesize=${1518} | phy_cores=${1}
-
-| tc05-1518B-2c-ethip4udp-ip4base-nat44-ndrpdr
-| | [Tags] | 1518B | 2C
-| | framesize=${1518} | phy_cores=${2}
-
-| tc06-1518B-4c-ethip4udp-ip4base-nat44-ndrpdr
-| | [Tags] | 1518B | 4C
-| | framesize=${1518} | phy_cores=${4}
-
-| tc07-9000B-1c-ethip4udp-ip4base-nat44-ndrpdr
-| | [Tags] | 9000B | 1C
-| | framesize=${9000} | phy_cores=${1}
-
-| tc08-9000B-2c-ethip4udp-ip4base-nat44-ndrpdr
-| | [Tags] | 9000B | 2C
-| | framesize=${9000} | phy_cores=${2}
-
-| tc09-9000B-4c-ethip4udp-ip4base-nat44-ndrpdr
-| | [Tags] | 9000B | 4C
-| | framesize=${9000} | phy_cores=${4}
-
-| tc10-IMIX-1c-ethip4udp-ip4base-nat44-ndrpdr
-| | [Tags] | IMIX | 1C
-| | framesize=IMIX_v4_1 | phy_cores=${1}
-
-| tc11-IMIX-2c-ethip4udp-ip4base-nat44-ndrpdr
-| | [Tags] | IMIX | 2C
-| | framesize=IMIX_v4_1 | phy_cores=${2}
-
-| tc12-IMIX-4c-ethip4udp-ip4base-nat44-ndrpdr
-| | [Tags] | IMIX | 4C
-| | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/ip4/10ge2p1x82599es-ethip4udp-ip4scale1000-udpsrcscale15-nat44-mrr.robot b/tests/vpp/perf/ip4/10ge2p1x82599es-ethip4udp-ip4scale1000-udpsrcscale15-nat44-mrr.robot
deleted file mode 100644
index deb12e279e..0000000000
--- a/tests/vpp/perf/ip4/10ge2p1x82599es-ethip4udp-ip4scale1000-udpsrcscale15-nat44-mrr.robot
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright (c) 2019 PANTHEON.tech 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/ip/nat.robot
-| Resource | resources/libraries/robot/shared/traffic.robot
-| ...
-| Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | MRR
-| ... | NIC_Intel-82599ES | ETH | IP4FWD | FEATURE | NAT44 | SRC_USER_1000
-| ... | SCALE
-| ...
-| Suite Setup | Run Keywords
-| ... | Set up 3-node performance topology with DUT's NIC model | L3
-| ... | Intel-82599ES
-| ... | AND | Set up performance test suite with NAT
-| Suite Teardown | Tear down 3-node performance topology
-| ...
-| Test Setup | Set up performance test
-| ...
-| Test Teardown | Tear down performance mrr test
-| ...
-| Test Template | Local Template
-| ...
-| Documentation | *Raw results NAT44 performance test cases*
-| ...
-| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology
-| ... | with single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4-UDP for IPv4 routing.
-| ... | *[Cfg] DUT configuration:* DUT1 and DUT2 are configured with IPv4
-| ... | routing and two static IPv4 /24 and IPv4/20 route entries. DUT1 and DUT2
-| ... | tested with 2p10GE NIC 82599ES by Intel.
-| ... | *[Ver] TG verification:* In MaxReceivedRate test TG sends traffic
-| ... | at line rate and reports total received/sent packets over trial period.
-| ... | 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 ***
-# 82599ES bandwidth limit
-| ${s_limit}= | ${10000000000}
-# Traffic profile:
-| ${traffic_profile}= | trex-sl-3n-ethip4udp-1000u15p
-
-*** Keywords ***
-| Local Template
-| | ...
-| | [Documentation]
-| | ... | [Cfg] DUT runs IPv4 routing config.
-| | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads.
-| | ... | [Ver] Measure MaxReceivedRate for ${framesize}B frames using single\
-| | ... | trial throughput test.
-| | ...
-| | ... | *Arguments:*
-| | ... | - framesize - Framesize in Bytes in integer or string (IMIX_v4_1).
-| | ... | Type: integer, string
-| | ... | - phy_cores - Number of physical cores. Type: integer
-| | ... | - rxq - Number of RX queues, default value: ${None}. Type: integer
-| | ...
-| | [Arguments] | ${framesize} | ${phy_cores} | ${rxq}=${None}
-| | ...
-| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
-| | And Add PCI devices to all DUTs
-| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
-| | ... | ${s_limit} | ${framesize}
-| | And Add NAT to all DUTs
-| | And Apply startup configuration on all VPP DUTs
-| | When Initialize NAT44 in circular topology
-| | Then Traffic should pass with maximum rate
-| | ... | ${max_rate}pps | ${framesize} | ${traffic_profile}
-
-*** Test Cases ***
-| tc01-64B-1c-ethip4udp-ip4scale1000-udpsrcscale15-nat44-mrr
-| | [Tags] | 64B | 1C
-| | framesize=${64} | phy_cores=${1}
-
-| tc02-64B-2c-ethip4udp-ip4scale1000-udpsrcscale15-nat44-mrr
-| | [Tags] | 64B | 2C
-| | framesize=${64} | phy_cores=${2}
-
-| tc03-64B-4c-ethip4udp-ip4scale1000-udpsrcscale15-nat44-mrr
-| | [Tags] | 64B | 4C
-| | framesize=${64} | phy_cores=${4}
-
-| tc04-1518B-1c-ethip4udp-ip4scale1000-udpsrcscale15-nat44-mrr
-| | [Tags] | 1518B | 1C
-| | framesize=${1518} | phy_cores=${1}
-
-| tc05-1518B-2c-ethip4udp-ip4scale1000-udpsrcscale15-nat44-mrr
-| | [Tags] | 1518B | 2C
-| | framesize=${1518} | phy_cores=${2}
-
-| tc06-1518B-4c-ethip4udp-ip4scale1000-udpsrcscale15-nat44-mrr
-| | [Tags] | 1518B | 4C
-| | framesize=${1518} | phy_cores=${4}
-
-| tc07-9000B-1c-ethip4udp-ip4scale1000-udpsrcscale15-nat44-mrr
-| | [Tags] | 9000B | 1C
-| | framesize=${9000} | phy_cores=${1}
-
-| tc08-9000B-2c-ethip4udp-ip4scale1000-udpsrcscale15-nat44-mrr
-| | [Tags] | 9000B | 2C
-| | framesize=${9000} | phy_cores=${2}
-
-| tc09-9000B-4c-ethip4udp-ip4scale1000-udpsrcscale15-nat44-mrr
-| | [Tags] | 9000B | 4C
-| | framesize=${9000} | phy_cores=${4}
-
-| tc10-IMIX-1c-ethip4udp-ip4scale1000-udpsrcscale15-nat44-mrr
-| | [Tags] | IMIX | 1C
-| | framesize=IMIX_v4_1 | phy_cores=${1}
-
-| tc11-IMIX-2c-ethip4udp-ip4scale1000-udpsrcscale15-nat44-mrr
-| | [Tags] | IMIX | 2C
-| | framesize=IMIX_v4_1 | phy_cores=${2}
-
-| tc12-IMIX-4c-ethip4udp-ip4scale1000-udpsrcscale15-nat44-mrr
-| | [Tags] | IMIX | 4C
-| | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/ip4/10ge2p1x82599es-ethip4udp-ip4scale1000-udpsrcscale15-nat44-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x82599es-ethip4udp-ip4scale1000-udpsrcscale15-nat44-ndrpdr.robot
deleted file mode 100644
index 9323778a50..0000000000
--- a/tests/vpp/perf/ip4/10ge2p1x82599es-ethip4udp-ip4scale1000-udpsrcscale15-nat44-ndrpdr.robot
+++ /dev/null
@@ -1,138 +0,0 @@
-# Copyright (c) 2019 PANTHEON.tech 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/ip/nat.robot
-| Resource | resources/libraries/robot/shared/traffic.robot
-| ...
-| Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR
-| ... | NIC_Intel-82599ES | ETH | IP4FWD | FEATURE | NAT44 | SRC_USER_1000
-| ... | SCALE
-| ...
-| Suite Setup | Run Keywords
-| ... | Set up 3-node performance topology with DUT's NIC model | L3
-| ... | Intel-82599ES
-| ... | AND | Set up performance test suite with NAT
-| Suite Teardown | Tear down 3-node performance topology
-| ...
-| Test Setup | Set up performance test
-| ...
-| Test Teardown | Tear down performance discovery test | ${min_rate}pps
-| ... | ${framesize} | ${traffic_profile}
-| ...
-| Test Template | Local Template
-| ...
-| Documentation | *RFC2544: Pkt throughput NAT44 performance test cases*
-| ...
-| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology
-| ... | with single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4-UDP for IPv4 routing.
-| ... | *[Cfg] DUT configuration:* DUT1 and DUT2 are configured with IPv4
-| ... | routing and two static IPv4 /24 and IPv4/20 route entries. DUT1 and DUT2
-| ... | tested with 2p10GE NIC 82599ES by Intel.
-| ... | *[Ver] TG verification:* TG finds and reports throughput NDR (Non Drop
-| ... | Rate) with zero packet loss tolerance or throughput PDR (Partial Drop
-| ... | Rate) with non-zero packet loss tolerance (LT) expressed in percentage
-| ... | of packets transmitted. NDR and PDR are discovered for different
-| ... | Ethernet L2 frame sizes using MLRsearch library.
-| ... | 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 ***
-# 82599ES bandwidth limit
-| ${s_limit}= | ${10000000000}
-# Traffic profile:
-| ${traffic_profile}= | trex-sl-3n-ethip4udp-1000u15p
-
-*** Keywords ***
-| Local Template
-| | ...
-| | [Documentation]
-| | ... | [Cfg] DUT runs IPv4 routing config.
-| | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads.
-| | ... | [Ver] Measure NDR and PDR values using MLRsearch algorithm.\
-| | ...
-| | ... | *Arguments:*
-| | ... | - framesize - Framesize in Bytes in integer or string (IMIX_v4_1).
-| | ... | Type: integer, string
-| | ... | - phy_cores - Number of physical cores. Type: integer
-| | ... | - rxq - Number of RX queues, default value: ${None}. Type: integer
-| | ...
-| | [Arguments] | ${framesize} | ${phy_cores} | ${rxq}=${None}
-| | ...
-| | Set Test Variable | ${framesize}
-| | Set Test Variable | ${min_rate} | ${10000}
-| | ...
-| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
-| | And Add PCI devices to all DUTs
-| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
-| | ... | ${s_limit} | ${framesize}
-| | And Add NAT to all DUTs
-| | And Apply startup configuration on all VPP DUTs
-| | When Initialize NAT44 in circular topology
-| | Then Find NDR and PDR intervals using optimized search
-| | ... | ${framesize} | ${traffic_profile} | ${min_rate} | ${max_rate}
-
-*** Test Cases ***
-| tc01-64B-1c-ethip4udp-ip4scale1000-udpsrcscale15-nat44-ndrpdr
-| | [Tags] | 64B | 1C
-| | framesize=${64} | phy_cores=${1}
-
-| tc02-64B-2c-ethip4udp-ip4scale1000-udpsrcscale15-nat44-ndrpdr
-| | [Tags] | 64B | 2C
-| | framesize=${64} | phy_cores=${2}
-
-| tc03-64B-4c-ethip4udp-ip4scale1000-udpsrcscale15-nat44-ndrpdr
-| | [Tags] | 64B | 4C
-| | framesize=${64} | phy_cores=${4}
-
-| tc04-1518B-1c-ethip4udp-ip4scale1000-udpsrcscale15-nat44-ndrpdr
-| | [Tags] | 1518B | 1C
-| | framesize=${1518} | phy_cores=${1}
-
-| tc05-1518B-2c-ethip4udp-ip4scale1000-udpsrcscale15-nat44-ndrpdr
-| | [Tags] | 1518B | 2C
-| | framesize=${1518} | phy_cores=${2}
-
-| tc06-1518B-4c-ethip4udp-ip4scale1000-udpsrcscale15-nat44-ndrpdr
-| | [Tags] | 1518B | 4C
-| | framesize=${1518} | phy_cores=${4}
-
-| tc07-9000B-1c-ethip4udp-ip4scale1000-udpsrcscale15-nat44-ndrpdr
-| | [Tags] | 9000B | 1C
-| | framesize=${9000} | phy_cores=${1}
-
-| tc08-9000B-2c-ethip4udp-ip4scale1000-udpsrcscale15-nat44-ndrpdr
-| | [Tags] | 9000B | 2C
-| | framesize=${9000} | phy_cores=${2}
-
-| tc09-9000B-4c-ethip4udp-ip4scale1000-udpsrcscale15-nat44-ndrpdr
-| | [Tags] | 9000B | 4C
-| | framesize=${9000} | phy_cores=${4}
-
-| tc10-IMIX-1c-ethip4udp-ip4scale1000-udpsrcscale15-nat44-ndrpdr
-| | [Tags] | IMIX | 1C
-| | framesize=IMIX_v4_1 | phy_cores=${1}
-
-| tc11-IMIX-2c-ethip4udp-ip4scale1000-udpsrcscale15-nat44-ndrpdr
-| | [Tags] | IMIX | 2C
-| | framesize=IMIX_v4_1 | phy_cores=${2}
-
-| tc12-IMIX-4c-ethip4udp-ip4scale1000-udpsrcscale15-nat44-ndrpdr
-| | [Tags] | IMIX | 4C
-| | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/ip4_tunnels/10ge2p1x82599es-dot1q--ethip4vxlan-l2bdscale1kl2bd1kvlan1kvxlan-mrr.robot b/tests/vpp/perf/ip4_tunnels/10ge2p1x82599es-dot1q--ethip4vxlan-l2bdscale1kl2bd1kvlan1kvxlan-mrr.robot
deleted file mode 100644
index f2ccd407c6..0000000000
--- a/tests/vpp/perf/ip4_tunnels/10ge2p1x82599es-dot1q--ethip4vxlan-l2bdscale1kl2bd1kvlan1kvxlan-mrr.robot
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright (c) 2019 PANTHEON.tech 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 | MRR
-| ... | NIC_Intel-82599ES | L2BDMACLRN | SCALE | L2BD_1K | DOT1Q | VLAN_1K
-| ... | ENCAP | VXLAN | L2OVRLAY | IP4UNRLAY | VXLAN_1K
-| ...
-| Suite Setup | Set up 3-node performance topology with DUT's NIC model
-| ... | L2 | Intel-82599ES
-| Suite Teardown | Tear down 3-node performance topology
-| ...
-| Test Setup | Set up performance test
-| ...
-| Test Teardown | Tear down performance mrr test
-| ...
-| Test Template | Local Template
-| ...
-| Documentation | *Raw results L2BD with IEEE 802.1Q and VXLANoIPv4 test cases*
-| ...
-| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology\
-| ... | with single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-Dot1Q-IPv4 for L2 switching of IPv4\
-| ... | on TG-DUTn. Eth-IPv4-VXLAN-Eth-IPv4 is applied on link between DUTs.
-| ... | *[Cfg] DUT configuration:* DUT1 and DUT2 are configured with 1k L2\
-| ... | bridge domains. VXLAN tunnels are configured between L2BDs on DUT1 and\
-| ... | DUT2. DUT1 and DUT2 tested with 2p10GE NIC 82599ES by Intel.
-| ... | *[Ver] TG verification:* In MaxReceivedRate test TG sends traffic\
-| ... | at line rate and reports total received/sent packets over trial period.\
-| ... | Test packets are generated by TG on links to DUTs. TG traffic profile\
-| ... | contains two L3 flow-groups (flow-group per direction, up to 64,5k\
-| ... | flows per flow-group) with all packets containing Ethernet header,\
-| ... | IEEE 802.1Q 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, RFC7348.
-
-*** Variables ***
-# 82599ES bandwidth limit
-| ${s_limit}= | ${10000000000}
-| ${overhead}= | ${50}
-# Traffic profile:
-| ${traffic_profile}= | trex-sl-3n-dot1qip4-vlan1kip4src254ip4dst254
-# Number of VXLAN tunnels
-| ${vxlan_count}= | ${1000}
-
-*** Keywords ***
-| Local Template
-| | ...
-| | [Documentation]
-| | ... | [Cfg] Each DUT runs L2BD forwarding config with VLAN and VXLAN and\
-| | ... | uses ${phy_cores} physical core(s) for worker threads.
-| | ... | [Ver] Measure MaxReceivedRate for ${framesize}B frames using single\
-| | ... | trial throughput test.
-| | ...
-| | ... | *Arguments:*
-| | ... | - framesize - Framesize in Bytes in integer or string (IMIX_v4_1).
-| | ... | Type: integer, string
-| | ... | - phy_cores - Number of physical cores. Type: integer
-| | ... | - rxq - Number of RX queues, default value: ${None}. Type: integer
-| | ...
-| | [Arguments] | ${framesize} | ${phy_cores} | ${rxq}=${None}
-| | ...
-| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
-| | And Add PCI devices to all DUTs
-| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
-| | ... | ${s_limit} | ${framesize} | overhead=${overhead}
-| | And Apply startup configuration on all VPP DUTs
-| | When Initialize L2 bridge domain with VLAN and VXLANoIPv4 in 3-node circular topology
-| | ... | vxlan_count=${vxlan_count}
-| | Then Traffic should pass with maximum rate
-| | ... | ${max_rate}pps | ${framesize} | ${traffic_profile}
-
-*** Test Cases ***
-| tc01-64B-1c-dot1q--ethip4vxlan-l2bdscale1kl2bd1kvlan1kvxlan-mrr
-| | [Tags] | 64B | 1C
-| | framesize=${64} | phy_cores=${1}
-
-| tc02-64B-2c-dot1q--ethip4vxlan-l2bdscale1kl2bd1kvlan1kvxlan-mrr
-| | [Tags] | 64B | 2C
-| | framesize=${64} | phy_cores=${2}
-
-| tc03-64B-4c-dot1q--ethip4vxlan-l2bdscale1kl2bd1kvlan1kvxlan-mrr
-| | [Tags] | 64B | 4C
-| | framesize=${64} | phy_cores=${4}
-
-| tc04-1518B-1c-dot1q--ethip4vxlan-l2bdscale1kl2bd1kvlan1kvxlan-mrr
-| | [Tags] | 1518B | 1C
-| | framesize=${1518} | phy_cores=${1}
-
-| tc05-1518B-2c-dot1q--ethip4vxlan-l2bdscale1kl2bd1kvlan1kvxlan-mrr
-| | [Tags] | 1518B | 2C
-| | framesize=${1518} | phy_cores=${2}
-
-| tc06-1518B-4c-dot1q--ethip4vxlan-l2bdscale1kl2bd1kvlan1kvxlan-mrr
-| | [Tags] | 1518B | 4C
-| | framesize=${1518} | phy_cores=${4}
-
-| tc07-9000B-1c-dot1q--ethip4vxlan-l2bdscale1kl2bd1kvlan1kvxlan-mrr
-| | [Tags] | 9000B | 1C
-| | framesize=${9000} | phy_cores=${1}
-
-| tc08-9000B-2c-dot1q--ethip4vxlan-l2bdscale1kl2bd1kvlan1kvxlan-mrr
-| | [Tags] | 9000B | 2C
-| | framesize=${9000} | phy_cores=${2}
-
-| tc09-9000B-4c-dot1q--ethip4vxlan-l2bdscale1kl2bd1kvlan1kvxlan-mrr
-| | [Tags] | 9000B | 4C
-| | framesize=${9000} | phy_cores=${4}
-
-| tc10-IMIX-1c-dot1q--ethip4vxlan-l2bdscale1kl2bd1kvlan1kvxlan-mrr
-| | [Tags] | IMIX | 1C
-| | framesize=IMIX_v4_1 | phy_cores=${1}
-
-| tc11-IMIX-2c-dot1q--ethip4vxlan-l2bdscale1kl2bd1kvlan1kvxlan-mrr
-| | [Tags] | IMIX | 2C
-| | framesize=IMIX_v4_1 | phy_cores=${2}
-
-| tc12-IMIX-4c-dot1q--ethip4vxlan-l2bdscale1kl2bd1kvlan1kvxlan-mrr
-| | [Tags] | IMIX | 4C
-| | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/ip4_tunnels/10ge2p1x82599es-dot1q--ethip4vxlan-l2bdscale1kl2bd1kvlan1kvxlan-ndrpdr.robot b/tests/vpp/perf/ip4_tunnels/10ge2p1x82599es-dot1q--ethip4vxlan-l2bdscale1kl2bd1kvlan1kvxlan-ndrpdr.robot
deleted file mode 100644
index abd5f9992c..0000000000
--- a/tests/vpp/perf/ip4_tunnels/10ge2p1x82599es-dot1q--ethip4vxlan-l2bdscale1kl2bd1kvlan1kvxlan-ndrpdr.robot
+++ /dev/null
@@ -1,139 +0,0 @@
-# Copyright (c) 2019 PANTHEON.tech 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 | NDRPDR
-| ... | NIC_Intel-82599ES | L2BDMACLRN | SCALE | L2BD_1K | DOT1Q | VLAN_1K
-| ... | ENCAP | VXLAN | L2OVRLAY | IP4UNRLAY | VXLAN_1K
-| ...
-| Suite Setup | Set up 3-node performance topology with DUT's NIC model
-| ... | L2 | Intel-82599ES
-| Suite Teardown | Tear down 3-node performance topology
-| ...
-| Test Setup | Set up performance test
-| ...
-| Test Teardown | Tear down performance discovery test | ${min_rate}pps
-| ... | ${framesize} | ${traffic_profile}
-| ...
-| Test Template | Local Template
-| ...
-| Documentation | *RFC2544: Pkt throughput L2BD with IEEE 802.1Q and VXLANoIPv4
-| ... | test cases*
-| ...
-| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology\
-| ... | with single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-Dot1Q-IPv4 for L2 switching of IPv4\
-| ... | on TG-DUTn. Eth-IPv4-VXLAN-Eth-IPv4 is applied on link between DUTs.
-| ... | *[Cfg] DUT configuration:* DUT1 and DUT2 are configured with 1k L2\
-| ... | bridge domains. VXLAN tunnels are configured between L2BDs on DUT1 and\
-| ... | DUT2. DUT1 and DUT2 tested with 2p10GE NIC 82599ES by Intel.
-| ... | *[Ver] TG verification:* TG finds and reports throughput NDR (Non Drop\
-| ... | Rate) with zero packet loss tolerance or throughput PDR (Partial Drop\
-| ... | Rate) with non-zero packet loss tolerance (LT) expressed in percentage\
-| ... | of packets transmitted. NDR and PDR are discovered for different\
-| ... | Ethernet L2 frame sizes using MLRsearch library.\
-| ... | Test packets are generated by TG on links to DUTs. TG traffic profile\
-| ... | contains two L3 flow-groups (flow-group per direction, up to 64,5k\
-| ... | flows per flow-group) with all packets containing Ethernet header, IEEE\
-| ... | 802.1Q 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, RFC7348.
-
-*** Variables ***
-# 82599ES bandwidth limit
-| ${s_limit}= | ${10000000000}
-| ${overhead}= | ${50}
-# Traffic profile:
-| ${traffic_profile}= | trex-sl-3n-dot1qip4-vlan1kip4src254ip4dst254
-# Number of VXLAN tunnels
-| ${vxlan_count}= | ${1000}
-
-*** Keywords ***
-| Local Template
-| | ...
-| | [Documentation]
-| | ... | [Cfg] Each DUT runs L2BD forwarding config with VLAN and VXLAN and\
-| | ... | uses ${phy_cores} physical core(s) for worker threads.
-| | ... | [Ver] Measure NDR and PDR values using MLRsearch algorithm.
-| | ...
-| | ... | *Arguments:*
-| | ... | - framesize - Framesize in Bytes in integer or string (IMIX_v4_1).
-| | ... | Type: integer, string
-| | ... | - phy_cores - Number of physical cores. Type: integer
-| | ... | - rxq - Number of RX queues, default value: ${None}. Type: integer
-| | ...
-| | [Arguments] | ${framesize} | ${phy_cores} | ${rxq}=${None}
-| | ...
-| | Set Test Variable | ${framesize}
-| | Set Test Variable | ${min_rate} | ${10000}
-| | ...
-| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
-| | And Add PCI devices to all DUTs
-| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
-| | ... | ${s_limit} | ${framesize} | overhead=${overhead}
-| | And Apply startup configuration on all VPP DUTs
-| | When Initialize L2 bridge domain with VLAN and VXLANoIPv4 in 3-node circular topology
-| | ... | vxlan_count=${vxlan_count}
-| | Then Find NDR and PDR intervals using optimized search
-| | ... | ${framesize} | ${traffic_profile} | ${min_rate} | ${max_rate}
-
-*** Test Cases ***
-| tc01-64B-1c-dot1q--ethip4vxlan-l2bdscale1kl2bd1kvlan1kvxlan-ndrpdr
-| | [Tags] | 64B | 1C
-| | framesize=${64} | phy_cores=${1}
-
-| tc02-64B-2c-dot1q--ethip4vxlan-l2bdscale1kl2bd1kvlan1kvxlan-ndrpdr
-| | [Tags] | 64B | 2C
-| | framesize=${64} | phy_cores=${2}
-
-| tc03-64B-4c-dot1q--ethip4vxlan-l2bdscale1kl2bd1kvlan1kvxlan-ndrpdr
-| | [Tags] | 64B | 4C
-| | framesize=${64} | phy_cores=${4}
-
-| tc04-1518B-1c-dot1q--ethip4vxlan-l2bdscale1kl2bd1kvlan1kvxlan-ndrpdr
-| | [Tags] | 1518B | 1C
-| | framesize=${1518} | phy_cores=${1}
-
-| tc05-1518B-2c-dot1q--ethip4vxlan-l2bdscale1kl2bd1kvlan1kvxlan-ndrpdr
-| | [Tags] | 1518B | 2C
-| | framesize=${1518} | phy_cores=${2}
-
-| tc06-1518B-4c-dot1q--ethip4vxlan-l2bdscale1kl2bd1kvlan1kvxlan-ndrpdr
-| | [Tags] | 1518B | 4C
-| | framesize=${1518} | phy_cores=${4}
-
-| tc07-9000B-1c-dot1q--ethip4vxlan-l2bdscale1kl2bd1kvlan1kvxlan-ndrpdr
-| | [Tags] | 9000B | 1C
-| | framesize=${9000} | phy_cores=${1}
-
-| tc08-9000B-2c-dot1q--ethip4vxlan-l2bdscale1kl2bd1kvlan1kvxlan-ndrpdr
-| | [Tags] | 9000B | 2C
-| | framesize=${9000} | phy_cores=${2}
-
-| tc09-9000B-4c-dot1q--ethip4vxlan-l2bdscale1kl2bd1kvlan1kvxlan-ndrpdr
-| | [Tags] | 9000B | 4C
-| | framesize=${9000} | phy_cores=${4}
-
-| tc10-IMIX-1c-dot1q--ethip4vxlan-l2bdscale1kl2bd1kvlan1kvxlan-ndrpdr
-| | [Tags] | IMIX | 1C
-| | framesize=IMIX_v4_1 | phy_cores=${1}
-
-| tc11-IMIX-2c-dot1q--ethip4vxlan-l2bdscale1kl2bd1kvlan1kvxlan-ndrpdr
-| | [Tags] | IMIX | 2C
-| | framesize=IMIX_v4_1 | phy_cores=${2}
-
-| tc12-IMIX-4c-dot1q--ethip4vxlan-l2bdscale1kl2bd1kvlan1kvxlan-ndrpdr
-| | [Tags] | IMIX | 4C
-| | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/l2/10ge2p1x82599es-dot1ad-l2xcbase-mrr.robot b/tests/vpp/perf/l2/10ge2p1x82599es-dot1ad-l2xcbase-mrr.robot
deleted file mode 100644
index 7e8bf3dd11..0000000000
--- a/tests/vpp/perf/l2/10ge2p1x82599es-dot1ad-l2xcbase-mrr.robot
+++ /dev/null
@@ -1,144 +0,0 @@
-# Copyright (c) 2019 PANTHEON.tech 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 | MRR
-| ... | NIC_Intel-82599ES | L2XCFWD | BASE | DOT1AD
-| ...
-| Suite Setup | Set up 3-node performance topology with DUT's NIC model
-| ... | L2 | Intel-82599ES
-| ...
-| Suite Teardown | Tear down 3-node performance topology
-| ...
-| Test Setup | Set up performance test
-| ...
-| Test Teardown | Tear down performance mrr test
-| ...
-| Test Template | Local Template
-| ...
-| Documentation | *Raw results L2XC with 802.1ad 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 82599ES by Intel.
-| ... | *[Ver] TG verification:* In MaxReceivedRate test TG sends traffic
-| ... | at line rate and reports total received/sent packets over trial period.
-| ... | 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
-| ${overhead}= | ${8}
-# 82599ES bandwidth limit
-| ${s_limit}= | ${10000000000}
-# Traffic profile:
-| ${traffic_profile}= | trex-sl-3n-ethip4-ip4src254
-
-*** Keywords ***
-| Local Template
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD switching config.
-| | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads.
-| | ... | [Ver] Measure MaxReceivedRate for ${framesize}B frames using single\
-| | ... | trial throughput test.
-| | ...
-| | ... | *Arguments:*
-| | ... | - framesize - Framesize in Bytes in integer or string (IMIX_v4_1).
-| | ... | Type: integer, string
-| | ... | - phy_cores - Number of physical cores. Type: integer
-| | ... | - rxq - Number of RX queues, default value: ${None}. Type: integer
-| | ...
-| | [Arguments] | ${framesize} | ${phy_cores} | ${rxq}=${None}
-| | ...
-| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
-| | And Add PCI devices to all DUTs
-| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
-| | ... | ${s_limit} | ${framesize} | overhead=${overhead}
-| | And Apply startup configuration on all VPP DUTs
-| | And Set interfaces in path 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 maximum rate
-| | ... | ${max_rate}pps | ${framesize} | ${traffic_profile}
-
-*** Test Cases ***
-| tc01-64B-1c-dot1ad-l2xcbase-mrr
-| | [Tags] | 64B | 1C
-| | framesize=${64} | phy_cores=${1}
-
-| tc02-64B-2c-dot1ad-l2xcbase-mrr
-| | [Tags] | 64B | 2C
-| | framesize=${64} | phy_cores=${2}
-
-| tc03-64B-4c-dot1ad-l2xcbase-mrr
-| | [Tags] | 64B | 4C
-| | framesize=${64} | phy_cores=${4}
-
-| tc04-1518B-1c-dot1ad-l2xcbase-mrr
-| | [Tags] | 1518B | 1C
-| | framesize=${1518} | phy_cores=${1}
-
-| tc05-1518B-2c-dot1ad-l2xcbase-mrr
-| | [Tags] | 1518B | 2C
-| | framesize=${1518} | phy_cores=${2}
-
-| tc06-1518B-4c-dot1ad-l2xcbase-mrr
-| | [Tags] | 1518B | 4C
-| | framesize=${1518} | phy_cores=${4}
-
-| tc07-9000B-1c-dot1ad-l2xcbase-mrr
-| | [Tags] | 9000B | 1C
-| | framesize=${9000} | phy_cores=${1}
-
-| tc08-9000B-2c-dot1ad-l2xcbase-mrr
-| | [Tags] | 9000B | 2C
-| | framesize=${9000} | phy_cores=${2}
-
-| tc09-9000B-4c-dot1ad-l2xcbase-mrr
-| | [Tags] | 9000B | 4C
-| | framesize=${9000} | phy_cores=${4}
-
-| tc10-IMIX-1c-dot1ad-l2xcbase-mrr
-| | [Tags] | IMIX | 1C
-| | framesize=IMIX_v4_1 | phy_cores=${1}
-
-| tc11-IMIX-2c-dot1ad-l2xcbase-mrr
-| | [Tags] | IMIX | 2C
-| | framesize=IMIX_v4_1 | phy_cores=${2}
-
-| tc12-IMIX-4c-dot1ad-l2xcbase-mrr
-| | [Tags] | IMIX | 4C
-| | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/l2/10ge2p1x82599es-dot1ad-l2xcbase-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x82599es-dot1ad-l2xcbase-ndrpdr.robot
deleted file mode 100644
index 80bc97608f..0000000000
--- a/tests/vpp/perf/l2/10ge2p1x82599es-dot1ad-l2xcbase-ndrpdr.robot
+++ /dev/null
@@ -1,150 +0,0 @@
-# Copyright (c) 2019 PANTHEON.tech 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 | NDRPDR
-| ... | NIC_Intel-82599ES | L2XCFWD | BASE | DOT1AD
-| ...
-| Suite Setup | Set up 3-node performance topology with DUT's NIC model
-| ... | L2 | Intel-82599ES
-| ...
-| Suite Teardown | Tear down 3-node performance topology
-| ...
-| Test Setup | Set up performance test
-| ...
-| Test Teardown | Tear down performance discovery test | ${min_rate}pps
-| ... | ${framesize} | ${traffic_profile}
-| ...
-| Test Template | Local Template
-| ...
-| Documentation | *RFC2544: Pkt throughput L2XC with 802.1ad 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 82599ES by Intel.
-| ... | *[Ver] TG verification:* TG finds and reports throughput NDR (Non Drop
-| ... | Rate) with zero packet loss tolerance or throughput PDR (Partial Drop
-| ... | Rate) with non-zero packet loss tolerance (LT) expressed in percentage
-| ... | of packets transmitted. NDR and PDR are discovered for different
-| ... | Ethernet L2 frame sizes using MLRsearch library.
-| ... | 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
-| ${overhead}= | ${8}
-# 82599ES bandwidth limit
-| ${s_limit}= | ${10000000000}
-# Traffic profile:
-| ${traffic_profile}= | trex-sl-3n-ethip4-ip4src254
-
-*** Keywords ***
-| Local Template
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2XC forwarding config.
-| | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads.
-| | ... | [Ver] Measure NDR and PDR values using MLRsearch algorithm.\
-| | ...
-| | ... | *Arguments:*
-| | ... | - framesize - Framesize in Bytes in integer or string (IMIX_v4_1).
-| | ... | Type: integer, string
-| | ... | - phy_cores - Number of physical cores. Type: integer
-| | ... | - rxq - Number of RX queues, default value: ${None}. Type: integer
-| | ...
-| | [Arguments] | ${framesize} | ${phy_cores} | ${rxq}=${None}
-| | ...
-| | Set Test Variable | ${framesize}
-| | Set Test Variable | ${min_rate} | ${10000}
-| | ...
-| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
-| | And Add PCI devices to all DUTs
-| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
-| | ... | ${s_limit} | ${framesize} | overhead=${overhead}
-| | And Apply startup configuration on all VPP DUTs
-| | And Set interfaces in path 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 Find NDR and PDR intervals using optimized search
-| | ... | ${framesize} | ${traffic_profile} | ${min_rate} | ${max_rate}
-
-*** Test Cases ***
-| tc01-64B-1c-dot1ad-l2xcbase-ndrpdr
-| | [Tags] | 64B | 1C
-| | framesize=${64} | phy_cores=${1}
-
-| tc02-64B-2c-dot1ad-l2xcbase-ndrpdr
-| | [Tags] | 64B | 2C
-| | framesize=${64} | phy_cores=${2}
-
-| tc03-64B-4c-dot1ad-l2xcbase-ndrpdr
-| | [Tags] | 64B | 4C
-| | framesize=${64} | phy_cores=${4}
-
-| tc04-1518B-1c-dot1ad-l2xcbase-ndrpdr
-| | [Tags] | 1518B | 1C
-| | framesize=${1518} | phy_cores=${1}
-
-| tc05-1518B-2c-dot1ad-l2xcbase-ndrpdr
-| | [Tags] | 1518B | 2C
-| | framesize=${1518} | phy_cores=${2}
-
-| tc06-1518B-4c-dot1ad-l2xcbase-ndrpdr
-| | [Tags] | 1518B | 4C
-| | framesize=${1518} | phy_cores=${4}
-
-| tc07-9000B-1c-dot1ad-l2xcbase-ndrpdr
-| | [Tags] | 9000B | 1C
-| | framesize=${9000} | phy_cores=${1}
-
-| tc08-9000B-2c-dot1ad-l2xcbase-ndrpdr
-| | [Tags] | 9000B | 2C
-| | framesize=${9000} | phy_cores=${2}
-
-| tc09-9000B-4c-dot1ad-l2xcbase-ndrpdr
-| | [Tags] | 9000B | 4C
-| | framesize=${9000} | phy_cores=${4}
-
-| tc10-IMIX-1c-dot1ad-l2xcbase-ndrpdr
-| | [Tags] | IMIX | 1C
-| | framesize=IMIX_v4_1 | phy_cores=${1}
-
-| tc11-IMIX-2c-dot1ad-l2xcbase-ndrpdr
-| | [Tags] | IMIX | 2C
-| | framesize=IMIX_v4_1 | phy_cores=${2}
-
-| tc12-IMIX-4c-dot1ad-l2xcbase-ndrpdr
-| | [Tags] | IMIX | 4C
-| | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/l2/10ge2p1x82599es-dot1q-l2bdbasemaclrn-mrr.robot b/tests/vpp/perf/l2/10ge2p1x82599es-dot1q-l2bdbasemaclrn-mrr.robot
deleted file mode 100644
index d43aef78a5..0000000000
--- a/tests/vpp/perf/l2/10ge2p1x82599es-dot1q-l2bdbasemaclrn-mrr.robot
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright (c) 2019 PANTHEON.tech 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 | MRR
-| ... | NIC_Intel-82599ES | BASE | DOT1Q | L2BDMACLRN
-| ...
-| Suite Setup | Set up 3-node performance topology with DUT's NIC model
-| ... | L2 | Intel-82599ES
-| ...
-| Suite Teardown | Tear down 3-node performance topology
-| ...
-| Test Setup | Set up performance test
-| ...
-| Test Teardown | Tear down performance mrr test
-| ...
-| Test Template | Local Template
-| ...
-| Documentation | *Raw results L2BD with IEEE 802.1Q 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. IEEE\
-| ... | 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. DUT1 and DUT2 are tested with 2p10GE\
-| ... | NIC 82599ES by Intel.
-| ... | *[Ver] TG verification:* In MaxReceivedRate tests TG sends traffic\
-| ... | at line rate and reports total received/sent packets over trial period.\
-| ... | 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 ***
-| ${subid}= | 10
-| ${tag_rewrite}= | pop-1
-| ${overhead}= | ${4}
-# 82599ES bandwidth limit
-| ${s_limit}= | ${10000000000}
-# Bridge domain IDs
-| ${bd_id1}= | 1
-| ${bd_id2}= | 2
-# Traffic profile:
-| ${traffic_profile}= | trex-sl-3n-ethip4-ip4src254
-
-*** Keywords ***
-| Local Template
-| | [Documentation]
-| | ... | [Cfg] Each DUT runs L2BD config with VLAN and uses ${phy_cores}\
-| | ... | physical core(s) for worker threads.
-| | ... | [Ver] Measure MaxReceivedRate for ${framesize}B frames using single\
-| | ... | trial throughput test.
-| | ...
-| | ... | *Arguments:*
-| | ... | - framesize - Framesize in Bytes in integer or string (IMIX_v4_1).
-| | ... | Type: integer, string
-| | ... | - phy_cores - Number of physical cores. Type: integer
-| | ... | - rxq - Number of RX queues, default value: ${None}. Type: integer
-| | ...
-| | [Arguments] | ${framesize} | ${phy_cores} | ${rxq}=${None}
-| | ...
-| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
-| | And Add PCI devices to all DUTs
-| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
-| | ... | ${s_limit} | ${framesize} | overhead=${overhead}
-| | And Apply startup configuration on all VPP DUTs
-| | When Initialize L2 bridge domains with VLAN dot1q sub-interfaces in circular topology
-| | ... | ${bd_id1} | ${bd_id2} | ${subid} | ${tag_rewrite}
-| | Then Traffic should pass with maximum rate
-| | ... | ${max_rate}pps | ${framesize} | ${traffic_profile}
-
-*** Test Cases ***
-| tc01-64B-1c-dot1q-l2bdbasemaclrn-mrr
-| | [Tags] | 64B | 1C
-| | framesize=${64} | phy_cores=${1}
-
-| tc02-64B-2c-dot1q-l2bdbasemaclrn-mrr
-| | [Tags] | 64B | 2C
-| | framesize=${64} | phy_cores=${2}
-
-| tc03-64B-4c-dot1q-l2bdbasemaclrn-mrr
-| | [Tags] | 64B | 4C
-| | framesize=${64} | phy_cores=${4}
-
-| tc04-1518B-1c-dot1q-l2bdbasemaclrn-mrr
-| | [Tags] | 1518B | 1C
-| | framesize=${1518} | phy_cores=${1}
-
-| tc05-1518B-2c-dot1q-l2bdbasemaclrn-mrr
-| | [Tags] | 1518B | 2C
-| | framesize=${1518} | phy_cores=${2}
-
-| tc06-1518B-4c-dot1q-l2bdbasemaclrn-mrr
-| | [Tags] | 1518B | 4C
-| | framesize=${1518} | phy_cores=${4}
-
-| tc07-9000B-1c-dot1q-l2bdbasemaclrn-mrr
-| | [Tags] | 9000B | 1C
-| | framesize=${9000} | phy_cores=${1}
-
-| tc08-9000B-2c-dot1q-l2bdbasemaclrn-mrr
-| | [Tags] | 9000B | 2C
-| | framesize=${9000} | phy_cores=${2}
-
-| tc09-9000B-4c-dot1q-l2bdbasemaclrn-mrr
-| | [Tags] | 9000B | 4C
-| | framesize=${9000} | phy_cores=${4}
-
-| tc10-IMIX-1c-dot1q-l2bdbasemaclrn-mrr
-| | [Tags] | IMIX | 1C
-| | framesize=IMIX_v4_1 | phy_cores=${1}
-
-| tc11-IMIX-2c-dot1q-l2bdbasemaclrn-mrr
-| | [Tags] | IMIX | 2C
-| | framesize=IMIX_v4_1 | phy_cores=${2}
-
-| tc12-IMIX-4c-dot1q-l2bdbasemaclrn-mrr
-| | [Tags] | IMIX | 4C
-| | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/l2/10ge2p1x82599es-dot1q-l2bdbasemaclrn-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x82599es-dot1q-l2bdbasemaclrn-ndrpdr.robot
deleted file mode 100644
index de68f47e7f..0000000000
--- a/tests/vpp/perf/l2/10ge2p1x82599es-dot1q-l2bdbasemaclrn-ndrpdr.robot
+++ /dev/null
@@ -1,140 +0,0 @@
-# Copyright (c) 2019 PANTHEON.tech 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 | NDRPDR
-| ... | NIC_Intel-82599ES | BASE | DOT1Q | L2BDMACLRN
-| ...
-| Suite Setup | Set up 3-node performance topology with DUT's NIC model
-| ... | L2 | Intel-82599ES
-| ...
-| Suite Teardown | Tear down 3-node performance topology
-| ...
-| Test Setup | Set up performance test
-| ...
-| Test Teardown | Tear down performance discovery test | ${min_rate}pps
-| ... | ${framesize} | ${traffic_profile}
-| ...
-| Test Template | Local Template
-| ...
-| Documentation | *RFC2544: Pkt throughput L2BD with IEEE 802.1Q 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. IEEE\
-| ... | 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. DUT1 and DUT2 are tested with 2p10GE\
-| ... | NIC 82599ES by Intel.
-| ... | *[Ver] TG verification:* TG finds and reports throughput NDR (Non Drop\
-| ... | Rate) with zero packet loss tolerance or throughput PDR (Partial Drop\
-| ... | Rate) with non-zero packet loss tolerance (LT) expressed in percentage\
-| ... | of packets transmitted. NDR and PDR are discovered for different\
-| ... | Ethernet L2 frame sizes using MLRsearch library. 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 ***
-| ${subid}= | 10
-| ${tag_rewrite}= | pop-1
-| ${overhead}= | ${4}
-# 82599ES bandwidth limit
-| ${s_limit}= | ${10000000000}
-# Bridge domain IDs
-| ${bd_id1}= | 1
-| ${bd_id2}= | 2
-# Traffic profile:
-| ${traffic_profile}= | trex-sl-3n-ethip4-ip4src254
-
-*** Keywords ***
-| Local Template
-| | [Documentation]
-| | ... | [Cfg] Each DUT runs L2BD config with VLAN and uses ${phy_cores}\
-| | ... | physical core(s) for worker threads.
-| | ... | [Ver] Measure NDR and PDR values using MLRsearch algorithm.
-| | ...
-| | ... | *Arguments:*
-| | ... | - framesize - Framesize in Bytes in integer or string (IMIX_v4_1).
-| | ... | Type: integer, string
-| | ... | - phy_cores - Number of physical cores. Type: integer
-| | ... | - rxq - Number of RX queues, default value: ${None}. Type: integer
-| | ...
-| | [Arguments] | ${framesize} | ${phy_cores} | ${rxq}=${None}
-| | ...
-| | Set Test Variable | ${framesize}
-| | Set Test Variable | ${min_rate} | ${10000}
-| | ...
-| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
-| | And Add PCI devices to all DUTs
-| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
-| | ... | ${s_limit} | ${framesize} | overhead=${overhead}
-| | And Apply startup configuration on all VPP DUTs
-| | When Initialize L2 bridge domains with VLAN dot1q sub-interfaces in circular topology
-| | ... | ${bd_id1} | ${bd_id2} | ${subid} | ${tag_rewrite}
-| | Then Find NDR and PDR intervals using optimized search
-| | ... | ${framesize} | ${traffic_profile} | ${min_rate} | ${max_rate}
-
-*** Test Cases ***
-| tc01-64B-1c-dot1q-l2bdbasemaclrn-ndrpdr
-| | [Tags] | 64B | 1C
-| | framesize=${64} | phy_cores=${1}
-
-| tc02-64B-2c-dot1q-l2bdbasemaclrn-ndrpdr
-| | [Tags] | 64B | 2C
-| | framesize=${64} | phy_cores=${2}
-
-| tc03-64B-4c-dot1q-l2bdbasemaclrn-ndrpdr
-| | [Tags] | 64B | 4C
-| | framesize=${64} | phy_cores=${4}
-
-| tc04-1518B-1c-dot1q-l2bdbasemaclrn-ndrpdr
-| | [Tags] | 1518B | 1C
-| | framesize=${1518} | phy_cores=${1}
-
-| tc05-1518B-2c-dot1q-l2bdbasemaclrn-ndrpdr
-| | [Tags] | 1518B | 2C
-| | framesize=${1518} | phy_cores=${2}
-
-| tc06-1518B-4c-dot1q-l2bdbasemaclrn-ndrpdr
-| | [Tags] | 1518B | 4C
-| | framesize=${1518} | phy_cores=${4}
-
-| tc07-9000B-1c-dot1q-l2bdbasemaclrn-ndrpdr
-| | [Tags] | 9000B | 1C
-| | framesize=${9000} | phy_cores=${1}
-
-| tc08-9000B-2c-dot1q-l2bdbasemaclrn-ndrpdr
-| | [Tags] | 9000B | 2C
-| | framesize=${9000} | phy_cores=${2}
-
-| tc09-9000B-4c-dot1q-l2bdbasemaclrn-ndrpdr
-| | [Tags] | 9000B | 4C
-| | framesize=${9000} | phy_cores=${4}
-
-| tc10-IMIX-1c-dot1q-l2bdbasemaclrn-ndrpdr
-| | [Tags] | IMIX | 1C
-| | framesize=IMIX_v4_1 | phy_cores=${1}
-
-| tc11-IMIX-2c-dot1q-l2bdbasemaclrn-ndrpdr
-| | [Tags] | IMIX | 2C
-| | framesize=IMIX_v4_1 | phy_cores=${2}
-
-| tc12-IMIX-4c-dot1q-l2bdbasemaclrn-ndrpdr
-| | [Tags] | IMIX | 4C
-| | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/l2/10ge2p1x82599es-eth-l2bdbasemaclrn-iacl50sf-10kflows-mrr.robot b/tests/vpp/perf/l2/10ge2p1x82599es-eth-l2bdbasemaclrn-iacl50sf-10kflows-mrr.robot
deleted file mode 100644
index 0829487f21..0000000000
--- a/tests/vpp/perf/l2/10ge2p1x82599es-eth-l2bdbasemaclrn-iacl50sf-10kflows-mrr.robot
+++ /dev/null
@@ -1,148 +0,0 @@
-# Copyright (c) 2019 PANTHEON.tech 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 | MRR
-| ... | NIC_Intel-82599ES | ETH | L2BDMACLRN | FEATURE | ACL | ACL_STATEFUL
-| ... | IACL | ACL50 | 10k_FLOWS
-| ...
-| Suite Setup | Run Keywords
-| ... | Set up 3-node performance topology with DUT's NIC model | L2
-| ... | Intel-82599ES
-| ... | AND | Set up performance test suite with ACL
-| ...
-| Suite Teardown | Tear down 3-node performance topology
-| ...
-| Test Setup | Set up performance test
-| ...
-| Test Teardown | Tear down performance mrr test
-| ...
-| Test Template | Local Template
-| ...
-| Documentation | *Raw results L2BD test cases with ACL*
-| ...
-| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology\
-| ... | with single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4-UDP for L2 switching of IPv4.
-| ... | *[Cfg] DUT configuration:* DUT1 is configured with L2 bridge domain\
-| ... | and MAC learning enabled. DUT2 is configured with L2 cross-connects.\
-| ... | Required ACL rules are applied to input paths of both DUT1 intefaces.\
-| ... | DUT1 and DUT2 are tested with 2p10GE NIC 82599ES by Intel.\
-| ... | *[Ver] TG verification:* In MaxReceivedRate tests TG sends traffic\
-| ... | at line rate and reports total received/sent packets over trial period.\
-| ... | Test packets are generated by TG on\
-| ... | links to DUTs. TG traffic profile contains two L3 flow-groups\
-| ... | (flow-group per direction, ${flows_per_dir} flows per flow-group) with\
-| ... | all packets containing Ethernet header, IPv4 header with UDP header and\
-| ... | static payload. MAC addresses are matching MAC addresses of the TG node\
-| ... | interfaces.
-| ... | *[Ref] Applicable standard specifications:* RFC2544.
-
-*** Variables ***
-# 82599ES bandwidth limit
-| ${s_limit}= | ${10000000000}
-
-# ACL test setup
-| ${acl_action}= | permit+reflect
-| ${acl_apply_type}= | input
-| ${no_hit_aces_number}= | 50
-| ${flows_per_dir}= | 10k
-
-# starting points for non-hitting ACLs
-| ${src_ip_start}= | 30.30.30.1
-| ${dst_ip_start}= | 40.40.40.1
-| ${ip_step}= | ${1}
-| ${sport_start}= | ${1000}
-| ${dport_start}= | ${1000}
-| ${port_step}= | ${1}
-| ${trex_stream1_subnet}= | 10.10.10.0/24
-| ${trex_stream2_subnet}= | 20.20.20.0/24
-
-# Traffic profile:
-| ${traffic_profile}= | trex-sl-3n-ethip4udp-10u1000p-conc
-
-*** Keywords ***
-| Local Template
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD config with ACLs with ${phy_cores} phy
-| | ... | core(s).
-| | ... | [Ver] Measure MaxReceivedRate for ${framesize}B frames using single\
-| | ... | trial throughput test.
-| | ...
-| | ... | *Arguments:*
-| | ... | - framesize - Framesize in Bytes in integer or string (IMIX_v4_1).
-| | ... | Type: integer, string
-| | ... | - phy_cores - Number of physical cores. Type: integer
-| | ... | - rxq - Number of RX queues, default value: ${None}. Type: integer
-| | ...
-| | [Arguments] | ${framesize} | ${phy_cores} | ${rxq}=${None}
-| | ...
-| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
-| | And Add PCI devices to all DUTs
-| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
-| | ... | ${s_limit} | ${framesize}
-| | And Apply startup configuration on all VPP DUTs
-| | When Initialize L2 bridge domain with IPv4 ACLs on DUT1 in 3-node circular topology
-| | Then Traffic should pass with maximum rate
-| | ... | ${max_rate}pps | ${framesize} | ${traffic_profile}
-
-*** Test Cases ***
-| tc01-64B-1c-eth-l2bdbasemaclrn-iacl50sf-10kflows-mrr
-| | [Tags] | 64B | 1C
-| | framesize=${64} | phy_cores=${1}
-
-| tc02-64B-2c-eth-l2bdbasemaclrn-iacl50sf-10kflows-mrr
-| | [Tags] | 64B | 2C
-| | framesize=${64} | phy_cores=${2}
-
-| tc03-64B-4c-eth-l2bdbasemaclrn-iacl50sf-10kflows-mrr
-| | [Tags] | 64B | 4C
-| | framesize=${64} | phy_cores=${4}
-
-| tc04-1518B-1c-eth-l2bdbasemaclrn-iacl50sf-10kflows-mrr
-| | [Tags] | 1518B | 1C
-| | framesize=${1518} | phy_cores=${1}
-
-| tc05-1518B-2c-eth-l2bdbasemaclrn-iacl50sf-10kflows-mrr
-| | [Tags] | 1518B | 2C
-| | framesize=${1518} | phy_cores=${2}
-
-| tc06-1518B-4c-eth-l2bdbasemaclrn-iacl50sf-10kflows-mrr
-| | [Tags] | 1518B | 4C
-| | framesize=${1518} | phy_cores=${4}
-
-| tc07-9000B-1c-eth-l2bdbasemaclrn-iacl50sf-10kflows-mrr
-| | [Tags] | 9000B | 1C
-| | framesize=${9000} | phy_cores=${1}
-
-| tc08-9000B-2c-eth-l2bdbasemaclrn-iacl50sf-10kflows-mrr
-| | [Tags] | 9000B | 2C
-| | framesize=${9000} | phy_cores=${2}
-
-| tc09-9000B-4c-eth-l2bdbasemaclrn-iacl50sf-10kflows-mrr
-| | [Tags] | 9000B | 4C
-| | framesize=${9000} | phy_cores=${4}
-
-| tc10-IMIX-1c-eth-l2bdbasemaclrn-iacl50sf-10kflows-mrr
-| | [Tags] | IMIX | 1C
-| | framesize=IMIX_v4_1 | phy_cores=${1}
-
-| tc11-IMIX-2c-eth-l2bdbasemaclrn-iacl50sf-10kflows-mrr
-| | [Tags] | IMIX | 2C
-| | framesize=IMIX_v4_1 | phy_cores=${2}
-
-| tc12-IMIX-4c-eth-l2bdbasemaclrn-iacl50sf-10kflows-mrr
-| | [Tags] | IMIX | 4C
-| | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/l2/10ge2p1x82599es-eth-l2bdbasemaclrn-iacl50sf-10kflows-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x82599es-eth-l2bdbasemaclrn-iacl50sf-10kflows-ndrpdr.robot
deleted file mode 100644
index a1024189f9..0000000000
--- a/tests/vpp/perf/l2/10ge2p1x82599es-eth-l2bdbasemaclrn-iacl50sf-10kflows-ndrpdr.robot
+++ /dev/null
@@ -1,154 +0,0 @@
-# Copyright (c) 2019 PANTHEON.tech 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 | NDRPDR
-| ... | NIC_Intel-82599ES | ETH | L2BDMACLRN | FEATURE | ACL | ACL_STATEFUL
-| ... | IACL | ACL50 | 10k_FLOWS
-| ...
-| Suite Setup | Run Keywords
-| ... | Set up 3-node performance topology with DUT's NIC model | L2
-| ... | Intel-82599ES
-| ... | AND | Set up performance test suite with ACL
-| ...
-| Suite Teardown | Tear down 3-node performance topology
-| ...
-| Test Setup | Set up performance test
-| ...
-| Test Teardown | Tear down performance discovery test | ${min_rate}pps
-| ... | ${framesize} | ${traffic_profile}
-| ...
-| Test Template | Local Template
-| ...
-| Documentation | *RFC2544: Pkt throughput L2BD test cases with ACL*
-| ...
-| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology\
-| ... | with single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4-UDP for L2 switching of IPv4.
-| ... | *[Cfg] DUT configuration:* DUT1 is configured with L2 bridge domain\
-| ... | and MAC learning enabled. DUT2 is configured with L2 cross-connects.\
-| ... | Required ACL rules are applied to input paths of both DUT1 intefaces.\
-| ... | DUT1 and DUT2 are tested with 2p10GE NIC 82599ES by Intel.\
-| ... | *[Ver] TG verification:* TG finds and reports throughput NDR (Non Drop
-| ... | Rate) with zero packet loss tolerance or throughput PDR (Partial Drop
-| ... | Rate) with non-zero packet loss tolerance (LT) expressed in percentage
-| ... | of packets transmitted. NDR and PDR are discovered for different
-| ... | Ethernet L2 frame sizes using MLRsearch library.
-| ... | Test packets are generated by TG on\
-| ... | links to DUTs. TG traffic profile contains two L3 flow-groups\
-| ... | (flow-group per direction, ${flows_per_dir} flows per flow-group) with\
-| ... | all packets containing Ethernet header, IPv4 header with UDP header and\
-| ... | static payload. MAC addresses are matching MAC addresses of the TG node\
-| ... | interfaces.
-| ... | *[Ref] Applicable standard specifications:* RFC2544.
-
-*** Variables ***
-# 82599ES bandwidth limit
-| ${s_limit}= | ${10000000000}
-
-# ACL test setup
-| ${acl_action}= | permit+reflect
-| ${acl_apply_type}= | input
-| ${no_hit_aces_number}= | 50
-| ${flows_per_dir}= | 10k
-
-# starting points for non-hitting ACLs
-| ${src_ip_start}= | 30.30.30.1
-| ${dst_ip_start}= | 40.40.40.1
-| ${ip_step}= | ${1}
-| ${sport_start}= | ${1000}
-| ${dport_start}= | ${1000}
-| ${port_step}= | ${1}
-| ${trex_stream1_subnet}= | 10.10.10.0/24
-| ${trex_stream2_subnet}= | 20.20.20.0/24
-
-# Traffic profile:
-| ${traffic_profile}= | trex-sl-3n-ethip4udp-10u1000p-conc
-
-*** Keywords ***
-| Local Template
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD config with ACLs with ${phy_cores} phy
-| | ... | core(s).
-| | ... | [Ver] Measure NDR and PDR values using MLRsearch algorithm.\
-| | ...
-| | ... | *Arguments:*
-| | ... | - framesize - Framesize in Bytes in integer or string (IMIX_v4_1).
-| | ... | Type: integer, string
-| | ... | - phy_cores - Number of physical cores. Type: integer
-| | ... | - rxq - Number of RX queues, default value: ${None}. Type: integer
-| | ...
-| | [Arguments] | ${framesize} | ${phy_cores} | ${rxq}=${None}
-| | ...
-| | Set Test Variable | ${framesize}
-| | Set Test Variable | ${min_rate} | ${10000}
-| | ...
-| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
-| | And Add PCI devices to all DUTs
-| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
-| | ... | ${s_limit} | ${framesize}
-| | And Apply startup configuration on all VPP DUTs
-| | When Initialize L2 bridge domain with IPv4 ACLs on DUT1 in 3-node circular topology
-| | Then Find NDR and PDR intervals using optimized search
-| | ... | ${framesize} | ${traffic_profile} | ${min_rate} | ${max_rate}
-
-*** Test Cases ***
-| tc01-64B-1c-eth-l2bdbasemaclrn-iacl50sf-10kflows-ndrpdr
-| | [Tags] | 64B | 1C
-| | framesize=${64} | phy_cores=${1}
-
-| tc02-64B-2c-eth-l2bdbasemaclrn-iacl50sf-10kflows-ndrpdr
-| | [Tags] | 64B | 2C
-| | framesize=${64} | phy_cores=${2}
-
-| tc03-64B-4c-eth-l2bdbasemaclrn-iacl50sf-10kflows-ndrpdr
-| | [Tags] | 64B | 4C
-| | framesize=${64} | phy_cores=${4}
-
-| tc04-1518B-1c-eth-l2bdbasemaclrn-iacl50sf-10kflows-ndrpdr
-| | [Tags] | 1518B | 1C
-| | framesize=${1518} | phy_cores=${1}
-
-| tc05-1518B-2c-eth-l2bdbasemaclrn-iacl50sf-10kflows-ndrpdr
-| | [Tags] | 1518B | 2C
-| | framesize=${1518} | phy_cores=${2}
-
-| tc06-1518B-4c-eth-l2bdbasemaclrn-iacl50sf-10kflows-ndrpdr
-| | [Tags] | 1518B | 4C
-| | framesize=${1518} | phy_cores=${4}
-
-| tc07-9000B-1c-eth-l2bdbasemaclrn-iacl50sf-10kflows-ndrpdr
-| | [Tags] | 9000B | 1C
-| | framesize=${9000} | phy_cores=${1}
-
-| tc08-9000B-2c-eth-l2bdbasemaclrn-iacl50sf-10kflows-ndrpdr
-| | [Tags] | 9000B | 2C
-| | framesize=${9000} | phy_cores=${2}
-
-| tc09-9000B-4c-eth-l2bdbasemaclrn-iacl50sf-10kflows-ndrpdr
-| | [Tags] | 9000B | 4C
-| | framesize=${9000} | phy_cores=${4}
-
-| tc10-IMIX-1c-eth-l2bdbasemaclrn-iacl50sf-10kflows-ndrpdr
-| | [Tags] | IMIX | 1C
-| | framesize=IMIX_v4_1 | phy_cores=${1}
-
-| tc11-IMIX-2c-eth-l2bdbasemaclrn-iacl50sf-10kflows-ndrpdr
-| | [Tags] | IMIX | 2C
-| | framesize=IMIX_v4_1 | phy_cores=${2}
-
-| tc12-IMIX-4c-eth-l2bdbasemaclrn-iacl50sf-10kflows-ndrpdr
-| | [Tags] | IMIX | 4C
-| | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/l2/10ge2p1x82599es-eth-l2bdbasemaclrn-iacl50sl-10kflows-mrr.robot b/tests/vpp/perf/l2/10ge2p1x82599es-eth-l2bdbasemaclrn-iacl50sl-10kflows-mrr.robot
deleted file mode 100644
index 69da50c602..0000000000
--- a/tests/vpp/perf/l2/10ge2p1x82599es-eth-l2bdbasemaclrn-iacl50sl-10kflows-mrr.robot
+++ /dev/null
@@ -1,148 +0,0 @@
-# Copyright (c) 2019 PANTHEON.tech 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 | MRR
-| ... | NIC_Intel-82599ES | ETH | L2BDMACLRN | FEATURE | ACL | ACL_STATELESS
-| ... | IACL | ACL50 | 10k_FLOWS
-| ...
-| Suite Setup | Run Keywords
-| ... | Set up 3-node performance topology with DUT's NIC model | L2
-| ... | Intel-82599ES
-| ... | AND | Set up performance test suite with ACL
-| ...
-| Suite Teardown | Tear down 3-node performance topology
-| ...
-| Test Setup | Set up performance test
-| ...
-| Test Teardown | Tear down performance mrr test
-| ...
-| Test Template | Local Template
-| ...
-| Documentation | *Raw results L2BD test cases with ACL*
-| ...
-| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology\
-| ... | with single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4-UDP for L2 switching of IPv4.
-| ... | *[Cfg] DUT configuration:* DUT1 is configured with L2 bridge domain\
-| ... | and MAC learning enabled. DUT2 is configured with L2 cross-connects.\
-| ... | Required ACL rules are applied to input paths of both DUT1 intefaces.\
-| ... | DUT1 and DUT2 are tested with 2p10GE NIC 82599ES by Intel.\
-| ... | *[Ver] TG verification:* In MaxReceivedRate tests TG sends traffic\
-| ... | at line rate and reports total received/sent packets over trial period.\
-| ... | Test packets are generated by TG on\
-| ... | links to DUTs. TG traffic profile contains two L3 flow-groups\
-| ... | (flow-group per direction, ${flows_per_dir} flows per flow-group) with\
-| ... | all packets containing Ethernet header, IPv4 header with UDP header and\
-| ... | static payload. MAC addresses are matching MAC addresses of the TG node\
-| ... | interfaces.
-| ... | *[Ref] Applicable standard specifications:* RFC2544.
-
-*** Variables ***
-# 82599ES bandwidth limit
-| ${s_limit}= | ${10000000000}
-
-# ACL test setup
-| ${acl_action}= | permit
-| ${acl_apply_type}= | input
-| ${no_hit_aces_number}= | 50
-| ${flows_per_dir}= | 10k
-
-# starting points for non-hitting ACLs
-| ${src_ip_start}= | 30.30.30.1
-| ${dst_ip_start}= | 40.40.40.1
-| ${ip_step}= | ${1}
-| ${sport_start}= | ${1000}
-| ${dport_start}= | ${1000}
-| ${port_step}= | ${1}
-| ${trex_stream1_subnet}= | 10.10.10.0/24
-| ${trex_stream2_subnet}= | 20.20.20.0/24
-
-# Traffic profile:
-| ${traffic_profile}= | trex-sl-3n-ethip4udp-10u1000p-conc
-
-*** Keywords ***
-| Local Template
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD config with ACLs with ${phy_cores} phy
-| | ... | core(s).
-| | ... | [Ver] Measure MaxReceivedRate for ${framesize}B frames using single\
-| | ... | trial throughput test.
-| | ...
-| | ... | *Arguments:*
-| | ... | - framesize - Framesize in Bytes in integer or string (IMIX_v4_1).
-| | ... | Type: integer, string
-| | ... | - phy_cores - Number of physical cores. Type: integer
-| | ... | - rxq - Number of RX queues, default value: ${None}. Type: integer
-| | ...
-| | [Arguments] | ${framesize} | ${phy_cores} | ${rxq}=${None}
-| | ...
-| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
-| | And Add PCI devices to all DUTs
-| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
-| | ... | ${s_limit} | ${framesize}
-| | And Apply startup configuration on all VPP DUTs
-| | When Initialize L2 bridge domain with IPv4 ACLs on DUT1 in 3-node circular topology
-| | Then Traffic should pass with maximum rate
-| | ... | ${max_rate}pps | ${framesize} | ${traffic_profile}
-
-*** Test Cases ***
-| tc01-64B-1c-eth-l2bdbasemaclrn-iacl50sl-10kflows-mrr
-| | [Tags] | 64B | 1C
-| | framesize=${64} | phy_cores=${1}
-
-| tc02-64B-2c-eth-l2bdbasemaclrn-iacl50sl-10kflows-mrr
-| | [Tags] | 64B | 2C
-| | framesize=${64} | phy_cores=${2}
-
-| tc03-64B-4c-eth-l2bdbasemaclrn-iacl50sl-10kflows-mrr
-| | [Tags] | 64B | 4C
-| | framesize=${64} | phy_cores=${4}
-
-| tc04-1518B-1c-eth-l2bdbasemaclrn-iacl50sl-10kflows-mrr
-| | [Tags] | 1518B | 1C
-| | framesize=${1518} | phy_cores=${1}
-
-| tc05-1518B-2c-eth-l2bdbasemaclrn-iacl50sl-10kflows-mrr
-| | [Tags] | 1518B | 2C
-| | framesize=${1518} | phy_cores=${2}
-
-| tc06-1518B-4c-eth-l2bdbasemaclrn-iacl50sl-10kflows-mrr
-| | [Tags] | 1518B | 4C
-| | framesize=${1518} | phy_cores=${4}
-
-| tc07-9000B-1c-eth-l2bdbasemaclrn-iacl50sl-10kflows-mrr
-| | [Tags] | 9000B | 1C
-| | framesize=${9000} | phy_cores=${1}
-
-| tc08-9000B-2c-eth-l2bdbasemaclrn-iacl50sl-10kflows-mrr
-| | [Tags] | 9000B | 2C
-| | framesize=${9000} | phy_cores=${2}
-
-| tc09-9000B-4c-eth-l2bdbasemaclrn-iacl50sl-10kflows-mrr
-| | [Tags] | 9000B | 4C
-| | framesize=${9000} | phy_cores=${4}
-
-| tc10-IMIX-1c-eth-l2bdbasemaclrn-iacl50sl-10kflows-mrr
-| | [Tags] | IMIX | 1C
-| | framesize=IMIX_v4_1 | phy_cores=${1}
-
-| tc11-IMIX-2c-eth-l2bdbasemaclrn-iacl50sl-10kflows-mrr
-| | [Tags] | IMIX | 2C
-| | framesize=IMIX_v4_1 | phy_cores=${2}
-
-| tc12-IMIX-4c-eth-l2bdbasemaclrn-iacl50sl-10kflows-mrr
-| | [Tags] | IMIX | 4C
-| | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/l2/10ge2p1x82599es-eth-l2bdbasemaclrn-iacl50sl-10kflows-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x82599es-eth-l2bdbasemaclrn-iacl50sl-10kflows-ndrpdr.robot
deleted file mode 100644
index 36c514a1a7..0000000000
--- a/tests/vpp/perf/l2/10ge2p1x82599es-eth-l2bdbasemaclrn-iacl50sl-10kflows-ndrpdr.robot
+++ /dev/null
@@ -1,154 +0,0 @@
-# Copyright (c) 2019 PANTHEON.tech 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 | NDRPDR
-| ... | NIC_Intel-82599ES | ETH | L2BDMACLRN | FEATURE | ACL | ACL_STATELESS
-| ... | IACL | ACL50 | 10k_FLOWS
-| ...
-| Suite Setup | Run Keywords
-| ... | Set up 3-node performance topology with DUT's NIC model | L2
-| ... | Intel-82599ES
-| ... | AND | Set up performance test suite with ACL
-| ...
-| Suite Teardown | Tear down 3-node performance topology
-| ...
-| Test Setup | Set up performance test
-| ...
-| Test Teardown | Tear down performance discovery test | ${min_rate}pps
-| ... | ${framesize} | ${traffic_profile}
-| ...
-| Test Template | Local Template
-| ...
-| Documentation | *RFC2544: Pkt throughput L2BD test cases with ACL*
-| ...
-| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology\
-| ... | with single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4-UDP for L2 switching of IPv4.
-| ... | *[Cfg] DUT configuration:* DUT1 is configured with L2 bridge domain\
-| ... | and MAC learning enabled. DUT2 is configured with L2 cross-connects.\
-| ... | Required ACL rules are applied to input paths of both DUT1 intefaces.\
-| ... | DUT1 and DUT2 are tested with 2p10GE NIC 82599ES by Intel.\
-| ... | *[Ver] TG verification:* TG finds and reports throughput NDR (Non Drop
-| ... | Rate) with zero packet loss tolerance or throughput PDR (Partial Drop
-| ... | Rate) with non-zero packet loss tolerance (LT) expressed in percentage
-| ... | of packets transmitted. NDR and PDR are discovered for different
-| ... | Ethernet L2 frame sizes using MLRsearch library.
-| ... | Test packets are generated by TG on\
-| ... | links to DUTs. TG traffic profile contains two L3 flow-groups\
-| ... | (flow-group per direction, ${flows_per_dir} flows per flow-group) with\
-| ... | all packets containing Ethernet header, IPv4 header with UDP header and\
-| ... | static payload. MAC addresses are matching MAC addresses of the TG node\
-| ... | interfaces.
-| ... | *[Ref] Applicable standard specifications:* RFC2544.
-
-*** Variables ***
-# 82599ES bandwidth limit
-| ${s_limit}= | ${10000000000}
-
-# ACL test setup
-| ${acl_action}= | permit
-| ${acl_apply_type}= | input
-| ${no_hit_aces_number}= | 50
-| ${flows_per_dir}= | 10k
-
-# starting points for non-hitting ACLs
-| ${src_ip_start}= | 30.30.30.1
-| ${dst_ip_start}= | 40.40.40.1
-| ${ip_step}= | ${1}
-| ${sport_start}= | ${1000}
-| ${dport_start}= | ${1000}
-| ${port_step}= | ${1}
-| ${trex_stream1_subnet}= | 10.10.10.0/24
-| ${trex_stream2_subnet}= | 20.20.20.0/24
-
-# Traffic profile:
-| ${traffic_profile}= | trex-sl-3n-ethip4udp-10u1000p-conc
-
-*** Keywords ***
-| Local Template
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD config with ACLs with ${phy_cores} phy
-| | ... | core(s).
-| | ... | [Ver] Measure NDR and PDR values using MLRsearch algorithm.\
-| | ...
-| | ... | *Arguments:*
-| | ... | - framesize - Framesize in Bytes in integer or string (IMIX_v4_1).
-| | ... | Type: integer, string
-| | ... | - phy_cores - Number of physical cores. Type: integer
-| | ... | - rxq - Number of RX queues, default value: ${None}. Type: integer
-| | ...
-| | [Arguments] | ${framesize} | ${phy_cores} | ${rxq}=${None}
-| | ...
-| | Set Test Variable | ${framesize}
-| | Set Test Variable | ${min_rate} | ${10000}
-| | ...
-| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
-| | And Add PCI devices to all DUTs
-| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
-| | ... | ${s_limit} | ${framesize}
-| | And Apply startup configuration on all VPP DUTs
-| | When Initialize L2 bridge domain with IPv4 ACLs on DUT1 in 3-node circular topology
-| | Then Find NDR and PDR intervals using optimized search
-| | ... | ${framesize} | ${traffic_profile} | ${min_rate} | ${max_rate}
-
-*** Test Cases ***
-| tc01-64B-1c-eth-l2bdbasemaclrn-iacl50sl-10kflows-ndrpdr
-| | [Tags] | 64B | 1C
-| | framesize=${64} | phy_cores=${1}
-
-| tc02-64B-2c-eth-l2bdbasemaclrn-iacl50sl-10kflows-ndrpdr
-| | [Tags] | 64B | 2C
-| | framesize=${64} | phy_cores=${2}
-
-| tc03-64B-4c-eth-l2bdbasemaclrn-iacl50sl-10kflows-ndrpdr
-| | [Tags] | 64B | 4C
-| | framesize=${64} | phy_cores=${4}
-
-| tc04-1518B-1c-eth-l2bdbasemaclrn-iacl50sl-10kflows-ndrpdr
-| | [Tags] | 1518B | 1C
-| | framesize=${1518} | phy_cores=${1}
-
-| tc05-1518B-2c-eth-l2bdbasemaclrn-iacl50sl-10kflows-ndrpdr
-| | [Tags] | 1518B | 2C
-| | framesize=${1518} | phy_cores=${2}
-
-| tc06-1518B-4c-eth-l2bdbasemaclrn-iacl50sl-10kflows-ndrpdr
-| | [Tags] | 1518B | 4C
-| | framesize=${1518} | phy_cores=${4}
-
-| tc07-9000B-1c-eth-l2bdbasemaclrn-iacl50sl-10kflows-ndrpdr
-| | [Tags] | 9000B | 1C
-| | framesize=${9000} | phy_cores=${1}
-
-| tc08-9000B-2c-eth-l2bdbasemaclrn-iacl50sl-10kflows-ndrpdr
-| | [Tags] | 9000B | 2C
-| | framesize=${9000} | phy_cores=${2}
-
-| tc09-9000B-4c-eth-l2bdbasemaclrn-iacl50sl-10kflows-ndrpdr
-| | [Tags] | 9000B | 4C
-| | framesize=${9000} | phy_cores=${4}
-
-| tc10-IMIX-1c-eth-l2bdbasemaclrn-iacl50sl-10kflows-ndrpdr
-| | [Tags] | IMIX | 1C
-| | framesize=IMIX_v4_1 | phy_cores=${1}
-
-| tc11-IMIX-2c-eth-l2bdbasemaclrn-iacl50sl-10kflows-ndrpdr
-| | [Tags] | IMIX | 2C
-| | framesize=IMIX_v4_1 | phy_cores=${2}
-
-| tc12-IMIX-4c-eth-l2bdbasemaclrn-iacl50sl-10kflows-ndrpdr
-| | [Tags] | IMIX | 4C
-| | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/l2/10ge2p1x82599es-eth-l2bdbasemaclrn-mrr.robot b/tests/vpp/perf/l2/10ge2p1x82599es-eth-l2bdbasemaclrn-mrr.robot
deleted file mode 100644
index 0e1a979536..0000000000
--- a/tests/vpp/perf/l2/10ge2p1x82599es-eth-l2bdbasemaclrn-mrr.robot
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright (c) 2019 PANTHEON.tech 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 | MRR
-| ... | NIC_Intel-82599ES | ETH | L2BDMACLRN | BASE
-| ...
-| Suite Setup | Set up 3-node performance topology with DUT's NIC model
-| ... | L2 | Intel-82599ES
-| ...
-| Suite Teardown | Tear down 3-node performance topology
-| ...
-| Test Setup | Set up performance test
-| ...
-| Test Teardown | Tear down performance mrr test
-| ...
-| Test Template | Local Template
-| ...
-| Documentation | *Raw results L2BD 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\
-| ... | Intel-82599ES.
-| ... | *[Ver] TG verification:* In MaxReceivedRate test TG sends traffic\
-| ... | at line rate and reports total received/sent packets over trial period.\
-| ... | 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 ***
-# Link limit:
-| ${s_limit}= | ${10000000000}
-# Traffic profile:
-| ${traffic_profile}= | trex-sl-3n-ethip4-ip4src254
-
-*** Keywords ***
-| Local Template
-| | [Documentation]
-| | ... | [Cfg] Each DUT runs L2BD switching config and uses ${phy_cores}\
-| | ... | physical core(s) for worker threads.
-| | ... | [Ver] Measure MaxReceivedRate for ${framesize}B frames using single\
-| | ... | trial throughput test.
-| | ...
-| | ... | *Arguments:*
-| | ... | - framesize - Framesize in Bytes in integer or string (IMIX_v4_1).
-| | ... | Type: integer, string
-| | ... | - phy_cores - Number of physical cores. Type: integer
-| | ... | - rxq - Number of RX queues, default value: ${None}. Type: integer
-| | ...
-| | [Arguments] | ${framesize} | ${phy_cores} | ${rxq}=${None}
-| | ...
-| | Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
-| | Add PCI devices to all DUTs
-| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
-| | ... | ${s_limit} | ${framesize}
-| | Apply startup configuration on all VPP DUTs
-| | Initialize L2 bridge domain in circular topology
-| | Then Traffic should pass with maximum rate
-| | ... | ${max_rate}pps | ${framesize} | ${traffic_profile}
-
-*** Test Cases ***
-| tc01-64B-1c-eth-l2bdbasemaclrn-mrr
-| | [Tags] | 64B | 1C
-| | framesize=${64} | phy_cores=${1}
-
-| tc02-64B-2c-eth-l2bdbasemaclrn-mrr
-| | [Tags] | 64B | 2C
-| | framesize=${64} | phy_cores=${2}
-
-| tc03-64B-4c-eth-l2bdbasemaclrn-mrr
-| | [Tags] | 64B | 4C
-| | framesize=${64} | phy_cores=${4}
-
-| tc04-1518B-1c-eth-l2bdbasemaclrn-mrr
-| | [Tags] | 1518B | 1C
-| | framesize=${1518} | phy_cores=${1}
-
-| tc05-1518B-2c-eth-l2bdbasemaclrn-mrr
-| | [Tags] | 1518B | 2C
-| | framesize=${1518} | phy_cores=${2}
-
-| tc06-1518B-4c-eth-l2bdbasemaclrn-mrr
-| | [Tags] | 1518B | 4C
-| | framesize=${1518} | phy_cores=${4}
-
-| tc07-9000B-1c-eth-l2bdbasemaclrn-mrr
-| | [Tags] | 9000B | 1C
-| | framesize=${9000} | phy_cores=${1}
-
-| tc08-9000B-2c-eth-l2bdbasemaclrn-mrr
-| | [Tags] | 9000B | 2C
-| | framesize=${9000} | phy_cores=${2}
-
-| tc09-9000B-4c-eth-l2bdbasemaclrn-mrr
-| | [Tags] | 9000B | 4C
-| | framesize=${9000} | phy_cores=${4}
-
-| tc10-IMIX-1c-eth-l2bdbasemaclrn-mrr
-| | [Tags] | IMIX | 1C
-| | framesize=IMIX_v4_1 | phy_cores=${1}
-
-| tc11-IMIX-2c-eth-l2bdbasemaclrn-mrr
-| | [Tags] | IMIX | 2C
-| | framesize=IMIX_v4_1 | phy_cores=${2}
-
-| tc12-IMIX-4c-eth-l2bdbasemaclrn-mrr
-| | [Tags] | IMIX | 4C
-| | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/l2/10ge2p1x82599es-eth-l2bdbasemaclrn-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x82599es-eth-l2bdbasemaclrn-ndrpdr.robot
deleted file mode 100644
index f8f94b1823..0000000000
--- a/tests/vpp/perf/l2/10ge2p1x82599es-eth-l2bdbasemaclrn-ndrpdr.robot
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright (c) 2019 PANTHEON.tech 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 | NDRPDR
-| ... | NIC_Intel-82599ES | ETH | L2BDMACLRN | BASE
-| ...
-| Suite Setup | Set up 3-node performance topology with DUT's NIC model
-| ... | L2 | Intel-82599ES
-| ...
-| Suite Teardown | Tear down 3-node performance topology
-| ...
-| Test Setup | Set up performance test
-| ...
-| Test Teardown | Tear down performance discovery test | ${min_rate}pps
-| ... | ${framesize} | ${traffic_profile}
-| ...
-| Test Template | Local Template
-| ...
-| Documentation | *RFC2544: Pkt throughput L2BD 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\
-| ... | 82599ES.
-| ... | *[Ver] TG verification:* TG finds and reports throughput NDR (Non Drop\
-| ... | Rate) with zero packet loss tolerance or throughput PDR (Partial Drop\
-| ... | Rate) with non-zero packet loss tolerance (LT) expressed in percentage\
-| ... | of packets transmitted. NDR and PDR are discovered for different\
-| ... | Ethernet L2 frame sizes using MLRsearch library.\
-| ... | 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 ***
-# Link limit:
-| ${s_limit}= | ${10000000000}
-# Traffic profile:
-| ${traffic_profile}= | trex-sl-3n-ethip4-ip4src254
-
-*** Keywords ***
-| Local Template
-| | [Documentation]
-| | ... | [Cfg] Each DUT runs L2BD switching config and uses ${phy_cores}\
-| | ... | physical core(s) for worker threads.
-| | ... | [Ver] Measure NDR and PDR values using MLRsearch algorithm.\
-| | ...
-| | ... | *Arguments:*
-| | ... | - framesize - Framesize in Bytes in integer or string (IMIX_v4_1).
-| | ... | Type: integer, string
-| | ... | - phy_cores - Number of physical cores. Type: integer
-| | ... | - rxq - Number of RX queues, default value: ${None}. Type: integer
-| | ...
-| | [Arguments] | ${framesize} | ${phy_cores} | ${rxq}=${None}
-| | ...
-| | Set Test Variable | ${framesize}
-| | Set Test Variable | ${min_rate} | ${10000}
-| | ...
-| | Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
-| | Add PCI devices to all DUTs
-| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
-| | ... | ${s_limit} | ${framesize}
-| | Apply startup configuration on all VPP DUTs
-| | Initialize L2 bridge domain in circular topology
-| | Then Find NDR and PDR intervals using optimized search
-| | ... | ${framesize} | ${traffic_profile} | ${min_rate} | ${max_rate}
-
-*** Test Cases ***
-| tc01-64B-1c-eth-l2bdbasemaclrn-ndrpdr
-| | [Tags] | 64B | 1C
-| | framesize=${64} | phy_cores=${1}
-
-| tc02-64B-2c-eth-l2bdbasemaclrn-ndrpdr
-| | [Tags] | 64B | 2C
-| | framesize=${64} | phy_cores=${2}
-
-| tc03-64B-4c-eth-l2bdbasemaclrn-ndrpdr
-| | [Tags] | 64B | 4C
-| | framesize=${64} | phy_cores=${4}
-
-| tc04-1518B-1c-eth-l2bdbasemaclrn-ndrpdr
-| | [Tags] | 1518B | 1C
-| | framesize=${1518} | phy_cores=${1}
-
-| tc05-1518B-2c-eth-l2bdbasemaclrn-ndrpdr
-| | [Tags] | 1518B | 2C
-| | framesize=${1518} | phy_cores=${2}
-
-| tc06-1518B-4c-eth-l2bdbasemaclrn-ndrpdr
-| | [Tags] | 1518B | 4C
-| | framesize=${1518} | phy_cores=${4}
-
-| tc07-9000B-1c-eth-l2bdbasemaclrn-ndrpdr
-| | [Tags] | 9000B | 1C
-| | framesize=${9000} | phy_cores=${1}
-
-| tc08-9000B-2c-eth-l2bdbasemaclrn-ndrpdr
-| | [Tags] | 9000B | 2C
-| | framesize=${9000} | phy_cores=${2}
-
-| tc09-9000B-4c-eth-l2bdbasemaclrn-ndrpdr
-| | [Tags] | 9000B | 4C
-| | framesize=${9000} | phy_cores=${4}
-
-| tc10-IMIX-1c-eth-l2bdbasemaclrn-ndrpdr
-| | [Tags] | IMIX | 1C
-| | framesize=IMIX_v4_1 | phy_cores=${1}
-
-| tc11-IMIX-2c-eth-l2bdbasemaclrn-ndrpdr
-| | [Tags] | IMIX | 2C
-| | framesize=IMIX_v4_1 | phy_cores=${2}
-
-| tc12-IMIX-4c-eth-l2bdbasemaclrn-ndrpdr
-| | [Tags] | IMIX | 4C
-| | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/l2/10ge2p1x82599es-eth-l2bdscale100kmaclrn-mrr.robot b/tests/vpp/perf/l2/10ge2p1x82599es-eth-l2bdscale100kmaclrn-mrr.robot
deleted file mode 100644
index 0a8a5c8db9..0000000000
--- a/tests/vpp/perf/l2/10ge2p1x82599es-eth-l2bdscale100kmaclrn-mrr.robot
+++ /dev/null
@@ -1,130 +0,0 @@
-# Copyright (c) 2019 PANTHEON.tech 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 | MRR
-| ... | NIC_Intel-82599ES | ETH | L2BDMACLRN | SCALE | L2BDSCALE | FIB_100K
-| ...
-| Suite Setup | Set up 3-node performance topology with DUT's NIC model
-| ... | L2 | Intel-82599ES
-| ...
-| Suite Teardown | Tear down 3-node performance topology
-| ...
-| Test Setup | Set up performance test
-| ...
-| Test Teardown | Tear down performance mrr test
-| ...
-| Test Template | Local Template
-| ...
-| Documentation | *Raw results for L2BD 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\
-| ... | 82599ES by Intel.
-| ... | *[Ver] TG verification:* In MaxReceivedRate tests TG sends traffic\
-| ... | at line rate and reports total received/sent packets over trial period.\
-| ... | Test packets are generated by TG on links to DUTs. TG traffic profile\
-| ... | contains two L3 flow-groups (flow-group per direction, 50k flows per\
-| ... | flow-group) with all packets containing Ethernet header, IPv4 header\
-| ... | with IP protocol=61 and static payload.\
-| ... | MAC addresses ranges are incremented as follows:
-| ... | port01_src ca:fe:00:00:00:00 - port01_src ca:fe:00:07:a1:1f,
-| ... | port01_dst fa:ce:00:00:00:00 - port01_dst fa:ce:00:07:a1:1f,
-| ... | port02_src fa:ce:00:00:00:00 - port02_src fa:ce:00:07:a1:1f,
-| ... | port02_dst ca:fe:00:00:00:00 - port02_dst ca:fe:00:07:a1:1f
-| ... | *[Ref] Applicable standard specifications:* RFC2544.
-
-*** Variables ***
-# 82599ES bandwidth limit
-| ${s_limit}= | ${10000000000}
-# Traffic profile:
-| ${traffic_profile}= | trex-sl-3n-ethip4-macsrc50kdst50k
-
-*** Keywords ***
-| Local Template
-| | [Documentation]
-| | ... | [CFG] Each DUT runs L2BD switching config and uses ${phy_cores}\
-| | ... | physical core(s) for worker threads.
-| | ... | [Ver] Measure MaxReceivedRate for ${framesize}B frames using single\
-| | ... | trial throughput test.
-| | ...
-| | ... | *Arguments:*
-| | ... | - framesize - Framesize in Bytes in integer or string (IMIX_v4_1).
-| | ... | Type: integer, string
-| | ... | - phy_cores - Number of physical cores. Type: integer
-| | ... | - rxq - Number of RX queues, default value: ${None}. Type: integer
-| | ...
-| | [Arguments] | ${framesize} | ${phy_cores} | ${rxq}=${None}
-| | ...
-| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
-| | And Add PCI devices to all DUTs
-| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
-| | ... | ${s_limit} | ${framesize}
-| | And Apply startup configuration on all VPP DUTs
-| | When Initialize L2 bridge domain in circular topology
-| | Then Traffic should pass with maximum rate
-| | ... | ${max_rate}pps | ${framesize} | ${traffic_profile}
-
-*** Test Cases ***
-| tc01-64B-1c-eth-l2bdscale100kmaclrn-mrr
-| | [Tags] | 64B | 1C
-| | framesize=${64} | phy_cores=${1}
-
-| tc02-64B-2c-eth-l2bdscale100kmaclrn-mrr
-| | [Tags] | 64B | 2C
-| | framesize=${64} | phy_cores=${2}
-
-| tc03-64B-4c-eth-l2bdscale100kmaclrn-mrr
-| | [Tags] | 64B | 4C
-| | framesize=${64} | phy_cores=${4}
-
-| tc04-1518B-1c-eth-l2bdscale100kmaclrn-mrr
-| | [Tags] | 1518B | 1C
-| | framesize=${1518} | phy_cores=${1}
-
-| tc05-1518B-2c-eth-l2bdscale100kmaclrn-mrr
-| | [Tags] | 1518B | 2C
-| | framesize=${1518} | phy_cores=${2}
-
-| tc06-1518B-4c-eth-l2bdscale100kmaclrn-mrr
-| | [Tags] | 1518B | 4C
-| | framesize=${1518} | phy_cores=${4}
-
-| tc07-9000B-1c-eth-l2bdscale100kmaclrn-mrr
-| | [Tags] | 9000B | 1C
-| | framesize=${9000} | phy_cores=${1}
-
-| tc08-9000B-2c-eth-l2bdscale100kmaclrn-mrr
-| | [Tags] | 9000B | 2C
-| | framesize=${9000} | phy_cores=${2}
-
-| tc09-9000B-4c-eth-l2bdscale100kmaclrn-mrr
-| | [Tags] | 9000B | 4C
-| | framesize=${9000} | phy_cores=${4}
-
-| tc10-IMIX-1c-eth-l2bdscale100kmaclrn-mrr
-| | [Tags] | IMIX | 1C
-| | framesize=IMIX_v4_1 | phy_cores=${1}
-
-| tc11-IMIX-2c-eth-l2bdscale100kmaclrn-mrr
-| | [Tags] | IMIX | 2C
-| | framesize=IMIX_v4_1 | phy_cores=${2}
-
-| tc12-IMIX-4c-eth-l2bdscale100kmaclrn-mrr
-| | [Tags] | IMIX | 4C
-| | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/l2/10ge2p1x82599es-eth-l2bdscale100kmaclrn-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x82599es-eth-l2bdscale100kmaclrn-ndrpdr.robot
deleted file mode 100644
index 3ff01fa5ab..0000000000
--- a/tests/vpp/perf/l2/10ge2p1x82599es-eth-l2bdscale100kmaclrn-ndrpdr.robot
+++ /dev/null
@@ -1,136 +0,0 @@
-# Copyright (c) 2019 PANTHEON.tech 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 | NDRPDR
-| ... | NIC_Intel-82599ES | ETH | L2BDMACLRN | SCALE | L2BDSCALE | FIB_100K
-| ...
-| Suite Setup | Set up 3-node performance topology with DUT's NIC model
-| ... | L2 | Intel-82599ES
-| ...
-| Suite Teardown | Tear down 3-node performance topology
-| ...
-| Test Setup | Set up performance test
-| ...
-| Test Teardown | Tear down performance discovery test | ${min_rate}pps
-| ... | ${framesize} | ${traffic_profile}
-| ...
-| Test Template | Local Template
-| ...
-| Documentation | *RFC2544: Pkt throughput for L2BD 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\
-| ... | 82599ES by Intel.
-| ... | *[Ver] TG verification:* TG finds and reports throughput NDR (Non Drop\
-| ... | Rate) with zero packet loss tolerance or throughput PDR (Partial Drop\
-| ... | Rate) with non-zero packet loss tolerance (LT) expressed in percentage\
-| ... | of packets transmitted. NDR and PDR are discovered for different\
-| ... | Ethernet L2 frame sizes using MLRsearch library.\
-| ... | Test packets are generated by TG on links to DUTs. TG traffic profile\
-| ... | contains two L3 flow-groups (flow-group per direction, 50k flows per\
-| ... | flow-group) with all packets containing Ethernet header, IPv4 header\
-| ... | with IP protocol=61 and static payload.\
-| ... | MAC addresses ranges are incremented as follows:
-| ... | port01_src ca:fe:00:00:00:00 - port01_src ca:fe:00:07:a1:1f,
-| ... | port01_dst fa:ce:00:00:00:00 - port01_dst fa:ce:00:07:a1:1f,
-| ... | port02_src fa:ce:00:00:00:00 - port02_src fa:ce:00:07:a1:1f,
-| ... | port02_dst ca:fe:00:00:00:00 - port02_dst ca:fe:00:07:a1:1f
-| ... | *[Ref] Applicable standard specifications:* RFC2544.
-
-*** Variables ***
-# 82599ES bandwidth limit
-| ${s_limit}= | ${10000000000}
-# Traffic profile:
-| ${traffic_profile}= | trex-sl-3n-ethip4-macsrc50kdst50k
-
-*** Keywords ***
-| Local Template
-| | [Documentation]
-| | ... | [CFG] Each DUT runs L2BD switching config and uses ${phy_cores}\
-| | ... | physical core(s) for worker threads.
-| | ... | [Ver] Measure NDR and PDR values using MLRsearch algorithm.\
-| | ...
-| | ... | *Arguments:*
-| | ... | - framesize - Framesize in Bytes in integer or string (IMIX_v4_1).
-| | ... | Type: integer, string
-| | ... | - phy_cores - Number of physical cores. Type: integer
-| | ... | - rxq - Number of RX queues, default value: ${None}. Type: integer
-| | ...
-| | [Arguments] | ${framesize} | ${phy_cores} | ${rxq}=${None}
-| | ...
-| | Set Test Variable | ${framesize}
-| | Set Test Variable | ${min_rate} | ${10000}
-| | ...
-| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
-| | And Add PCI devices to all DUTs
-| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
-| | ... | ${s_limit} | ${framesize}
-| | And Apply startup configuration on all VPP DUTs
-| | When Initialize L2 bridge domain in circular topology
-| | Then Find NDR and PDR intervals using optimized search
-| | ... | ${framesize} | ${traffic_profile} | ${min_rate} | ${max_rate}
-
-*** Test Cases ***
-| tc01-64B-1c-eth-l2bdscale100kmaclrn-ndrpdr
-| | [Tags] | 64B | 1C
-| | framesize=${64} | phy_cores=${1}
-
-| tc02-64B-2c-eth-l2bdscale100kmaclrn-ndrpdr
-| | [Tags] | 64B | 2C
-| | framesize=${64} | phy_cores=${2}
-
-| tc03-64B-4c-eth-l2bdscale100kmaclrn-ndrpdr
-| | [Tags] | 64B | 4C
-| | framesize=${64} | phy_cores=${4}
-
-| tc04-1518B-1c-eth-l2bdscale100kmaclrn-ndrpdr
-| | [Tags] | 1518B | 1C
-| | framesize=${1518} | phy_cores=${1}
-
-| tc05-1518B-2c-eth-l2bdscale100kmaclrn-ndrpdr
-| | [Tags] | 1518B | 2C
-| | framesize=${1518} | phy_cores=${2}
-
-| tc06-1518B-4c-eth-l2bdscale100kmaclrn-ndrpdr
-| | [Tags] | 1518B | 4C
-| | framesize=${1518} | phy_cores=${4}
-
-| tc07-9000B-1c-eth-l2bdscale100kmaclrn-ndrpdr
-| | [Tags] | 9000B | 1C
-| | framesize=${9000} | phy_cores=${1}
-
-| tc08-9000B-2c-eth-l2bdscale100kmaclrn-ndrpdr
-| | [Tags] | 9000B | 2C
-| | framesize=${9000} | phy_cores=${2}
-
-| tc09-9000B-4c-eth-l2bdscale100kmaclrn-ndrpdr
-| | [Tags] | 9000B | 4C
-| | framesize=${9000} | phy_cores=${4}
-
-| tc10-IMIX-1c-eth-l2bdscale100kmaclrn-ndrpdr
-| | [Tags] | IMIX | 1C
-| | framesize=IMIX_v4_1 | phy_cores=${1}
-
-| tc11-IMIX-2c-eth-l2bdscale100kmaclrn-ndrpdr
-| | [Tags] | IMIX | 2C
-| | framesize=IMIX_v4_1 | phy_cores=${2}
-
-| tc12-IMIX-4c-eth-l2bdscale100kmaclrn-ndrpdr
-| | [Tags] | IMIX | 4C
-| | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/l2/10ge2p1x82599es-eth-l2bdscale10kmaclrn-mrr.robot b/tests/vpp/perf/l2/10ge2p1x82599es-eth-l2bdscale10kmaclrn-mrr.robot
deleted file mode 100644
index b4b34495f1..0000000000
--- a/tests/vpp/perf/l2/10ge2p1x82599es-eth-l2bdscale10kmaclrn-mrr.robot
+++ /dev/null
@@ -1,130 +0,0 @@
-# Copyright (c) 2019 PANTHEON.tech 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 | MRR
-| ... | NIC_Intel-82599ES | ETH | L2BDMACLRN | SCALE | L2BDSCALE | FIB_10K
-| ...
-| Suite Setup | Set up 3-node performance topology with DUT's NIC model
-| ... | L2 | Intel-82599ES
-| ...
-| Suite Teardown | Tear down 3-node performance topology
-| ...
-| Test Setup | Set up performance test
-| ...
-| Test Teardown | Tear down performance mrr test
-| ...
-| Test Template | Local Template
-| ...
-| Documentation | *Raw results for L2BD 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\
-| ... | 82599ES by Intel.
-| ... | *[Ver] TG verification:* In MaxReceivedRate tests TG sends traffic\
-| ... | at line rate and reports total received/sent packets over trial period.\
-| ... | Test packets are generated by TG on links to DUTs. TG traffic profile\
-| ... | contains two L3 flow-groups (flow-group per direction, 5k flows per\
-| ... | flow-group) with all packets containing Ethernet header, IPv4 header\
-| ... | with IP protocol=61 and static payload.\
-| ... | MAC addresses ranges are incremented as follows:
-| ... | port01_src ca:fe:00:00:00:00 - port01_src ca:fe:00:07:a1:1f,
-| ... | port01_dst fa:ce:00:00:00:00 - port01_dst fa:ce:00:07:a1:1f,
-| ... | port02_src fa:ce:00:00:00:00 - port02_src fa:ce:00:07:a1:1f,
-| ... | port02_dst ca:fe:00:00:00:00 - port02_dst ca:fe:00:07:a1:1f
-| ... | *[Ref] Applicable standard specifications:* RFC2544.
-
-*** Variables ***
-# 82599ES bandwidth limit
-| ${s_limit}= | ${10000000000}
-# Traffic profile:
-| ${traffic_profile}= | trex-sl-3n-ethip4-macsrc5kdst5k
-
-*** Keywords ***
-| Local Template
-| | [Documentation]
-| | ... | [CFG] Each DUT runs L2BD switching config and uses ${phy_cores}\
-| | ... | physical core(s) for worker threads.
-| | ... | [Ver] Measure MaxReceivedRate for ${framesize}B frames using single\
-| | ... | trial throughput test.
-| | ...
-| | ... | *Arguments:*
-| | ... | - framesize - Framesize in Bytes in integer or string (IMIX_v4_1).
-| | ... | Type: integer, string
-| | ... | - phy_cores - Number of physical cores. Type: integer
-| | ... | - rxq - Number of RX queues, default value: ${None}. Type: integer
-| | ...
-| | [Arguments] | ${framesize} | ${phy_cores} | ${rxq}=${None}
-| | ...
-| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
-| | And Add PCI devices to all DUTs
-| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
-| | ... | ${s_limit} | ${framesize}
-| | And Apply startup configuration on all VPP DUTs
-| | When Initialize L2 bridge domain in circular topology
-| | Then Traffic should pass with maximum rate
-| | ... | ${max_rate}pps | ${framesize} | ${traffic_profile}
-
-*** Test Cases ***
-| tc01-64B-1c-eth-l2bdscale10kmaclrn-mrr
-| | [Tags] | 64B | 1C
-| | framesize=${64} | phy_cores=${1}
-
-| tc02-64B-2c-eth-l2bdscale10kmaclrn-mrr
-| | [Tags] | 64B | 2C
-| | framesize=${64} | phy_cores=${2}
-
-| tc03-64B-4c-eth-l2bdscale10kmaclrn-mrr
-| | [Tags] | 64B | 4C
-| | framesize=${64} | phy_cores=${4}
-
-| tc04-1518B-1c-eth-l2bdscale10kmaclrn-mrr
-| | [Tags] | 1518B | 1C
-| | framesize=${1518} | phy_cores=${1}
-
-| tc05-1518B-2c-eth-l2bdscale10kmaclrn-mrr
-| | [Tags] | 1518B | 2C
-| | framesize=${1518} | phy_cores=${2}
-
-| tc06-1518B-4c-eth-l2bdscale10kmaclrn-mrr
-| | [Tags] | 1518B | 4C
-| | framesize=${1518} | phy_cores=${4}
-
-| tc07-9000B-1c-eth-l2bdscale10kmaclrn-mrr
-| | [Tags] | 9000B | 1C
-| | framesize=${9000} | phy_cores=${1}
-
-| tc08-9000B-2c-eth-l2bdscale10kmaclrn-mrr
-| | [Tags] | 9000B | 2C
-| | framesize=${9000} | phy_cores=${2}
-
-| tc09-9000B-4c-eth-l2bdscale10kmaclrn-mrr
-| | [Tags] | 9000B | 4C
-| | framesize=${9000} | phy_cores=${4}
-
-| tc10-IMIX-1c-eth-l2bdscale10kmaclrn-mrr
-| | [Tags] | IMIX | 1C
-| | framesize=IMIX_v4_1 | phy_cores=${1}
-
-| tc11-IMIX-2c-eth-l2bdscale10kmaclrn-mrr
-| | [Tags] | IMIX | 2C
-| | framesize=IMIX_v4_1 | phy_cores=${2}
-
-| tc12-IMIX-4c-eth-l2bdscale10kmaclrn-mrr
-| | [Tags] | IMIX | 4C
-| | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/l2/10ge2p1x82599es-eth-l2bdscale10kmaclrn-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x82599es-eth-l2bdscale10kmaclrn-ndrpdr.robot
deleted file mode 100644
index 0023b5bf24..0000000000
--- a/tests/vpp/perf/l2/10ge2p1x82599es-eth-l2bdscale10kmaclrn-ndrpdr.robot
+++ /dev/null
@@ -1,136 +0,0 @@
-# Copyright (c) 2019 PANTHEON.tech 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 | NDRPDR
-| ... | NIC_Intel-82599ES | ETH | L2BDMACLRN | SCALE | L2BDSCALE | FIB_10K
-| ...
-| Suite Setup | Set up 3-node performance topology with DUT's NIC model
-| ... | L2 | Intel-82599ES
-| ...
-| Suite Teardown | Tear down 3-node performance topology
-| ...
-| Test Setup | Set up performance test
-| ...
-| Test Teardown | Tear down performance discovery test | ${min_rate}pps
-| ... | ${framesize} | ${traffic_profile}
-| ...
-| Test Template | Local Template
-| ...
-| Documentation | *RFC2544: Pkt throughput for L2BD 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\
-| ... | 82599ES by Intel.
-| ... | *[Ver] TG verification:* TG finds and reports throughput NDR (Non Drop\
-| ... | Rate) with zero packet loss tolerance or throughput PDR (Partial Drop\
-| ... | Rate) with non-zero packet loss tolerance (LT) expressed in percentage\
-| ... | of packets transmitted. NDR and PDR are discovered for different\
-| ... | Ethernet L2 frame sizes using MLRsearch library.\
-| ... | Test packets are generated by TG on links to DUTs. TG traffic profile\
-| ... | contains two L3 flow-groups (flow-group per direction, 5k flows per\
-| ... | flow-group) with all packets containing Ethernet header, IPv4 header\
-| ... | with IP protocol=61 and static payload.\
-| ... | MAC addresses ranges are incremented as follows:
-| ... | port01_src ca:fe:00:00:00:00 - port01_src ca:fe:00:07:a1:1f,
-| ... | port01_dst fa:ce:00:00:00:00 - port01_dst fa:ce:00:07:a1:1f,
-| ... | port02_src fa:ce:00:00:00:00 - port02_src fa:ce:00:07:a1:1f,
-| ... | port02_dst ca:fe:00:00:00:00 - port02_dst ca:fe:00:07:a1:1f
-| ... | *[Ref] Applicable standard specifications:* RFC2544.
-
-*** Variables ***
-# 82599ES bandwidth limit
-| ${s_limit}= | ${10000000000}
-# Traffic profile:
-| ${traffic_profile}= | trex-sl-3n-ethip4-macsrc5kdst5k
-
-*** Keywords ***
-| Local Template
-| | [Documentation]
-| | ... | [CFG] Each DUT runs L2BD switching config and uses ${phy_cores}\
-| | ... | physical core(s) for worker threads.
-| | ... | [Ver] Measure NDR and PDR values using MLRsearch algorithm.\
-| | ...
-| | ... | *Arguments:*
-| | ... | - framesize - Framesize in Bytes in integer or string (IMIX_v4_1).
-| | ... | Type: integer, string
-| | ... | - phy_cores - Number of physical cores. Type: integer
-| | ... | - rxq - Number of RX queues, default value: ${None}. Type: integer
-| | ...
-| | [Arguments] | ${framesize} | ${phy_cores} | ${rxq}=${None}
-| | ...
-| | Set Test Variable | ${framesize}
-| | Set Test Variable | ${min_rate} | ${10000}
-| | ...
-| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
-| | And Add PCI devices to all DUTs
-| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
-| | ... | ${s_limit} | ${framesize}
-| | And Apply startup configuration on all VPP DUTs
-| | When Initialize L2 bridge domain in circular topology
-| | Then Find NDR and PDR intervals using optimized search
-| | ... | ${framesize} | ${traffic_profile} | ${min_rate} | ${max_rate}
-
-*** Test Cases ***
-| tc01-64B-1c-eth-l2bdscale10kmaclrn-ndrpdr
-| | [Tags] | 64B | 1C
-| | framesize=${64} | phy_cores=${1}
-
-| tc02-64B-2c-eth-l2bdscale10kmaclrn-ndrpdr
-| | [Tags] | 64B | 2C
-| | framesize=${64} | phy_cores=${2}
-
-| tc03-64B-4c-eth-l2bdscale10kmaclrn-ndrpdr
-| | [Tags] | 64B | 4C
-| | framesize=${64} | phy_cores=${4}
-
-| tc04-1518B-1c-eth-l2bdscale10kmaclrn-ndrpdr
-| | [Tags] | 1518B | 1C
-| | framesize=${1518} | phy_cores=${1}
-
-| tc05-1518B-2c-eth-l2bdscale10kmaclrn-ndrpdr
-| | [Tags] | 1518B | 2C
-| | framesize=${1518} | phy_cores=${2}
-
-| tc06-1518B-4c-eth-l2bdscale10kmaclrn-ndrpdr
-| | [Tags] | 1518B | 4C
-| | framesize=${1518} | phy_cores=${4}
-
-| tc07-9000B-1c-eth-l2bdscale10kmaclrn-ndrpdr
-| | [Tags] | 9000B | 1C
-| | framesize=${9000} | phy_cores=${1}
-
-| tc08-9000B-2c-eth-l2bdscale10kmaclrn-ndrpdr
-| | [Tags] | 9000B | 2C
-| | framesize=${9000} | phy_cores=${2}
-
-| tc09-9000B-4c-eth-l2bdscale10kmaclrn-ndrpdr
-| | [Tags] | 9000B | 4C
-| | framesize=${9000} | phy_cores=${4}
-
-| tc10-IMIX-1c-eth-l2bdscale10kmaclrn-ndrpdr
-| | [Tags] | IMIX | 1C
-| | framesize=IMIX_v4_1 | phy_cores=${1}
-
-| tc11-IMIX-2c-eth-l2bdscale10kmaclrn-ndrpdr
-| | [Tags] | IMIX | 2C
-| | framesize=IMIX_v4_1 | phy_cores=${2}
-
-| tc12-IMIX-4c-eth-l2bdscale10kmaclrn-ndrpdr
-| | [Tags] | IMIX | 4C
-| | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/l2/10ge2p1x82599es-eth-l2bdscale1mmaclrn-mrr.robot b/tests/vpp/perf/l2/10ge2p1x82599es-eth-l2bdscale1mmaclrn-mrr.robot
deleted file mode 100644
index 1d382157c0..0000000000
--- a/tests/vpp/perf/l2/10ge2p1x82599es-eth-l2bdscale1mmaclrn-mrr.robot
+++ /dev/null
@@ -1,130 +0,0 @@
-# Copyright (c) 2019 PANTHEON.tech 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 | MRR
-| ... | NIC_Intel-82599ES | ETH | L2BDMACLRN | SCALE | L2BDSCALE | FIB_1M
-| ...
-| Suite Setup | Set up 3-node performance topology with DUT's NIC model
-| ... | L2 | Intel-82599ES
-| ...
-| Suite Teardown | Tear down 3-node performance topology
-| ...
-| Test Setup | Set up performance test
-| ...
-| Test Teardown | Tear down performance mrr test
-| ...
-| Test Template | Local Template
-| ...
-| Documentation | *Raw results for L2BD 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\
-| ... | 82599ES by Intel.
-| ... | *[Ver] TG verification:* In MaxReceivedRate tests TG sends traffic\
-| ... | at line rate and reports total received/sent packets over trial period.\
-| ... | Test packets are generated by TG on links to DUTs. TG traffic profile\
-| ... | contains two L3 flow-groups (flow-group per direction, 500k flows per\
-| ... | flow-group) with all packets containing Ethernet header, IPv4 header\
-| ... | with IP protocol=61 and static payload.\
-| ... | MAC addresses ranges are incremented as follows:
-| ... | port01_src ca:fe:00:00:00:00 - port01_src ca:fe:00:07:a1:1f,
-| ... | port01_dst fa:ce:00:00:00:00 - port01_dst fa:ce:00:07:a1:1f,
-| ... | port02_src fa:ce:00:00:00:00 - port02_src fa:ce:00:07:a1:1f,
-| ... | port02_dst ca:fe:00:00:00:00 - port02_dst ca:fe:00:07:a1:1f
-| ... | *[Ref] Applicable standard specifications:* RFC2544.
-
-*** Variables ***
-# 82599ES bandwidth limit
-| ${s_limit}= | ${10000000000}
-# Traffic profile:
-| ${traffic_profile}= | trex-sl-3n-ethip4-macsrc500kdst500k
-
-*** Keywords ***
-| Local Template
-| | [Documentation]
-| | ... | [Cfg] Each DUT runs L2BD switching config and uses ${phy_cores}\
-| | ... | physical core(s) for worker threads.
-| | ... | [Ver] Measure MaxReceivedRate for ${framesize}B frames using single\
-| | ... | trial throughput test.
-| | ...
-| | ... | *Arguments:*
-| | ... | - framesize - Framesize in Bytes in integer or string (IMIX_v4_1).
-| | ... | Type: integer, string
-| | ... | - phy_cores - Number of physical cores. Type: integer
-| | ... | - rxq - Number of RX queues, default value: ${None}. Type: integer
-| | ...
-| | [Arguments] | ${framesize} | ${phy_cores} | ${rxq}=${None}
-| | ...
-| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
-| | And Add PCI devices to all DUTs
-| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
-| | ... | ${s_limit} | ${framesize}
-| | And Apply startup configuration on all VPP DUTs
-| | When Initialize L2 bridge domain in circular topology
-| | Then Traffic should pass with maximum rate
-| | ... | ${max_rate}pps | ${framesize} | ${traffic_profile}
-
-*** Test Cases ***
-| tc01-64B-1c-eth-l2bdscale1mmaclrn-mrr
-| | [Tags] | 64B | 1C
-| | framesize=${64} | phy_cores=${1}
-
-| tc02-64B-2c-eth-l2bdscale1mmaclrn-mrr
-| | [Tags] | 64B | 2C
-| | framesize=${64} | phy_cores=${2}
-
-| tc03-64B-4c-eth-l2bdscale1mmaclrn-mrr
-| | [Tags] | 64B | 4C
-| | framesize=${64} | phy_cores=${4}
-
-| tc04-1518B-1c-eth-l2bdscale1mmaclrn-mrr
-| | [Tags] | 1518B | 1C
-| | framesize=${1518} | phy_cores=${1}
-
-| tc05-1518B-2c-eth-l2bdscale1mmaclrn-mrr
-| | [Tags] | 1518B | 2C
-| | framesize=${1518} | phy_cores=${2}
-
-| tc06-1518B-4c-eth-l2bdscale1mmaclrn-mrr
-| | [Tags] | 1518B | 4C
-| | framesize=${1518} | phy_cores=${4}
-
-| tc07-9000B-1c-eth-l2bdscale1mmaclrn-mrr
-| | [Tags] | 9000B | 1C
-| | framesize=${9000} | phy_cores=${1}
-
-| tc08-9000B-2c-eth-l2bdscale1mmaclrn-mrr
-| | [Tags] | 9000B | 2C
-| | framesize=${9000} | phy_cores=${2}
-
-| tc09-9000B-4c-eth-l2bdscale1mmaclrn-mrr
-| | [Tags] | 9000B | 4C
-| | framesize=${9000} | phy_cores=${4}
-
-| tc10-IMIX-1c-eth-l2bdscale1mmaclrn-mrr
-| | [Tags] | IMIX | 1C
-| | framesize=IMIX_v4_1 | phy_cores=${1}
-
-| tc11-IMIX-2c-eth-l2bdscale1mmaclrn-mrr
-| | [Tags] | IMIX | 2C
-| | framesize=IMIX_v4_1 | phy_cores=${2}
-
-| tc12-IMIX-4c-eth-l2bdscale1mmaclrn-mrr
-| | [Tags] | IMIX | 4C
-| | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/l2/10ge2p1x82599es-eth-l2bdscale1mmaclrn-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x82599es-eth-l2bdscale1mmaclrn-ndrpdr.robot
deleted file mode 100644
index 3f5f766c9b..0000000000
--- a/tests/vpp/perf/l2/10ge2p1x82599es-eth-l2bdscale1mmaclrn-ndrpdr.robot
+++ /dev/null
@@ -1,136 +0,0 @@
-# Copyright (c) 2019 PANTHEON.tech 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 | NDRPDR
-| ... | NIC_Intel-82599ES | ETH | L2BDMACLRN | SCALE | L2BDSCALE | FIB_1M
-| ...
-| Suite Setup | Set up 3-node performance topology with DUT's NIC model
-| ... | L2 | Intel-82599ES
-| ...
-| Suite Teardown | Tear down 3-node performance topology
-| ...
-| Test Setup | Set up performance test
-| ...
-| Test Teardown | Tear down performance discovery test | ${min_rate}pps
-| ... | ${framesize} | ${traffic_profile}
-| ...
-| Test Template | Local Template
-| ...
-| Documentation | *RFC2544: Pkt throughput for L2BD 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\
-| ... | 82599ES by Intel.
-| ... | *[Ver] TG verification:* TG finds and reports throughput NDR (Non Drop\
-| ... | Rate) with zero packet loss tolerance or throughput PDR (Partial Drop\
-| ... | Rate) with non-zero packet loss tolerance (LT) expressed in percentage\
-| ... | of packets transmitted. NDR and PDR are discovered for different\
-| ... | Ethernet L2 frame sizes using MLRsearch library.\
-| ... | Test packets are generated by TG on links to DUTs. TG traffic profile\
-| ... | contains two L3 flow-groups (flow-group per direction, 500k flows per\
-| ... | flow-group) with all packets containing Ethernet header, IPv4 header\
-| ... | with IP protocol=61 and static payload.\
-| ... | MAC addresses ranges are incremented as follows:
-| ... | port01_src ca:fe:00:00:00:00 - port01_src ca:fe:00:07:a1:1f,
-| ... | port01_dst fa:ce:00:00:00:00 - port01_dst fa:ce:00:07:a1:1f,
-| ... | port02_src fa:ce:00:00:00:00 - port02_src fa:ce:00:07:a1:1f,
-| ... | port02_dst ca:fe:00:00:00:00 - port02_dst ca:fe:00:07:a1:1f
-| ... | *[Ref] Applicable standard specifications:* RFC2544.
-
-*** Variables ***
-# 82599ES bandwidth limit
-| ${s_limit}= | ${10000000000}
-# Traffic profile:
-| ${traffic_profile}= | trex-sl-3n-ethip4-macsrc500kdst500k
-
-*** Keywords ***
-| Local Template
-| | [Documentation]
-| | ... | [Cfg] Each DUT runs L2BD switching config and uses ${phy_cores}\
-| | ... | physical core(s) for worker threads.
-| | ... | [Ver] Measure NDR and PDR values using MLRsearch algorithm.\
-| | ...
-| | ... | *Arguments:*
-| | ... | - framesize - Framesize in Bytes in integer or string (IMIX_v4_1).
-| | ... | Type: integer, string
-| | ... | - phy_cores - Number of physical cores. Type: integer
-| | ... | - rxq - Number of RX queues, default value: ${None}. Type: integer
-| | ...
-| | [Arguments] | ${framesize} | ${phy_cores} | ${rxq}=${None}
-| | ...
-| | Set Test Variable | ${framesize}
-| | Set Test Variable | ${min_rate} | ${10000}
-| | ...
-| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
-| | And Add PCI devices to all DUTs
-| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
-| | ... | ${s_limit} | ${framesize}
-| | And Apply startup configuration on all VPP DUTs
-| | When Initialize L2 bridge domain in circular topology
-| | Then Find NDR and PDR intervals using optimized search
-| | ... | ${framesize} | ${traffic_profile} | ${min_rate} | ${max_rate}
-
-*** Test Cases ***
-| tc01-64B-1c-eth-l2bdscale1mmaclrn-ndrpdr
-| | [Tags] | 64B | 1C
-| | framesize=${64} | phy_cores=${1}
-
-| tc02-64B-2c-eth-l2bdscale1mmaclrn-ndrpdr
-| | [Tags] | 64B | 2C
-| | framesize=${64} | phy_cores=${2}
-
-| tc03-64B-4c-eth-l2bdscale1mmaclrn-ndrpdr
-| | [Tags] | 64B | 4C
-| | framesize=${64} | phy_cores=${4}
-
-| tc04-1518B-1c-eth-l2bdscale1mmaclrn-ndrpdr
-| | [Tags] | 1518B | 1C
-| | framesize=${1518} | phy_cores=${1}
-
-| tc05-1518B-2c-eth-l2bdscale1mmaclrn-ndrpdr
-| | [Tags] | 1518B | 2C
-| | framesize=${1518} | phy_cores=${2}
-
-| tc06-1518B-4c-eth-l2bdscale1mmaclrn-ndrpdr
-| | [Tags] | 1518B | 4C
-| | framesize=${1518} | phy_cores=${4}
-
-| tc07-9000B-1c-eth-l2bdscale1mmaclrn-ndrpdr
-| | [Tags] | 9000B | 1C
-| | framesize=${9000} | phy_cores=${1}
-
-| tc08-9000B-2c-eth-l2bdscale1mmaclrn-ndrpdr
-| | [Tags] | 9000B | 2C
-| | framesize=${9000} | phy_cores=${2}
-
-| tc09-9000B-4c-eth-l2bdscale1mmaclrn-ndrpdr
-| | [Tags] | 9000B | 4C
-| | framesize=${9000} | phy_cores=${4}
-
-| tc10-IMIX-1c-eth-l2bdscale1mmaclrn-ndrpdr
-| | [Tags] | IMIX | 1C
-| | framesize=IMIX_v4_1 | phy_cores=${1}
-
-| tc11-IMIX-2c-eth-l2bdscale1mmaclrn-ndrpdr
-| | [Tags] | IMIX | 2C
-| | framesize=IMIX_v4_1 | phy_cores=${2}
-
-| tc12-IMIX-4c-eth-l2bdscale1mmaclrn-ndrpdr
-| | [Tags] | IMIX | 4C
-| | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/l2/10ge2p1x82599es-eth-l2patch-mrr.robot b/tests/vpp/perf/l2/10ge2p1x82599es-eth-l2patch-mrr.robot
deleted file mode 100644
index cd12374224..0000000000
--- a/tests/vpp/perf/l2/10ge2p1x82599es-eth-l2patch-mrr.robot
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright (c) 2019 PANTHEON.tech 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 | MRR
-| ... | NIC_Intel-82599ES | ETH | L2PATCH | BASE
-| ...
-| Suite Setup | Set up 3-node performance topology with DUT's NIC model
-| ... | L2 | Intel-82599ES
-| ...
-| Suite Teardown | Tear down 3-node performance topology
-| ...
-| Test Setup | Set up performance test
-| ...
-| Test Teardown | Tear down performance mrr test
-| ...
-| Test Template | Local Template
-| ...
-| Documentation | *Raw results L2patch 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 patch.
-| ... | *[Cfg] DUT configuration:* DUT1 and DUT2 are configured with L2 patch\
-| ... | DUT1 and DUT2 tested with 2p10GE NIC 82599ES by Intel.
-| ... | *[Ver] TG verification:* In MaxReceivedRate tests TG sends traffic\
-| ... | at line rate and reports total received/sent packets over trial period.
-| ... | 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.
-
-*** Variables ***
-# 82599ES bandwidth limit
-| ${s_limit}= | ${10000000000}
-# Traffic profile:
-| ${traffic_profile}= | trex-sl-3n-ethip4-ip4src254
-
-*** Keywords ***
-| Local Template
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2 patch config with ${phy_cores} phy
-| | ... | core(s).
-| | ... | [Ver] Measure MaxReceivedRate for ${framesize}B frames using single\
-| | ... | trial throughput test.
-| | ...
-| | ... | *Arguments:*
-| | ... | - framesize - Framesize in Bytes in integer or string (IMIX_v4_1).
-| | ... | Type: integer, string
-| | ... | - phy_cores - Number of physical cores. Type: integer
-| | ... | - rxq - Number of RX queues, default value: ${None}. Type: integer
-| | ...
-| | [Arguments] | ${framesize} | ${phy_cores} | ${rxq}=${None}
-| | ...
-| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
-| | And Add PCI devices to all DUTs
-| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
-| | ... | ${s_limit} | ${framesize}
-| | And Add DPDK dev default RXD to all DUTs | 2048
-| | And Add DPDK dev default TXD to all DUTs | 2048
-| | And Apply startup configuration on all VPP DUTs
-| | When Initialize L2 patch
-| | Then Traffic should pass with maximum rate
-| | ... | ${max_rate}pps | ${framesize} | ${traffic_profile}
-
-*** Test Cases ***
-| tc01-64B-1c-eth-l2patch-mrr
-| | [Tags] | 64B | 1C
-| | framesize=${64} | phy_cores=${1}
-
-| tc02-64B-2c-eth-l2patch-mrr
-| | [Tags] | 64B | 2C
-| | framesize=${64} | phy_cores=${2}
-
-| tc03-64B-4c-eth-l2patch-mrr
-| | [Tags] | 64B | 4C
-| | framesize=${64} | phy_cores=${4}
-
-| tc04-1518B-1c-eth-l2patch-mrr
-| | [Tags] | 1518B | 1C
-| | framesize=${1518} | phy_cores=${1}
-
-| tc05-1518B-2c-eth-l2patch-mrr
-| | [Tags] | 1518B | 2C
-| | framesize=${1518} | phy_cores=${2}
-
-| tc06-1518B-4c-eth-l2patch-mrr
-| | [Tags] | 1518B | 4C
-| | framesize=${1518} | phy_cores=${4}
-
-| tc07-9000B-1c-eth-l2patch-mrr
-| | [Tags] | 9000B | 1C
-| | framesize=${9000} | phy_cores=${1}
-
-| tc08-9000B-2c-eth-l2patch-mrr
-| | [Tags] | 9000B | 2C
-| | framesize=${9000} | phy_cores=${2}
-
-| tc09-9000B-4c-eth-l2patch-mrr
-| | [Tags] | 9000B | 4C
-| | framesize=${9000} | phy_cores=${4}
-
-| tc10-IMIX-1c-eth-l2patch-mrr
-| | [Tags] | IMIX | 1C
-| | framesize=IMIX_v4_1 | phy_cores=${1}
-
-| tc11-IMIX-2c-eth-l2patch-mrr
-| | [Tags] | IMIX | 2C
-| | framesize=IMIX_v4_1 | phy_cores=${2}
-
-| tc12-IMIX-4c-eth-l2patch-mrr
-| | [Tags] | IMIX | 4C
-| | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/l2/10ge2p1x82599es-eth-l2patch-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x82599es-eth-l2patch-ndrpdr.robot
deleted file mode 100644
index b538be0efb..0000000000
--- a/tests/vpp/perf/l2/10ge2p1x82599es-eth-l2patch-ndrpdr.robot
+++ /dev/null
@@ -1,133 +0,0 @@
-# Copyright (c) 2019 PANTHEON.tech 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 | NDRPDR
-| ... | NIC_Intel-82599ES | ETH | L2PATCH | BASE
-| ...
-| Suite Setup | Set up 3-node performance topology with DUT's NIC model
-| ... | L2 | Intel-82599ES
-| ...
-| Suite Teardown | Tear down 3-node performance topology
-| ...
-| Test Setup | Set up performance test
-| ...
-| Test Teardown | Tear down performance discovery test | ${min_rate}pps
-| ... | ${framesize} | ${traffic_profile}
-| ...
-| Test Template | Local Template
-| ...
-| Documentation | *RFC2544: Pkt throughput L2patch 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 patch.
-| ... | *[Cfg] DUT configuration:* DUT1 and DUT2 are configured with L2 patch\
-| ... | DUT1 and DUT2 tested with 2p10GE NIC 82599ES by Intel.
-| ... | *[Ver] TG verification:* TG finds and reports throughput NDR (Non Drop\
-| ... | Rate) with zero packet loss tolerance or throughput PDR (Partial Drop\
-| ... | Rate) with non-zero packet loss tolerance (LT) expressed in percentage\
-| ... | of packets transmitted. NDR and PDR are discovered for different\
-| ... | Ethernet L2 frame sizes using MLRsearch library\
-| ... | 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 static payload.\
-| ... | MAC addresses are matching MAC addresses of the TG node interfaces.
-| ... | *[Ref] Applicable standard specifications:* RFC2544.
-
-*** Variables ***
-# 82599ES bandwidth limit
-| ${s_limit}= | ${10000000000}
-# Traffic profile:
-| ${traffic_profile}= | trex-sl-3n-ethip4-ip4src254
-
-*** Keywords ***
-| Local Template
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2 patch config with ${phy_cores} phy
-| | ... | core(s).
-| | ... | [Ver] Measure NDR and PDR values using MLRsearch algorithm.
-| | ...
-| | ... | *Arguments:*
-| | ... | - framesize - Framesize in Bytes in integer or string (IMIX_v4_1).
-| | ... | Type: integer, string
-| | ... | - phy_cores - Number of physical cores. Type: integer
-| | ... | - rxq - Number of RX queues, default value: ${None}. Type: integer
-| | ...
-| | [Arguments] | ${framesize} | ${phy_cores} | ${rxq}=${None}
-| | ...
-| | Set Test Variable | ${framesize}
-| | Set Test Variable | ${min_rate} | ${10000}
-| | ...
-| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
-| | And Add PCI devices to all DUTs
-| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
-| | ... | ${s_limit} | ${framesize}
-| | And Add DPDK dev default RXD to all DUTs | 2048
-| | And Add DPDK dev default TXD to all DUTs | 2048
-| | And Apply startup configuration on all VPP DUTs
-| | When Initialize L2 patch
-| | Then Find NDR and PDR intervals using optimized search
-| | ... | ${framesize} | ${traffic_profile} | ${min_rate} | ${max_rate}
-
-*** Test Cases ***
-| tc01-64B-1c-eth-l2patch-ndrpdr
-| | [Tags] | 64B | 1C
-| | framesize=${64} | phy_cores=${1}
-
-| tc02-64B-2c-eth-l2patch-ndrpdr
-| | [Tags] | 64B | 2C
-| | framesize=${64} | phy_cores=${2}
-
-| tc03-64B-4c-eth-l2patch-ndrpdr
-| | [Tags] | 64B | 4C
-| | framesize=${64} | phy_cores=${4}
-
-| tc04-1518B-1c-eth-l2patch-ndrpdr
-| | [Tags] | 1518B | 1C
-| | framesize=${1518} | phy_cores=${1}
-
-| tc05-1518B-2c-eth-l2patch-ndrpdr
-| | [Tags] | 1518B | 2C
-| | framesize=${1518} | phy_cores=${2}
-
-| tc06-1518B-4c-eth-l2patch-ndrpdr
-| | [Tags] | 1518B | 4C
-| | framesize=${1518} | phy_cores=${4}
-
-| tc07-9000B-1c-eth-l2patch-ndrpdr
-| | [Tags] | 9000B | 1C
-| | framesize=${9000} | phy_cores=${1}
-
-| tc08-9000B-2c-eth-l2patch-ndrpdr
-| | [Tags] | 9000B | 2C
-| | framesize=${9000} | phy_cores=${2}
-
-| tc09-9000B-4c-eth-l2patch-ndrpdr
-| | [Tags] | 9000B | 4C
-| | framesize=${9000} | phy_cores=${4}
-
-| tc10-IMIX-1c-eth-l2patch-ndrpdr
-| | [Tags] | IMIX | 1C
-| | framesize=IMIX_v4_1 | phy_cores=${1}
-
-| tc11-IMIX-2c-eth-l2patch-ndrpdr
-| | [Tags] | IMIX | 2C
-| | framesize=IMIX_v4_1 | phy_cores=${2}
-
-| tc12-IMIX-4c-eth-l2patch-ndrpdr
-| | [Tags] | IMIX | 4C
-| | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/l2/10ge2p1x82599es-eth-l2xcbase-mrr.robot b/tests/vpp/perf/l2/10ge2p1x82599es-eth-l2xcbase-mrr.robot
deleted file mode 100644
index 2a7aeb7441..0000000000
--- a/tests/vpp/perf/l2/10ge2p1x82599es-eth-l2xcbase-mrr.robot
+++ /dev/null
@@ -1,125 +0,0 @@
-# Copyright (c) 2019 PANTHEON.tech 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 | MRR
-| ... | NIC_Intel-82599ES | ETH | L2XCFWD | BASE | L2XCBASE
-| ...
-| Suite Setup | Set up 3-node performance topology with DUT's NIC model
-| ... | L2 | Intel-82599ES
-| ...
-| Suite Teardown | Tear down 3-node performance topology
-| ...
-| Test Setup | Set up performance test
-| ...
-| Test Teardown | Tear down performance mrr test
-| ...
-| Test Template | Local Template
-| ...
-| Documentation | *Raw results L2XC 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 82599ES by Intel.
-| ... | *[Ver] TG verification:* In MaxReceivedRate tests TG sends traffic
-| ... | at line rate and reports total received/sent packets over trial period.
-| ... | 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 ***
-# 82599ES bandwidth limit
-| ${s_limit}= | ${10000000000}
-# Traffic profile:
-| ${traffic_profile}= | trex-sl-3n-ethip4-ip4src254
-
-*** Keywords ***
-| Local Template
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2XC config with ${phy_cores} phy
-| | ... | core(s).
-| | ... | [Ver] Measure MaxReceivedRate for ${framesize}B frames using single\
-| | ... | trial throughput test.
-| | ...
-| | ... | *Arguments:*
-| | ... | - framesize - Framesize in Bytes in integer or string (IMIX_v4_1).
-| | ... | Type: integer, string
-| | ... | - phy_cores - Number of physical cores. Type: integer
-| | ... | - rxq - Number of RX queues, default value: ${None}. Type: integer
-| | ...
-| | [Arguments] | ${framesize} | ${phy_cores} | ${rxq}=${None}
-| | ...
-| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
-| | And Add PCI devices to all DUTs
-| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
-| | ... | ${s_limit} | ${framesize}
-| | And Apply startup configuration on all VPP DUTs
-| | And Initialize L2 xconnect in 3-node circular topology
-| | Then Traffic should pass with maximum rate
-| | ... | ${max_rate}pps | ${framesize} | ${traffic_profile}
-
-*** Test Cases ***
-| tc01-64B-1c-eth-l2xcbase-mrr
-| | [Tags] | 64B | 1C
-| | framesize=${64} | phy_cores=${1}
-
-| tc02-64B-2c-eth-l2xcbase-mrr
-| | [Tags] | 64B | 2C
-| | framesize=${64} | phy_cores=${2}
-
-| tc03-64B-4c-eth-l2xcbase-mrr
-| | [Tags] | 64B | 4C
-| | framesize=${64} | phy_cores=${4}
-
-| tc04-1518B-1c-eth-l2xcbase-mrr
-| | [Tags] | 1518B | 1C
-| | framesize=${1518} | phy_cores=${1}
-
-| tc05-1518B-2c-eth-l2xcbase-mrr
-| | [Tags] | 1518B | 2C
-| | framesize=${1518} | phy_cores=${2}
-
-| tc06-1518B-4c-eth-l2xcbase-mrr
-| | [Tags] | 1518B | 4C
-| | framesize=${1518} | phy_cores=${4}
-
-| tc07-9000B-1c-eth-l2xcbase-mrr
-| | [Tags] | 9000B | 1C
-| | framesize=${9000} | phy_cores=${1}
-
-| tc08-9000B-2c-eth-l2xcbase-mrr
-| | [Tags] | 9000B | 2C
-| | framesize=${9000} | phy_cores=${2}
-
-| tc09-9000B-4c-eth-l2xcbase-mrr
-| | [Tags] | 9000B | 4C
-| | framesize=${9000} | phy_cores=${4}
-
-| tc10-IMIX-1c-eth-l2xcbase-mrr
-| | [Tags] | IMIX | 1C
-| | framesize=IMIX_v4_1 | phy_cores=${1}
-
-| tc11-IMIX-2c-eth-l2xcbase-mrr
-| | [Tags] | IMIX | 2C
-| | framesize=IMIX_v4_1 | phy_cores=${2}
-
-| tc12-IMIX-4c-eth-l2xcbase-mrr
-| | [Tags] | IMIX | 4C
-| | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/l2/10ge2p1x82599es-eth-l2xcbase-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x82599es-eth-l2xcbase-ndrpdr.robot
deleted file mode 100644
index 22ee5531cb..0000000000
--- a/tests/vpp/perf/l2/10ge2p1x82599es-eth-l2xcbase-ndrpdr.robot
+++ /dev/null
@@ -1,131 +0,0 @@
-# Copyright (c) 2019 PANTHEON.tech 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 | NDRPDR
-| ... | NIC_Intel-82599ES | ETH | L2XCFWD | BASE | L2XCBASE
-| ...
-| Suite Setup | Set up 3-node performance topology with DUT's NIC model
-| ... | L2 | Intel-82599ES
-| ...
-| Suite Teardown | Tear down 3-node performance topology
-| ...
-| Test Setup | Set up performance test
-| ...
-| Test Teardown | Tear down performance discovery test | ${min_rate}pps
-| ... | ${framesize} | ${traffic_profile}
-| ...
-| Test Template | Local Template
-| ...
-| Documentation | *RFC2544: Pkt throughput L2XC 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 82599ES by Intel.
-| ... | *[Ver] TG verification:* TG finds and reports throughput NDR (Non Drop
-| ... | Rate) with zero packet loss tolerance or throughput PDR (Partial Drop
-| ... | Rate) with non-zero packet loss tolerance (LT) expressed in percentage
-| ... | of packets transmitted. NDR and PDR are discovered for different
-| ... | Ethernet L2 frame sizes using MLRsearch library.
-| ... | 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 ***
-# 82599ES bandwidth limit
-| ${s_limit}= | ${10000000000}
-# Traffic profile:
-| ${traffic_profile}= | trex-sl-3n-ethip4-ip4src254
-
-*** Keywords ***
-| Local Template
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2XC config with ${phy_cores} phy
-| | ... | core(s).
-| | ... | [Ver] Measure NDR and PDR values using MLRsearch algorithm.\
-| | ...
-| | ... | *Arguments:*
-| | ... | - framesize - Framesize in Bytes in integer or string (IMIX_v4_1).
-| | ... | Type: integer, string
-| | ... | - phy_cores - Number of physical cores. Type: integer
-| | ... | - rxq - Number of RX queues, default value: ${None}. Type: integer
-| | ...
-| | [Arguments] | ${framesize} | ${phy_cores} | ${rxq}=${None}
-| | ...
-| | Set Test Variable | ${framesize}
-| | Set Test Variable | ${min_rate} | ${10000}
-| | ...
-| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
-| | And Add PCI devices to all DUTs
-| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
-| | ... | ${s_limit} | ${framesize}
-| | And Apply startup configuration on all VPP DUTs
-| | And Initialize L2 xconnect in 3-node circular topology
-| | Then Find NDR and PDR intervals using optimized search
-| | ... | ${framesize} | ${traffic_profile} | ${min_rate} | ${max_rate}
-
-*** Test Cases ***
-| tc01-64B-1c-eth-l2xcbase-ndrpdr
-| | [Tags] | 64B | 1C
-| | framesize=${64} | phy_cores=${1}
-
-| tc02-64B-2c-eth-l2xcbase-ndrpdr
-| | [Tags] | 64B | 2C
-| | framesize=${64} | phy_cores=${2}
-
-| tc03-64B-4c-eth-l2xcbase-ndrpdr
-| | [Tags] | 64B | 4C
-| | framesize=${64} | phy_cores=${4}
-
-| tc04-1518B-1c-eth-l2xcbase-ndrpdr
-| | [Tags] | 1518B | 1C
-| | framesize=${1518} | phy_cores=${1}
-
-| tc05-1518B-2c-eth-l2xcbase-ndrpdr
-| | [Tags] | 1518B | 2C
-| | framesize=${1518} | phy_cores=${2}
-
-| tc06-1518B-4c-eth-l2xcbase-ndrpdr
-| | [Tags] | 1518B | 4C
-| | framesize=${1518} | phy_cores=${4}
-
-| tc07-9000B-1c-eth-l2xcbase-ndrpdr
-| | [Tags] | 9000B | 1C
-| | framesize=${9000} | phy_cores=${1}
-
-| tc08-9000B-2c-eth-l2xcbase-ndrpdr
-| | [Tags] | 9000B | 2C
-| | framesize=${9000} | phy_cores=${2}
-
-| tc09-9000B-4c-eth-l2xcbase-ndrpdr
-| | [Tags] | 9000B | 4C
-| | framesize=${9000} | phy_cores=${4}
-
-| tc10-IMIX-1c-eth-l2xcbase-ndrpdr
-| | [Tags] | IMIX | 1C
-| | framesize=IMIX_v4_1 | phy_cores=${1}
-
-| tc11-IMIX-2c-eth-l2xcbase-ndrpdr
-| | [Tags] | IMIX | 2C
-| | framesize=IMIX_v4_1 | phy_cores=${2}
-
-| tc12-IMIX-4c-eth-l2xcbase-ndrpdr
-| | [Tags] | IMIX | 4C
-| | framesize=IMIX_v4_1 | phy_cores=${4}