10 files changed, 17 insertions, 1068 deletions

diff --git a/tests/vpp/perf/l2/10ge2p1x710-avf-dot1q-l2bdbasemaclrn-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x710-avf-dot1q-l2bdbasemaclrn-ndrpdr.robot
deleted file mode 100644
index ca22b3c772..0000000000
--- a/tests/vpp/perf/l2/10ge2p1x710-avf-dot1q-l2bdbasemaclrn-ndrpdr.robot
+++ /dev/null
@@ -1,138 +0,0 @@
-# Copyright (c) 2019 Cisco and/or its affiliates.
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at:
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-*** Settings ***
-| Resource | resources/libraries/robot/shared/default.robot
-|
-| Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR
-| ... | NIC_Intel-X710 | BASE | DOT1Q | L2BDMACLRN | DRV_AVF
-|
-| Suite Setup | Setup suite single link | performance_avf
-| Suite Teardown | Tear down suite | performance
-| Test Setup | Setup test
-| Test Teardown | Tear down test | performance
-|
-| 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 ${nic_name} with VF enabled.
-| ... | *[Ver] TG verification:* TG finds and reports throughput NDR (Non Drop\
-| ... | Rate) with zero packet loss tolerance and 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 ***
-| @{plugins_to_enable}= | avf_plugin.so
-| ${crypto_type}= | ${None}
-| ${nic_name}= | Intel-X710
-| ${nic_driver}= | avf
-| ${osi_layer}= | L2
-| ${overhead}= | ${4}
-| ${subid}= | 10
-| ${tag_rewrite}= | pop-1
-# 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:*
-| | ... | - frame_size - 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] | ${frame_size} | ${phy_cores} | ${rxq}=${None}
-| |
-| | Set Test Variable | \${frame_size}
-| |
-| | Given Set Max Rate And Jumbo
-| | And Add worker threads to all DUTs | ${phy_cores} | ${rxq}
-| | And Pre-initialize layer driver | ${nic_driver}
-| | And Apply Startup configuration on all VPP DUTs
-| | When Initialize layer driver | ${nic_driver}
-| | And Initialize layer interface
-| | And 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
-
-*** Test Cases ***
-| tc01-64B-1c-avf-dot1q-l2bdbasemaclrn-ndrpdr
-| | [Tags] | 64B | 1C
-| | frame_size=${64} | phy_cores=${1}
-
-| tc02-64B-2c-avf-dot1q-l2bdbasemaclrn-ndrpdr
-| | [Tags] | 64B | 2C
-| | frame_size=${64} | phy_cores=${2}
-
-| tc03-64B-4c-avf-dot1q-l2bdbasemaclrn-ndrpdr
-| | [Tags] | 64B | 4C
-| | frame_size=${64} | phy_cores=${4}
-
-| tc04-1518B-1c-avf-dot1q-l2bdbasemaclrn-ndrpdr
-| | [Tags] | 1518B | 1C
-| | frame_size=${1518} | phy_cores=${1}
-
-| tc05-1518B-2c-avf-dot1q-l2bdbasemaclrn-ndrpdr
-| | [Tags] | 1518B | 2C
-| | frame_size=${1518} | phy_cores=${2}
-
-| tc06-1518B-4c-avf-dot1q-l2bdbasemaclrn-ndrpdr
-| | [Tags] | 1518B | 4C
-| | frame_size=${1518} | phy_cores=${4}
-
-| tc07-9000B-1c-avf-dot1q-l2bdbasemaclrn-ndrpdr
-| | [Tags] | 9000B | 1C
-| | frame_size=${9000} | phy_cores=${1}
-
-| tc08-9000B-2c-avf-dot1q-l2bdbasemaclrn-ndrpdr
-| | [Tags] | 9000B | 2C
-| | frame_size=${9000} | phy_cores=${2}
-
-| tc09-9000B-4c-avf-dot1q-l2bdbasemaclrn-ndrpdr
-| | [Tags] | 9000B | 4C
-| | frame_size=${9000} | phy_cores=${4}
-
-| tc10-IMIX-1c-avf-dot1q-l2bdbasemaclrn-ndrpdr
-| | [Tags] | IMIX | 1C
-| | frame_size=IMIX_v4_1 | phy_cores=${1}
-
-| tc11-IMIX-2c-avf-dot1q-l2bdbasemaclrn-ndrpdr
-| | [Tags] | IMIX | 2C
-| | frame_size=IMIX_v4_1 | phy_cores=${2}
-
-| tc12-IMIX-4c-avf-dot1q-l2bdbasemaclrn-ndrpdr
-| | [Tags] | IMIX | 4C
-| | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/l2/10ge2p1x710-avf-eth-l2bdbasemaclrn-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x710-avf-eth-l2bdbasemaclrn-ndrpdr.robot
deleted file mode 100644
index ebd237d78a..0000000000
--- a/tests/vpp/perf/l2/10ge2p1x710-avf-eth-l2bdbasemaclrn-ndrpdr.robot
+++ /dev/null
@@ -1,130 +0,0 @@
-# Copyright (c) 2019 Cisco and/or its affiliates.
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at:
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-*** Settings ***
-| Resource | resources/libraries/robot/shared/default.robot
-|
-| Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR
-| ... | NIC_Intel-X710 | ETH | L2BDMACLRN | BASE | DRV_AVF
-|
-| Suite Setup | Setup suite single link | performance_avf
-| Suite Teardown | Tear down suite | performance
-| Test Setup | Setup test
-| Test Teardown | Tear down test | performance
-|
-| 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 bridge-domain.
-| ... | *[Cfg] DUT configuration:* DUT1 and DUT2 are configured with L2 bridge-\
-| ... | domain and MAC learning enabled. DUT1 and DUT2 tested with ${nic_name}\
-| ... | with VF enabled.
-| ... | *[Ver] TG verification:* TG finds and reports throughput NDR (Non Drop\
-| ... | Rate) with zero packet loss tolerance and 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 ***
-| @{plugins_to_enable}= | avf_plugin.so
-| ${crypto_type}= | ${None}
-| ${nic_name}= | Intel-X710
-| ${nic_driver}= | avf
-| ${osi_layer}= | L2
-| ${overhead}= | ${0}
-# Traffic profile:
-| ${traffic_profile}= | trex-sl-3n-ethip4-ip4src254
-
-*** Keywords ***
-| Local template
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD config with ${phy_cores} phy core(s).
-| | ... | [Ver] Measure NDR and PDR values using MLRsearch algorithm.\
-| |
-| | ... | *Arguments:*
-| | ... | - frame_size - 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] | ${frame_size} | ${phy_cores} | ${rxq}=${None}
-| |
-| | Set Test Variable | \${frame_size}
-| |
-| | Given Set Max Rate And Jumbo
-| | And Add worker threads to all DUTs | ${phy_cores} | ${rxq}
-| | And Pre-initialize layer driver | ${nic_driver}
-| | And Apply Startup configuration on all VPP DUTs
-| | When Initialize layer driver | ${nic_driver}
-| | And Initialize layer interface
-| | And Initialize L2 bridge domain
-| | Then Find NDR and PDR intervals using optimized search
-
-*** Test Cases ***
-| tc01-64B-1c-avf-eth-l2bdbasemaclrn-ndrpdr
-| | [Tags] | 64B | 1C
-| | frame_size=${64} | phy_cores=${1}
-
-| tc02-64B-2c-avf-eth-l2bdbasemaclrn-ndrpdr
-| | [Tags] | 64B | 2C
-| | frame_size=${64} | phy_cores=${2}
-
-| tc03-64B-4c-avf-eth-l2bdbasemaclrn-ndrpdr
-| | [Tags] | 64B | 4C
-| | frame_size=${64} | phy_cores=${4}
-
-| tc04-1518B-1c-avf-eth-l2bdbasemaclrn-ndrpdr
-| | [Tags] | 1518B | 1C
-| | frame_size=${1518} | phy_cores=${1}
-
-| tc05-1518B-2c-avf-eth-l2bdbasemaclrn-ndrpdr
-| | [Tags] | 1518B | 2C
-| | frame_size=${1518} | phy_cores=${2}
-
-| tc06-1518B-4c-avf-eth-l2bdbasemaclrn-ndrpdr
-| | [Tags] | 1518B | 4C
-| | frame_size=${1518} | phy_cores=${4}
-
-| tc07-9000B-1c-avf-eth-l2bdbasemaclrn-ndrpdr
-| | [Tags] | 9000B | 1C
-| | frame_size=${9000} | phy_cores=${1}
-
-| tc08-9000B-2c-avf-eth-l2bdbasemaclrn-ndrpdr
-| | [Tags] | 9000B | 2C
-| | frame_size=${9000} | phy_cores=${2}
-
-| tc09-9000B-4c-avf-eth-l2bdbasemaclrn-ndrpdr
-| | [Tags] | 9000B | 4C
-| | frame_size=${9000} | phy_cores=${4}
-
-| tc10-IMIX-1c-avf-eth-l2bdbasemaclrn-ndrpdr
-| | [Tags] | IMIX | 1C
-| | frame_size=IMIX_v4_1 | phy_cores=${1}
-
-| tc11-IMIX-2c-avf-eth-l2bdbasemaclrn-ndrpdr
-| | [Tags] | IMIX | 2C
-| | frame_size=IMIX_v4_1 | phy_cores=${2}
-
-| tc12-IMIX-4c-avf-eth-l2bdbasemaclrn-ndrpdr
-| | [Tags] | IMIX | 4C
-| | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/l2/10ge2p1x710-avf-eth-l2patch-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x710-avf-eth-l2patch-ndrpdr.robot
deleted file mode 100644
index a6823dd447..0000000000
--- a/tests/vpp/perf/l2/10ge2p1x710-avf-eth-l2patch-ndrpdr.robot
+++ /dev/null
@@ -1,130 +0,0 @@
-# Copyright (c) 2019 Cisco and/or its affiliates.
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at:
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-*** Settings ***
-| Resource | resources/libraries/robot/shared/default.robot
-|
-| Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR
-| ... | NIC_Intel-X710 | ETH | L2PATCH | BASE | DRV_AVF
-|
-| Suite Setup | Setup suite single link | performance_avf
-| Suite Teardown | Tear down suite | performance
-| Test Setup | Setup test
-| Test Teardown | Tear down test | performance
-|
-| 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 ${nic_name} with VF enabled.\
-| ... | *[Ver] TG verification:* TG finds and reports throughput NDR (Non Drop\
-| ... | Rate) with zero packet loss tolerance and 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 ***
-| @{plugins_to_enable}= | avf_plugin.so
-| ${crypto_type}= | ${None}
-| ${nic_name}= | Intel-X710
-| ${nic_driver}= | avf
-| ${osi_layer}= | L2
-| ${overhead}= | ${0}
-# 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:*
-| | ... | - frame_size - 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] | ${frame_size} | ${phy_cores} | ${rxq}=${None}
-| |
-| | Set Test Variable | \${frame_size}
-| |
-| | Given Set Max Rate And Jumbo
-| | And Add worker threads to all DUTs | ${phy_cores} | ${rxq}
-| | And Pre-initialize layer driver | ${nic_driver}
-| | And Apply Startup configuration on all VPP DUTs
-| | When Initialize layer driver | ${nic_driver}
-| | And Initialize layer interface
-| | And Initialize L2 patch
-| | Then Find NDR and PDR intervals using optimized search
-
-*** Test Cases ***
-| tc01-64B-1c-avf-eth-l2patch-ndrpdr
-| | [Tags] | 64B | 1C
-| | frame_size=${64} | phy_cores=${1}
-
-| tc02-64B-2c-avf-eth-l2patch-ndrpdr
-| | [Tags] | 64B | 2C
-| | frame_size=${64} | phy_cores=${2}
-
-| tc03-64B-4c-avf-eth-l2patch-ndrpdr
-| | [Tags] | 64B | 4C
-| | frame_size=${64} | phy_cores=${4}
-
-| tc04-1518B-1c-avf-eth-l2patch-ndrpdr
-| | [Tags] | 1518B | 1C
-| | frame_size=${1518} | phy_cores=${1}
-
-| tc05-1518B-2c-avf-eth-l2patch-ndrpdr
-| | [Tags] | 1518B | 2C
-| | frame_size=${1518} | phy_cores=${2}
-
-| tc06-1518B-4c-avf-eth-l2patch-ndrpdr
-| | [Tags] | 1518B | 4C
-| | frame_size=${1518} | phy_cores=${4}
-
-| tc07-9000B-1c-avf-eth-l2patch-ndrpdr
-| | [Tags] | 9000B | 1C
-| | frame_size=${9000} | phy_cores=${1}
-
-| tc08-9000B-2c-avf-eth-l2patch-ndrpdr
-| | [Tags] | 9000B | 2C
-| | frame_size=${9000} | phy_cores=${2}
-
-| tc09-9000B-4c-avf-eth-l2patch-ndrpdr
-| | [Tags] | 9000B | 4C
-| | frame_size=${9000} | phy_cores=${4}
-
-| tc10-IMIX-1c-avf-eth-l2patch-ndrpdr
-| | [Tags] | IMIX | 1C
-| | frame_size=IMIX_v4_1 | phy_cores=${1}
-
-| tc11-IMIX-2c-avf-eth-l2patch-ndrpdr
-| | [Tags] | IMIX | 2C
-| | frame_size=IMIX_v4_1 | phy_cores=${2}
-
-| tc12-IMIX-4c-avf-eth-l2patch-ndrpdr
-| | [Tags] | IMIX | 4C
-| | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/l2/10ge2p1x710-avf-eth-l2xcbase-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x710-avf-eth-l2xcbase-ndrpdr.robot
deleted file mode 100644
index 110a26fb77..0000000000
--- a/tests/vpp/perf/l2/10ge2p1x710-avf-eth-l2xcbase-ndrpdr.robot
+++ /dev/null
@@ -1,130 +0,0 @@
-# Copyright (c) 2019 Cisco and/or its affiliates.
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at:
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-*** Settings ***
-| Resource | resources/libraries/robot/shared/default.robot
-|
-| Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR
-| ... | NIC_Intel-X710 | ETH | L2XCFWD | BASE | L2XCBASE | DRV_AVF
-|
-| Suite Setup | Setup suite single link | performance_avf
-| Suite Teardown | Tear down suite | performance
-| Test Setup | Setup test
-| Test Teardown | Tear down test | performance
-|
-| 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 ${nic_name} with VF\
-| ... | enabled.\
-| ... | *[Ver] TG verification:* TG finds and reports throughput NDR (Non Drop\
-| ... | Rate) with zero packet loss tolerance and 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 ***
-| @{plugins_to_enable}= | avf_plugin.so
-| ${crypto_type}= | ${None}
-| ${nic_name}= | Intel-X710
-| ${nic_driver}= | avf
-| ${osi_layer}= | L2
-| ${overhead}= | ${0}
-# 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:*
-| | ... | - frame_size - 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] | ${frame_size} | ${phy_cores} | ${rxq}=${None}
-| |
-| | Set Test Variable | \${frame_size}
-| |
-| | Given Set Max Rate And Jumbo
-| | And Add worker threads to all DUTs | ${phy_cores} | ${rxq}
-| | And Pre-initialize layer driver | ${nic_driver}
-| | And Apply Startup configuration on all VPP DUTs
-| | When Initialize layer driver | ${nic_driver}
-| | And Initialize layer interface
-| | And Initialize L2 Xconnect In 3-node Circular Topology
-| | Then Find NDR and PDR intervals using optimized search
-
-*** Test Cases ***
-| tc01-64B-1c-avf-eth-l2xcbase-ndrpdr
-| | [Tags] | 64B | 1C
-| | frame_size=${64} | phy_cores=${1}
-
-| tc02-64B-2c-avf-eth-l2xcbase-ndrpdr
-| | [Tags] | 64B | 2C
-| | frame_size=${64} | phy_cores=${2}
-
-| tc03-64B-4c-avf-eth-l2xcbase-ndrpdr
-| | [Tags] | 64B | 4C
-| | frame_size=${64} | phy_cores=${4}
-
-| tc04-1518B-1c-avf-eth-l2xcbase-ndrpdr
-| | [Tags] | 1518B | 1C
-| | frame_size=${1518} | phy_cores=${1}
-
-| tc05-1518B-2c-avf-eth-l2xcbase-ndrpdr
-| | [Tags] | 1518B | 2C
-| | frame_size=${1518} | phy_cores=${2}
-
-| tc06-1518B-4c-avf-eth-l2xcbase-ndrpdr
-| | [Tags] | 1518B | 4C
-| | frame_size=${1518} | phy_cores=${4}
-
-| tc07-9000B-1c-avf-eth-l2xcbase-ndrpdr
-| | [Tags] | 9000B | 1C
-| | frame_size=${9000} | phy_cores=${1}
-
-| tc08-9000B-2c-avf-eth-l2xcbase-ndrpdr
-| | [Tags] | 9000B | 2C
-| | frame_size=${9000} | phy_cores=${2}
-
-| tc09-9000B-4c-avf-eth-l2xcbase-ndrpdr
-| | [Tags] | 9000B | 4C
-| | frame_size=${9000} | phy_cores=${4}
-
-| tc10-IMIX-1c-avf-eth-l2xcbase-ndrpdr
-| | [Tags] | IMIX | 1C
-| | frame_size=IMIX_v4_1 | phy_cores=${1}
-
-| tc11-IMIX-2c-avf-eth-l2xcbase-ndrpdr
-| | [Tags] | IMIX | 2C
-| | frame_size=IMIX_v4_1 | phy_cores=${2}
-
-| tc12-IMIX-4c-avf-eth-l2xcbase-ndrpdr
-| | [Tags] | IMIX | 4C
-| | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/l2/2n1l-10ge2p1x710-avf-dot1q-l2bdbasemaclrn-ndrpdr.robot b/tests/vpp/perf/l2/2n1l-10ge2p1x710-avf-dot1q-l2bdbasemaclrn-ndrpdr.robot
deleted file mode 100644
index fd9cef2f39..0000000000
--- a/tests/vpp/perf/l2/2n1l-10ge2p1x710-avf-dot1q-l2bdbasemaclrn-ndrpdr.robot
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright (c) 2019 Cisco and/or its affiliates.
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at:
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-*** Settings ***
-| Resource | resources/libraries/robot/shared/default.robot
-|
-| Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR
-| ... | NIC_Intel-X710 | DOT1Q | L2BDMACLRN | BASE | DRV_AVF
-|
-| Suite Setup | Setup suite single link | performance_avf
-| Suite Teardown | Tear down suite | performance
-| Test Setup | Setup test
-| Test Teardown | Tear down test | performance
-|
-| Test Template | Local template
-|
-| Documentation | *RFC2544: Pkt throughput L2BD with IEEE 802.1Q test cases*
-|
-| ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology\
-| ... | with single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Dot1q-IPv4 for L2 switching of IPv4.\
-| ... | IEEE 802.1Q tagging is applied on both links TG-DUT1 .
-| ... | *[Cfg] DUT configuration:* DUT1 is configured with:\
-| ... | 2 VLAN subinterfaces (VID 100 and 200),\
-| ... | 1 L2 BD with the 2 VLAN subinterfaces,\
-| ... | DUT1 tested with ${nic_name} with VF enabled.
-| ... | *[Ver] TG verification:* TG finds and reports throughput NDR (Non Drop\
-| ... | Rate) with zero packet loss tolerance and 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 DUT. TG traffic profile contains two L3 flow-groups\
-| ... | (flow-group per direction, 254 flows per flow-group) with all packets\
-| ... | containing Ethernet header including IEEE 802.1Q tagging, 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 ***
-| @{plugins_to_enable}= | avf_plugin.so
-| ${crypto_type}= | ${None}
-| ${nic_name}= | Intel-X710
-| ${nic_driver}= | avf
-| ${osi_layer}= | L2
-| ${overhead}= | ${4}
-# Traffic profile:
-| ${traffic_profile}= | trex-sl-dot1qip4-vlan1ip4src254ip4dst254
-
-*** Keywords ***
-| Local template
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD with VLAN with ${phy_cores} physical core(s) for\
-| | ... | worker threads.
-| | ... | [Ver] Measure NDR and PDR values using MLRsearch algorithm.\
-| |
-| | ... | *Arguments:*
-| | ... | - frame_size - 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] | ${frame_size} | ${phy_cores} | ${rxq}=${None}
-| |
-| | Set Test Variable | \${frame_size}
-| |
-| | Given Set Max Rate And Jumbo
-| | And Add worker threads to all DUTs | ${phy_cores} | ${rxq}
-| | And Pre-initialize layer driver | ${nic_driver}
-| | And Apply Startup configuration on all VPP DUTs
-| | When Initialize layer driver | ${nic_driver}
-| | And Initialize layer interface
-| | And Initialize layer dot1q
-| | And Initialize L2 bridge domain
-| | Then Find NDR and PDR intervals using optimized search
-
-*** Test Cases ***
-| tc01-64B-1c-avf-dot1q-l2bdbasemaclrn-ndrpdr
-| | [Tags] | 64B | 1C
-| | frame_size=${64} | phy_cores=${1}
-
-| tc02-64B-2c-avf-dot1q-l2bdbasemaclrn-ndrpdr
-| | [Tags] | 64B | 2C
-| | frame_size=${64} | phy_cores=${2}
-
-| tc03-64B-4c-avf-dot1q-l2bdbasemaclrn-ndrpdr
-| | [Tags] | 64B | 4C
-| | frame_size=${64} | phy_cores=${4}
-
-| tc04-1518B-1c-avf-dot1q-l2bdbasemaclrn-ndrpdr
-| | [Tags] | 1518B | 1C
-| | frame_size=${1518} | phy_cores=${1}
-
-| tc05-1518B-2c-avf-dot1q-l2bdbasemaclrn-ndrpdr
-| | [Tags] | 1518B | 2C
-| | frame_size=${1518} | phy_cores=${2}
-
-| tc06-1518B-4c-avf-dot1q-l2bdbasemaclrn-ndrpdr
-| | [Tags] | 1518B | 4C
-| | frame_size=${1518} | phy_cores=${4}
-
-| tc07-9000B-1c-avf-dot1q-l2bdbasemaclrn-ndrpdr
-| | [Tags] | 9000B | 1C
-| | frame_size=${9000} | phy_cores=${1}
-
-| tc08-9000B-2c-avf-dot1q-l2bdbasemaclrn-ndrpdr
-| | [Tags] | 9000B | 2C
-| | frame_size=${9000} | phy_cores=${2}
-
-| tc09-9000B-4c-avf-dot1q-l2bdbasemaclrn-ndrpdr
-| | [Tags] | 9000B | 4C
-| | frame_size=${9000} | phy_cores=${4}
-
-| tc10-IMIX-1c-avf-dot1q-l2bdbasemaclrn-ndrpdr
-| | [Tags] | IMIX | 1C
-| | frame_size=IMIX_v4_1 | phy_cores=${1}
-
-| tc11-IMIX-2c-avf-dot1q-l2bdbasemaclrn-ndrpdr
-| | [Tags] | IMIX | 2C
-| | frame_size=IMIX_v4_1 | phy_cores=${2}
-
-| tc12-IMIX-4c-avf-dot1q-l2bdbasemaclrn-ndrpdr
-| | [Tags] | IMIX | 4C
-| | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/l2/2n1l-10ge2p1x710-avf-eth-l2bdbasemaclrn-ndrpdr.robot b/tests/vpp/perf/l2/2n1l-10ge2p1x710-avf-eth-l2bdbasemaclrn-ndrpdr.robot
deleted file mode 100644
index e2d26b7822..0000000000
--- a/tests/vpp/perf/l2/2n1l-10ge2p1x710-avf-eth-l2bdbasemaclrn-ndrpdr.robot
+++ /dev/null
@@ -1,130 +0,0 @@
-# Copyright (c) 2019 Cisco and/or its affiliates.
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at:
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-*** Settings ***
-| Resource | resources/libraries/robot/shared/default.robot
-|
-| Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR
-| ... | NIC_Intel-X710 | ETH | L2BDMACLRN | BASE | DRV_AVF
-|
-| Suite Setup | Setup suite single link | performance_avf
-| Suite Teardown | Tear down suite | performance
-| Test Setup | Setup test
-| Test Teardown | Tear down test | performance
-|
-| Test Template | Local template
-|
-| Documentation | *RFC2544: Pkt throughput L2BD test cases*
-|
-| ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology\
-| ... | with single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 bridge-domain.
-| ... | *[Cfg] DUT configuration:* DUT1 is configured with L2 bridge-\
-| ... | domain and MAC learning enabled. DUT1 tested with ${nic_name}
-| ... | with VF enabled.\
-| ... | *[Ver] TG verification:* TG finds and reports throughput NDR (Non Drop\
-| ... | Rate) with zero packet loss tolerance and 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 DUT. 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 ***
-| @{plugins_to_enable}= | avf_plugin.so
-| ${crypto_type}= | ${None}
-| ${nic_name}= | Intel-X710
-| ${nic_driver}= | avf
-| ${osi_layer}= | L2
-| ${overhead}= | ${0}
-# Traffic profile:
-| ${traffic_profile}= | trex-sl-2n-ethip4-ip4src254
-
-*** Keywords ***
-| Local template
-| | [Documentation]
-| | ... | [Cfg] DUT runs L2BD config with ${phy_cores} phy core(s).
-| | ... | [Ver] Measure NDR and PDR values using MLRsearch algorithm.\
-| |
-| | ... | *Arguments:*
-| | ... | - frame_size - 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] | ${frame_size} | ${phy_cores} | ${rxq}=${None}
-| |
-| | Set Test Variable | \${frame_size}
-| |
-| | Given Set Max Rate And Jumbo
-| | And Add worker threads to all DUTs | ${phy_cores} | ${rxq}
-| | And Pre-initialize layer driver | ${nic_driver}
-| | And Apply Startup configuration on all VPP DUTs
-| | When Initialize layer driver | ${nic_driver}
-| | And Initialize layer interface
-| | And Initialize L2 bridge domain
-| | Then Find NDR and PDR intervals using optimized search
-
-*** Test Cases ***
-| tc01-64B-1c-avf-eth-l2bdbasemaclrn-ndrpdr
-| | [Tags] | 64B | 1C
-| | frame_size=${64} | phy_cores=${1}
-
-| tc02-64B-2c-avf-eth-l2bdbasemaclrn-ndrpdr
-| | [Tags] | 64B | 2C
-| | frame_size=${64} | phy_cores=${2}
-
-| tc03-64B-4c-avf-eth-l2bdbasemaclrn-ndrpdr
-| | [Tags] | 64B | 4C
-| | frame_size=${64} | phy_cores=${4}
-
-| tc04-1518B-1c-avf-eth-l2bdbasemaclrn-ndrpdr
-| | [Tags] | 1518B | 1C
-| | frame_size=${1518} | phy_cores=${1}
-
-| tc05-1518B-2c-avf-eth-l2bdbasemaclrn-ndrpdr
-| | [Tags] | 1518B | 2C
-| | frame_size=${1518} | phy_cores=${2}
-
-| tc06-1518B-4c-avf-eth-l2bdbasemaclrn-ndrpdr
-| | [Tags] | 1518B | 4C
-| | frame_size=${1518} | phy_cores=${4}
-
-| tc07-9000B-1c-avf-eth-l2bdbasemaclrn-ndrpdr
-| | [Tags] | 9000B | 1C
-| | frame_size=${9000} | phy_cores=${1}
-
-| tc08-9000B-2c-avf-eth-l2bdbasemaclrn-ndrpdr
-| | [Tags] | 9000B | 2C
-| | frame_size=${9000} | phy_cores=${2}
-
-| tc09-9000B-4c-avf-eth-l2bdbasemaclrn-ndrpdr
-| | [Tags] | 9000B | 4C
-| | frame_size=${9000} | phy_cores=${4}
-
-| tc10-IMIX-1c-avf-eth-l2bdbasemaclrn-ndrpdr
-| | [Tags] | IMIX | 1C
-| | frame_size=IMIX_v4_1 | phy_cores=${1}
-
-| tc11-IMIX-2c-avf-eth-l2bdbasemaclrn-ndrpdr
-| | [Tags] | IMIX | 2C
-| | frame_size=IMIX_v4_1 | phy_cores=${2}
-
-| tc12-IMIX-4c-avf-eth-l2bdbasemaclrn-ndrpdr
-| | [Tags] | IMIX | 4C
-| | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/l2/2n1l-10ge2p1x710-avf-eth-l2patch-ndrpdr.robot b/tests/vpp/perf/l2/2n1l-10ge2p1x710-avf-eth-l2patch-ndrpdr.robot
deleted file mode 100644
index e1723c55c9..0000000000
--- a/tests/vpp/perf/l2/2n1l-10ge2p1x710-avf-eth-l2patch-ndrpdr.robot
+++ /dev/null
@@ -1,130 +0,0 @@
-# Copyright (c) 2019 Cisco and/or its affiliates.
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at:
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-*** Settings ***
-| Resource | resources/libraries/robot/shared/default.robot
-|
-| Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR
-| ... | NIC_Intel-X710 | ETH | L2PATCH | BASE | DRV_AVF
-|
-| Suite Setup | Setup suite single link | performance_avf
-| Suite Teardown | Tear down suite | performance
-| Test Setup | Setup test
-| Test Teardown | Tear down test | performance
-|
-| Test Template | Local template
-|
-| Documentation | *RFC2544: Pkt throughput L2patch test cases*
-|
-| ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology\
-| ... | with single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 patch.
-| ... | *[Cfg] DUT configuration:* DUT1 is configured with L2 patch\
-| ... | DUT1 tested with ${nic_name} with VF enabled.\
-| ... | *[Ver] TG verification:* TG finds and reports throughput NDR (Non Drop\
-| ... | Rate) with zero packet loss tolerance and 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 DUT. 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 ***
-| @{plugins_to_enable}= | avf_plugin.so
-| ${crypto_type}= | ${None}
-| ${nic_name}= | Intel-X710
-| ${nic_driver}= | avf
-| ${osi_layer}= | L2
-| ${overhead}= | ${0}
-# Traffic profile:
-| ${traffic_profile}= | trex-sl-2n-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:*
-| | ... | - frame_size - 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] | ${frame_size} | ${phy_cores} | ${rxq}=${None}
-| |
-| | Set Test Variable | \${frame_size}
-| |
-| | Given Set Max Rate And Jumbo
-| | And Add worker threads to all DUTs | ${phy_cores} | ${rxq}
-| | And Pre-initialize layer driver | ${nic_driver}
-| | And Apply Startup configuration on all VPP DUTs
-| | When Initialize layer driver | ${nic_driver}
-| | And Initialize layer interface
-| | And Initialize L2 patch
-| | Then Find NDR and PDR intervals using optimized search
-
-*** Test Cases ***
-| tc01-64B-1c-avf-eth-l2patch-ndrpdr
-| | [Tags] | 64B | 1C
-| | frame_size=${64} | phy_cores=${1}
-
-| tc02-64B-2c-avf-eth-l2patch-ndrpdr
-| | [Tags] | 64B | 2C
-| | frame_size=${64} | phy_cores=${2}
-
-| tc03-64B-4c-avf-eth-l2patch-ndrpdr
-| | [Tags] | 64B | 4C
-| | frame_size=${64} | phy_cores=${4}
-
-| tc04-1518B-1c-avf-eth-l2patch-ndrpdr
-| | [Tags] | 1518B | 1C
-| | frame_size=${1518} | phy_cores=${1}
-
-| tc05-1518B-2c-avf-eth-l2patch-ndrpdr
-| | [Tags] | 1518B | 2C
-| | frame_size=${1518} | phy_cores=${2}
-
-| tc06-1518B-4c-avf-eth-l2patch-ndrpdr
-| | [Tags] | 1518B | 4C
-| | frame_size=${1518} | phy_cores=${4}
-
-| tc07-9000B-1c-avf-eth-l2patch-ndrpdr
-| | [Tags] | 9000B | 1C
-| | frame_size=${9000} | phy_cores=${1}
-
-| tc08-9000B-2c-avf-eth-l2patch-ndrpdr
-| | [Tags] | 9000B | 2C
-| | frame_size=${9000} | phy_cores=${2}
-
-| tc09-9000B-4c-avf-eth-l2patch-ndrpdr
-| | [Tags] | 9000B | 4C
-| | frame_size=${9000} | phy_cores=${4}
-
-| tc10-IMIX-1c-avf-eth-l2patch-ndrpdr
-| | [Tags] | IMIX | 1C
-| | frame_size=IMIX_v4_1 | phy_cores=${1}
-
-| tc11-IMIX-2c-avf-eth-l2patch-ndrpdr
-| | [Tags] | IMIX | 2C
-| | frame_size=IMIX_v4_1 | phy_cores=${2}
-
-| tc12-IMIX-4c-avf-eth-l2patch-ndrpdr
-| | [Tags] | IMIX | 4C
-| | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/l2/2n1l-10ge2p1x710-avf-eth-l2xcbase-ndrpdr.robot b/tests/vpp/perf/l2/2n1l-10ge2p1x710-avf-eth-l2xcbase-ndrpdr.robot
deleted file mode 100644
index 6296d6d147..0000000000
--- a/tests/vpp/perf/l2/2n1l-10ge2p1x710-avf-eth-l2xcbase-ndrpdr.robot
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright (c) 2019 Cisco and/or its affiliates.
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at:
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-*** Settings ***
-| Resource | resources/libraries/robot/shared/default.robot
-|
-| Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR
-| ... | NIC_Intel-X710 | ETH | L2XCFWD | BASE | L2XCBASE | DRV_AVF
-|
-| Suite Setup | Setup suite single link | performance_avf
-| Suite Teardown | Tear down suite | performance
-| Test Setup | Setup test
-| Test Teardown | Tear down test | performance
-|
-| Test Template | Local template
-|
-| Documentation | *RFC2544: Pkt throughput L2XC test cases*
-|
-| ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology\
-| ... | with single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 cross-connect.
-| ... | *[Cfg] DUT configuration:* DUT1 is configured with L2 cross-\
-| ... | connect. DUT1 tested with ${nic_name} with VF enabled.\
-| ... | *[Ver] TG verification:* TG finds and reports throughput NDR (Non Drop\
-| ... | Rate) with zero packet loss tolerance and 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 DUT. 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 ***
-| @{plugins_to_enable}= | avf_plugin.so
-| ${crypto_type}= | ${None}
-| ${nic_name}= | Intel-X710
-| ${nic_driver}= | avf
-| ${osi_layer}= | L2
-| ${overhead}= | ${0}
-# Traffic profile:
-| ${traffic_profile}= | trex-sl-2n-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:*
-| | ... | - frame_size - 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] | ${frame_size} | ${phy_cores} | ${rxq}=${None}
-| |
-| | Set Test Variable | \${frame_size}
-| |
-| | Given Set Max Rate And Jumbo
-| | And Add worker threads to all DUTs | ${phy_cores} | ${rxq}
-| | And Pre-initialize layer driver | ${nic_driver}
-| | And Apply Startup configuration on all VPP DUTs
-| | When Initialize layer driver | ${nic_driver}
-| | And Initialize layer interface
-| | And Initialize L2 Xconnect In 2-node Circular Topology
-| | Then Find NDR and PDR intervals using optimized search
-
-*** Test Cases ***
-| tc01-64B-1c-avf-eth-l2xcbase-ndrpdr
-| | [Tags] | 64B | 1C
-| | frame_size=${64} | phy_cores=${1}
-
-| tc02-64B-2c-avf-eth-l2xcbase-ndrpdr
-| | [Tags] | 64B | 2C
-| | frame_size=${64} | phy_cores=${2}
-
-| tc03-64B-4c-avf-eth-l2xcbase-ndrpdr
-| | [Tags] | 64B | 4C
-| | frame_size=${64} | phy_cores=${4}
-
-| tc04-1518B-1c-avf-eth-l2xcbase-ndrpdr
-| | [Tags] | 1518B | 1C
-| | frame_size=${1518} | phy_cores=${1}
-
-| tc05-1518B-2c-avf-eth-l2xcbase-ndrpdr
-| | [Tags] | 1518B | 2C
-| | frame_size=${1518} | phy_cores=${2}
-
-| tc06-1518B-4c-avf-eth-l2xcbase-ndrpdr
-| | [Tags] | 1518B | 4C
-| | frame_size=${1518} | phy_cores=${4}
-
-| tc07-9000B-1c-avf-eth-l2xcbase-ndrpdr
-| | [Tags] | 9000B | 1C
-| | frame_size=${9000} | phy_cores=${1}
-
-| tc08-9000B-2c-avf-eth-l2xcbase-ndrpdr
-| | [Tags] | 9000B | 2C
-| | frame_size=${9000} | phy_cores=${2}
-
-| tc09-9000B-4c-avf-eth-l2xcbase-ndrpdr
-| | [Tags] | 9000B | 4C
-| | frame_size=${9000} | phy_cores=${4}
-
-| tc10-IMIX-1c-avf-eth-l2xcbase-ndrpdr
-| | [Tags] | IMIX | 1C
-| | frame_size=IMIX_v4_1 | phy_cores=${1}
-
-| tc11-IMIX-2c-avf-eth-l2xcbase-ndrpdr
-| | [Tags] | IMIX | 2C
-| | frame_size=IMIX_v4_1 | phy_cores=${2}
-
-| tc12-IMIX-4c-avf-eth-l2xcbase-ndrpdr
-| | [Tags] | IMIX | 4C
-| | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/l2/2n1l-10ge2p1x710-avf-dot1q-l2bdbasemaclrn-gbp-ndrpdr.robot b/tests/vpp/perf/l2/2n1l-10ge2p1x710-dot1q-l2bdbasemaclrn-gbp-ndrpdr.robot
index 698d0a2284..2cbaa1ac31 100644
--- a/tests/vpp/perf/l2/2n1l-10ge2p1x710-avf-dot1q-l2bdbasemaclrn-gbp-ndrpdr.robot
+++ b/tests/vpp/perf/l2/2n1l-10ge2p1x710-dot1q-l2bdbasemaclrn-gbp-ndrpdr.robot
@@ -15,9 +15,9 @@
 | Resource | resources/libraries/robot/shared/default.robot
 |
 | Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR
-| ... | NIC_Intel-X710 | DOT1Q | L2BDMACLRN | BASE | DRV_AVF | GBP
+| ... | NIC_Intel-X710 | DOT1Q | L2BDMACLRN | BASE | DRV_VFIO_PCI | GBP
 |
-| Suite Setup | Setup suite single link | performance_avf
+| Suite Setup | Setup suite single link | performance
 | Suite Teardown | Tear down suite | performance
 | Test Setup | Setup test
 | Test Teardown | Tear down test | performance
@@ -55,10 +55,10 @@
 | ... | *[Ref] Applicable standard specifications:* RFC2544.
 
 *** Variables ***
-| @{plugins_to_enable}= | avf_plugin.so | gbp_plugin.so | acl_plugin.so
+| @{plugins_to_enable}= | dpdk_plugin.so | gbp_plugin.so | acl_plugin.so
 | ${crypto_type}= | ${None}
 | ${nic_name}= | Intel-X710
-| ${nic_driver}= | avf
+| ${nic_driver}= | vfio-pci
 | ${osi_layer}= | L2
 | ${overhead}= | ${4}
 # Traffic profile:
@@ -92,50 +92,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-avf-dot1q-l2bdbasemaclrn-gbp-ndrpdr
+| tc01-64B-1c-dot1q-l2bdbasemaclrn-gbp-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-avf-dot1q-l2bdbasemaclrn-gbp-ndrpdr
+| tc02-64B-2c-dot1q-l2bdbasemaclrn-gbp-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-avf-dot1q-l2bdbasemaclrn-gbp-ndrpdr
+| tc03-64B-4c-dot1q-l2bdbasemaclrn-gbp-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-avf-dot1q-l2bdbasemaclrn-gbp-ndrpdr
+| tc04-1518B-1c-dot1q-l2bdbasemaclrn-gbp-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-avf-dot1q-l2bdbasemaclrn-gbp-ndrpdr
+| tc05-1518B-2c-dot1q-l2bdbasemaclrn-gbp-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-avf-dot1q-l2bdbasemaclrn-gbp-ndrpdr
+| tc06-1518B-4c-dot1q-l2bdbasemaclrn-gbp-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-avf-dot1q-l2bdbasemaclrn-gbp-ndrpdr
+| tc07-9000B-1c-dot1q-l2bdbasemaclrn-gbp-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-avf-dot1q-l2bdbasemaclrn-gbp-ndrpdr
+| tc08-9000B-2c-dot1q-l2bdbasemaclrn-gbp-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-avf-dot1q-l2bdbasemaclrn-gbp-ndrpdr
+| tc09-9000B-4c-dot1q-l2bdbasemaclrn-gbp-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-avf-dot1q-l2bdbasemaclrn-gbp-ndrpdr
+| tc10-IMIX-1c-dot1q-l2bdbasemaclrn-gbp-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-avf-dot1q-l2bdbasemaclrn-gbp-ndrpdr
+| tc11-IMIX-2c-dot1q-l2bdbasemaclrn-gbp-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-avf-dot1q-l2bdbasemaclrn-gbp-ndrpdr
+| tc12-IMIX-4c-dot1q-l2bdbasemaclrn-gbp-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/l2/regenerate_testcases.py b/tests/vpp/perf/l2/regenerate_testcases.py
index dda55e9121..ec754aa261 100755
--- a/tests/vpp/perf/l2/regenerate_testcases.py
+++ b/tests/vpp/perf/l2/regenerate_testcases.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 # Copyright (c) 2019 Cisco and/or its affiliates.
 # Licensed under the Apache License, Version 2.0 (the "License");