From 65265d4344d3e800e433acfab1b00f5231c266e8 Mon Sep 17 00:00:00 2001
From: Peter Mikus <pmikus@cisco.com>
Date: Fri, 13 Sep 2019 08:22:29 +0000
Subject: [PATCH] Add: AVF IPv6

Signed-off-by: Peter Mikus <pmikus@cisco.com>
Change-Id: I6cb4ef356047bdc341a70a4e7b8d0b3f54eb7f9d
---
 .../ip6/10ge2p1x710-avf-dot1q-ip6base-ndrpdr.robot | 135 +++++++++++++++++++++
 .../10ge2p1x710-avf-ethip6-ip6base-ndrpdr.robot    | 127 +++++++++++++++++++
 ...0ge2p1x710-avf-ethip6-ip6scale200k-ndrpdr.robot | 130 ++++++++++++++++++++
 ...10ge2p1x710-avf-ethip6-ip6scale20k-ndrpdr.robot | 130 ++++++++++++++++++++
 .../10ge2p1x710-avf-ethip6-ip6scale2m-ndrpdr.robot | 130 ++++++++++++++++++++
 .../ip6/10ge2p1x710-ethip6-ip6base-ndrpdr.robot    |   8 +-
 .../10ge2p1x710-ethip6-ip6scale200k-ndrpdr.robot   |   2 +-
 .../10ge2p1x710-ethip6-ip6scale20k-ndrpdr.robot    |   2 +-
 .../ip6/10ge2p1x710-ethip6-ip6scale2m-ndrpdr.robot |   4 +-
 ...2n1l-10ge2p1x710-avf-dot1q-ip6base-ndrpdr.robot | 135 +++++++++++++++++++++
 ...n1l-10ge2p1x710-avf-ethip6-ip6base-ndrpdr.robot | 127 +++++++++++++++++++
 ...0ge2p1x710-avf-ethip6-ip6scale200k-ndrpdr.robot | 130 ++++++++++++++++++++
 ...10ge2p1x710-avf-ethip6-ip6scale20k-ndrpdr.robot | 130 ++++++++++++++++++++
 ...-10ge2p1x710-avf-ethip6-ip6scale2m-ndrpdr.robot | 130 ++++++++++++++++++++
 .../2n1l-10ge2p1x710-ethip6-ip6base-ndrpdr.robot   |  16 +--
 ...1l-10ge2p1x710-ethip6-ip6scale200k-ndrpdr.robot |   4 +-
 ...n1l-10ge2p1x710-ethip6-ip6scale20k-ndrpdr.robot |   4 +-
 ...2n1l-10ge2p1x710-ethip6-ip6scale2m-ndrpdr.robot |   4 +-
 18 files changed, 1326 insertions(+), 22 deletions(-)
 create mode 100644 tests/vpp/perf/ip6/10ge2p1x710-avf-dot1q-ip6base-ndrpdr.robot
 create mode 100644 tests/vpp/perf/ip6/10ge2p1x710-avf-ethip6-ip6base-ndrpdr.robot
 create mode 100644 tests/vpp/perf/ip6/10ge2p1x710-avf-ethip6-ip6scale200k-ndrpdr.robot
 create mode 100644 tests/vpp/perf/ip6/10ge2p1x710-avf-ethip6-ip6scale20k-ndrpdr.robot
 create mode 100644 tests/vpp/perf/ip6/10ge2p1x710-avf-ethip6-ip6scale2m-ndrpdr.robot
 create mode 100644 tests/vpp/perf/ip6/2n1l-10ge2p1x710-avf-dot1q-ip6base-ndrpdr.robot
 create mode 100644 tests/vpp/perf/ip6/2n1l-10ge2p1x710-avf-ethip6-ip6base-ndrpdr.robot
 create mode 100644 tests/vpp/perf/ip6/2n1l-10ge2p1x710-avf-ethip6-ip6scale200k-ndrpdr.robot
 create mode 100644 tests/vpp/perf/ip6/2n1l-10ge2p1x710-avf-ethip6-ip6scale20k-ndrpdr.robot
 create mode 100644 tests/vpp/perf/ip6/2n1l-10ge2p1x710-avf-ethip6-ip6scale2m-ndrpdr.robot

diff --git a/tests/vpp/perf/ip6/10ge2p1x710-avf-dot1q-ip6base-ndrpdr.robot b/tests/vpp/perf/ip6/10ge2p1x710-avf-dot1q-ip6base-ndrpdr.robot
new file mode 100644
index 0000000000..d268649368
--- /dev/null
+++ b/tests/vpp/perf/ip6/10ge2p1x710-avf-dot1q-ip6base-ndrpdr.robot
@@ -0,0 +1,135 @@
+# 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 | IP6FWD | BASE | DOT1Q | IP6BASE | DRV_AVF
+| ...
+| Suite Setup | Setup suite single link | performance_avf
+| Suite Teardown | Tear down suite | performance | vifs
+| Test Setup | Setup test
+| Test Teardown | Tear down test | performance
+| ...
+| Test Template | Local Template
+| ...
+| Documentation | *RFC2544: Pkt throughput IPv6 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-IPv6 for IPv6 routing. IEEE 802.1Q\
+| ... | tagging is applied on link between DUT1 and DUT2.
+| ... | *[Cfg] DUT configuration:* DUT1 and DUT2 are configured with IPv6\
+| ... | routing and two static IPv6 /64 route entries. 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, 253 flows per flow-group) with\
+| ... | all packets containing Ethernet header, IPv6 header with IP\
+| ... | no next header and static payload. MAC addresses are matching MAC\
+| ... | addresses of the TG node interfaces.
+| ... | *[Ref] Applicable standard specifications:* RFC2544.
+
+*** Variables ***
+| @{plugins_to_enable}= | dpdk_plugin.so | avf_plugin.so
+| ${osi_layer}= | L3
+| ${nic_name}= | Intel-X710
+| ${overhead}= | ${4}
+| ${subid}= | 10
+| ${tag_rewrite}= | pop-1
+# TG subnets used by T-Rex
+| ${tg_if1_net}= | 2001:1::0
+| ${tg_if2_net}= | 2001:2::0
+# Traffic profile:
+| ${traffic_profile}= | trex-sl-3n-ethip6-ip6src253
+
+*** Keywords ***
+| Local Template
+| | [Documentation]
+| | ... | [Cfg] Each DUT runs IPv6 routing 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 Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
+| | And Add DPDK no PCI to all DUTs
+| | And Set Max Rate And Jumbo
+| | And Apply startup configuration on all VPP DUTs
+| | When Initialize IPv6 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
+
+*** Test Cases ***
+| tc01-78B-1c-avf-dot1q-ip6base-ndrpdr
+| | [Tags] | 78B | 1C
+| | frame_size=${78} | phy_cores=${1}
+
+| tc02-78B-2c-avf-dot1q-ip6base-ndrpdr
+| | [Tags] | 78B | 2C
+| | frame_size=${78} | phy_cores=${2}
+
+| tc03-78B-4c-avf-dot1q-ip6base-ndrpdr
+| | [Tags] | 78B | 4C
+| | frame_size=${78} | phy_cores=${4}
+
+| tc04-1518B-1c-avf-dot1q-ip6base-ndrpdr
+| | [Tags] | 1518B | 1C
+| | frame_size=${1518} | phy_cores=${1}
+
+| tc05-1518B-2c-avf-dot1q-ip6base-ndrpdr
+| | [Tags] | 1518B | 2C
+| | frame_size=${1518} | phy_cores=${2}
+
+| tc06-1518B-4c-avf-dot1q-ip6base-ndrpdr
+| | [Tags] | 1518B | 4C
+| | frame_size=${1518} | phy_cores=${4}
+
+| tc07-9000B-1c-avf-dot1q-ip6base-ndrpdr
+| | [Tags] | 9000B | 1C
+| | frame_size=${9000} | phy_cores=${1}
+
+| tc08-9000B-2c-avf-dot1q-ip6base-ndrpdr
+| | [Tags] | 9000B | 2C
+| | frame_size=${9000} | phy_cores=${2}
+
+| tc09-9000B-4c-avf-dot1q-ip6base-ndrpdr
+| | [Tags] | 9000B | 4C
+| | frame_size=${9000} | phy_cores=${4}
+
+| tc10-IMIX-1c-avf-dot1q-ip6base-ndrpdr
+| | [Tags] | IMIX | 1C
+| | frame_size=IMIX_v4_1 | phy_cores=${1}
+
+| tc11-IMIX-2c-avf-dot1q-ip6base-ndrpdr
+| | [Tags] | IMIX | 2C
+| | frame_size=IMIX_v4_1 | phy_cores=${2}
+
+| tc12-IMIX-4c-avf-dot1q-ip6base-ndrpdr
+| | [Tags] | IMIX | 4C
+| | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/ip6/10ge2p1x710-avf-ethip6-ip6base-ndrpdr.robot b/tests/vpp/perf/ip6/10ge2p1x710-avf-ethip6-ip6base-ndrpdr.robot
new file mode 100644
index 0000000000..2d89cbe5f7
--- /dev/null
+++ b/tests/vpp/perf/ip6/10ge2p1x710-avf-ethip6-ip6base-ndrpdr.robot
@@ -0,0 +1,127 @@
+# 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 | IP6FWD | BASE | IP6BASE | DRV_AVF
+| ...
+| Suite Setup | Setup suite single link | performance_avf
+| Suite Teardown | Tear down suite | performance | vifs
+| Test Setup | Setup test
+| Test Teardown | Tear down test | performance
+| ...
+| Test Template | Local Template
+| ...
+| Documentation | *RFC2544: Pkt throughput IPv6 routing test cases*
+| ...
+| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology\
+| ... | with single links between nodes.
+| ... | *[Enc] Packet Encapsulations:* Eth-IPv6 for IPv6 routing.
+| ... | *[Cfg] DUT configuration:* DUT1 and DUT2 are configured with IPv6\
+| ... | routing and two static IPv6 /64 route entries. DUT1 and DUT2\
+| ... | tested with ${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, 253 flows per\
+| ... | flow-group) with all packets containing Ethernet header, IPv6 header\
+| ... | with IP no next header and static payload. MAC addresses are matching\
+| ... | MAC addresses of the TG node interfaces.
+| ... | *[Ref] Applicable standard specifications:* RFC2544.
+
+*** Variables ***
+| @{plugins_to_enable}= | dpdk_plugin.so | avf_plugin.so
+| ${osi_layer}= | L3
+| ${nic_name}= | Intel-X710
+| ${overhead}= | ${0}
+# Traffic profile:
+| ${traffic_profile}= | trex-sl-3n-ethip6-ip6src253
+
+*** Keywords ***
+| Local Template
+| | [Documentation]
+| | ... | [Cfg] DUT runs IPv6 routing config.\
+| | ... | Each DUT 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 Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
+| | And Add DPDK no PCI to all DUTs
+| | And Set Max Rate And Jumbo
+| | And Apply startup configuration on all VPP DUTs
+| | When Initialize AVF interfaces
+| | And Initialize IPv6 forwarding in circular topology
+| | Then Find NDR and PDR intervals using optimized search
+
+*** Test Cases ***
+| tc01-78B-1c-avf-ethip6-ip6base-ndrpdr
+| | [Tags] | 78B | 1C
+| | frame_size=${78} | phy_cores=${1}
+
+| tc02-78B-2c-avf-ethip6-ip6base-ndrpdr
+| | [Tags] | 78B | 2C
+| | frame_size=${78} | phy_cores=${2}
+
+| tc03-78B-4c-avf-ethip6-ip6base-ndrpdr
+| | [Tags] | 78B | 4C
+| | frame_size=${78} | phy_cores=${4}
+
+| tc04-1518B-1c-avf-ethip6-ip6base-ndrpdr
+| | [Tags] | 1518B | 1C
+| | frame_size=${1518} | phy_cores=${1}
+
+| tc05-1518B-2c-avf-ethip6-ip6base-ndrpdr
+| | [Tags] | 1518B | 2C
+| | frame_size=${1518} | phy_cores=${2}
+
+| tc06-1518B-4c-avf-ethip6-ip6base-ndrpdr
+| | [Tags] | 1518B | 4C
+| | frame_size=${1518} | phy_cores=${4}
+
+| tc07-9000B-1c-avf-ethip6-ip6base-ndrpdr
+| | [Tags] | 9000B | 1C
+| | frame_size=${9000} | phy_cores=${1}
+
+| tc08-9000B-2c-avf-ethip6-ip6base-ndrpdr
+| | [Tags] | 9000B | 2C
+| | frame_size=${9000} | phy_cores=${2}
+
+| tc09-9000B-4c-avf-ethip6-ip6base-ndrpdr
+| | [Tags] | 9000B | 4C
+| | frame_size=${9000} | phy_cores=${4}
+
+| tc10-IMIX-1c-avf-ethip6-ip6base-ndrpdr
+| | [Tags] | IMIX | 1C
+| | frame_size=IMIX_v4_1 | phy_cores=${1}
+
+| tc11-IMIX-2c-avf-ethip6-ip6base-ndrpdr
+| | [Tags] | IMIX | 2C
+| | frame_size=IMIX_v4_1 | phy_cores=${2}
+
+| tc12-IMIX-4c-avf-ethip6-ip6base-ndrpdr
+| | [Tags] | IMIX | 4C
+| | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/ip6/10ge2p1x710-avf-ethip6-ip6scale200k-ndrpdr.robot b/tests/vpp/perf/ip6/10ge2p1x710-avf-ethip6-ip6scale200k-ndrpdr.robot
new file mode 100644
index 0000000000..a6740d55f9
--- /dev/null
+++ b/tests/vpp/perf/ip6/10ge2p1x710-avf-ethip6-ip6scale200k-ndrpdr.robot
@@ -0,0 +1,130 @@
+# 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 | IP6FWD | SCALE | FIB_200K | DRV_AVF
+| ...
+| Suite Setup | Setup suite single link | performance_avf
+| Suite Teardown | Tear down suite | performance | vifs
+| Test Setup | Setup test
+| Test Teardown | Tear down test | performance
+| ...
+| Test Template | Local Template
+| ...
+| Documentation | *RFC2544: Pkt throughput IPv6 routing test cases*
+| ...
+| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology\
+| ... | with single links between nodes.
+| ... | *[Enc] Packet Encapsulations:* Eth-IPv6 for IPv6 routing.
+| ... | *[Cfg] DUT configuration:* DUT1 and DUT2 are configured with IPv6\
+| ... | routing and 2x100k static IPv6 /64 route entries. DUT1 and DUT2 tested\
+| ... | with ${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, 100k flows per\
+| ... | flow-group) with all packets containing Ethernet header, IPv6 header\
+| ... | with IP and static payload. MAC addresses are matching MAC addresses\
+| ... | of the TG node interfaces. Incrementing of IP.dst (IPv6 destination\
+| ... | address) field is applied to both streams.
+| ... | *[Ref] Applicable standard specifications:* RFC2544.
+
+*** Variables ***
+| @{plugins_to_enable}= | dpdk_plugin.so | avf_plugin.so
+| ${osi_layer}= | L3
+| ${nic_name}= | Intel-X710
+| ${overhead}= | ${0}
+| ${rts_per_flow}= | ${100000}
+# Traffic profile:
+| ${traffic_profile}= | trex-sl-3n-ethip6-ip6dst${rts_per_flow}
+
+*** Keywords ***
+| Local Template
+| | [Documentation]
+| | ... | [Cfg] DUT runs IPv6 routing config.\
+| | ... | Each DUT 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 Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
+| | And Add DPDK no PCI to all DUTs
+| | And Set Max Rate And Jumbo
+| | And Apply startup configuration on all VPP DUTs
+| | When Initialize AVF interfaces
+| | And Initialize IPv6 forwarding with scaling in circular topology
+| | ... | ${rts_per_flow}
+| | Then Find NDR and PDR intervals using optimized search
+
+*** Test Cases ***
+| tc01-78B-1c-avf-ethip6-ip6scale200k-ndrpdr
+| | [Tags] | 78B | 1C
+| | frame_size=${78} | phy_cores=${1}
+
+| tc02-78B-2c-avf-ethip6-ip6scale200k-ndrpdr
+| | [Tags] | 78B | 2C
+| | frame_size=${78} | phy_cores=${2}
+
+| tc03-78B-4c-avf-ethip6-ip6scale200k-ndrpdr
+| | [Tags] | 78B | 4C
+| | frame_size=${78} | phy_cores=${4}
+
+| tc04-1518B-1c-avf-ethip6-ip6scale200k-ndrpdr
+| | [Tags] | 1518B | 1C
+| | frame_size=${1518} | phy_cores=${1}
+
+| tc05-1518B-2c-avf-ethip6-ip6scale200k-ndrpdr
+| | [Tags] | 1518B | 2C
+| | frame_size=${1518} | phy_cores=${2}
+
+| tc06-1518B-4c-avf-ethip6-ip6scale200k-ndrpdr
+| | [Tags] | 1518B | 4C
+| | frame_size=${1518} | phy_cores=${4}
+
+| tc07-9000B-1c-avf-ethip6-ip6scale200k-ndrpdr
+| | [Tags] | 9000B | 1C
+| | frame_size=${9000} | phy_cores=${1}
+
+| tc08-9000B-2c-avf-ethip6-ip6scale200k-ndrpdr
+| | [Tags] | 9000B | 2C
+| | frame_size=${9000} | phy_cores=${2}
+
+| tc09-9000B-4c-avf-ethip6-ip6scale200k-ndrpdr
+| | [Tags] | 9000B | 4C
+| | frame_size=${9000} | phy_cores=${4}
+
+| tc10-IMIX-1c-avf-ethip6-ip6scale200k-ndrpdr
+| | [Tags] | IMIX | 1C
+| | frame_size=IMIX_v4_1 | phy_cores=${1}
+
+| tc11-IMIX-2c-avf-ethip6-ip6scale200k-ndrpdr
+| | [Tags] | IMIX | 2C
+| | frame_size=IMIX_v4_1 | phy_cores=${2}
+
+| tc12-IMIX-4c-avf-ethip6-ip6scale200k-ndrpdr
+| | [Tags] | IMIX | 4C
+| | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/ip6/10ge2p1x710-avf-ethip6-ip6scale20k-ndrpdr.robot b/tests/vpp/perf/ip6/10ge2p1x710-avf-ethip6-ip6scale20k-ndrpdr.robot
new file mode 100644
index 0000000000..17080b89ae
--- /dev/null
+++ b/tests/vpp/perf/ip6/10ge2p1x710-avf-ethip6-ip6scale20k-ndrpdr.robot
@@ -0,0 +1,130 @@
+# 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 | IP6FWD | SCALE | FIB_20K | DRV_AVF
+| ...
+| Suite Setup | Setup suite single link | performance_avf
+| Suite Teardown | Tear down suite | performance | vifs
+| Test Setup | Setup test
+| Test Teardown | Tear down test | performance
+| ...
+| Test Template | Local Template
+| ...
+| Documentation | *RFC2544: Pkt throughput IPv6 routing test cases*
+| ...
+| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology\
+| ... | with single links between nodes.
+| ... | *[Enc] Packet Encapsulations:* Eth-IPv6 for IPv6 routing.
+| ... | *[Cfg] DUT configuration:* DUT1 and DUT2 are configured with IPv6\
+| ... | routing and 2x10k static IPv6 /64 route entries. DUT1 and DUT2 tested\
+| ... | with ${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, 10k flows per\
+| ... | flow-group) with all packets containing Ethernet header, IPv6 header\
+| ... | with IP and static payload. MAC addresses are matching MAC addresses\
+| ... | of the TG node interfaces. Incrementing of IP.dst (IPv6 destination\
+| ... | address) field is applied to both streams.
+| ... | *[Ref] Applicable standard specifications:* RFC2544.
+
+*** Variables ***
+| @{plugins_to_enable}= | dpdk_plugin.so | avf_plugin.so
+| ${osi_layer}= | L3
+| ${nic_name}= | Intel-X710
+| ${overhead}= | ${0}
+| ${rts_per_flow}= | ${10000}
+# Traffic profile:
+| ${traffic_profile}= | trex-sl-3n-ethip6-ip6dst${rts_per_flow}
+
+*** Keywords ***
+| Local Template
+| | [Documentation]
+| | ... | [Cfg] DUT runs IPv6 routing config.\
+| | ... | Each DUT 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 Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
+| | And Add DPDK no PCI to all DUTs
+| | And Set Max Rate And Jumbo
+| | And Apply startup configuration on all VPP DUTs
+| | When Initialize AVF interfaces
+| | And Initialize IPv6 forwarding with scaling in circular topology
+| | ... | ${rts_per_flow}
+| | Then Find NDR and PDR intervals using optimized search
+
+*** Test Cases ***
+| tc01-78B-1c-avf-ethip6-ip6scale20k-ndrpdr
+| | [Tags] | 78B | 1C
+| | frame_size=${78} | phy_cores=${1}
+
+| tc02-78B-2c-avf-ethip6-ip6scale20k-ndrpdr
+| | [Tags] | 78B | 2C
+| | frame_size=${78} | phy_cores=${2}
+
+| tc03-78B-4c-avf-ethip6-ip6scale20k-ndrpdr
+| | [Tags] | 78B | 4C
+| | frame_size=${78} | phy_cores=${4}
+
+| tc04-1518B-1c-avf-ethip6-ip6scale20k-ndrpdr
+| | [Tags] | 1518B | 1C
+| | frame_size=${1518} | phy_cores=${1}
+
+| tc05-1518B-2c-avf-ethip6-ip6scale20k-ndrpdr
+| | [Tags] | 1518B | 2C
+| | frame_size=${1518} | phy_cores=${2}
+
+| tc06-1518B-4c-avf-ethip6-ip6scale20k-ndrpdr
+| | [Tags] | 1518B | 4C
+| | frame_size=${1518} | phy_cores=${4}
+
+| tc07-9000B-1c-avf-ethip6-ip6scale20k-ndrpdr
+| | [Tags] | 9000B | 1C
+| | frame_size=${9000} | phy_cores=${1}
+
+| tc08-9000B-2c-avf-ethip6-ip6scale20k-ndrpdr
+| | [Tags] | 9000B | 2C
+| | frame_size=${9000} | phy_cores=${2}
+
+| tc09-9000B-4c-avf-ethip6-ip6scale20k-ndrpdr
+| | [Tags] | 9000B | 4C
+| | frame_size=${9000} | phy_cores=${4}
+
+| tc10-IMIX-1c-avf-ethip6-ip6scale20k-ndrpdr
+| | [Tags] | IMIX | 1C
+| | frame_size=IMIX_v4_1 | phy_cores=${1}
+
+| tc11-IMIX-2c-avf-ethip6-ip6scale20k-ndrpdr
+| | [Tags] | IMIX | 2C
+| | frame_size=IMIX_v4_1 | phy_cores=${2}
+
+| tc12-IMIX-4c-avf-ethip6-ip6scale20k-ndrpdr
+| | [Tags] | IMIX | 4C
+| | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/ip6/10ge2p1x710-avf-ethip6-ip6scale2m-ndrpdr.robot b/tests/vpp/perf/ip6/10ge2p1x710-avf-ethip6-ip6scale2m-ndrpdr.robot
new file mode 100644
index 0000000000..89403e7d85
--- /dev/null
+++ b/tests/vpp/perf/ip6/10ge2p1x710-avf-ethip6-ip6scale2m-ndrpdr.robot
@@ -0,0 +1,130 @@
+# 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 | IP6FWD | SCALE | FIB_2M | DRV_AVF
+| ...
+| Suite Setup | Setup suite single link | performance_avf
+| Suite Teardown | Tear down suite | performance | vifs
+| Test Setup | Setup test
+| Test Teardown | Tear down test | performance
+| ...
+| Test Template | Local Template
+| ...
+| Documentation | *RFC2544: Pkt throughput IPv6 routing test cases*
+| ...
+| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology\
+| ... | with single links between nodes.
+| ... | *[Enc] Packet Encapsulations:* Eth-IPv6 for IPv6 routing.
+| ... | *[Cfg] DUT configuration:* DUT1 and DUT2 are configured with IPv6\
+| ... | routing and 2x1M static IPv6 /64 route entries. DUT1 and DUT2 tested\
+| ... | with ${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, 1M flows per\
+| ... | flow-group) with all packets containing Ethernet header, IPv6 header\
+| ... | with IP and static payload. MAC addresses are matching MAC addresses\
+| ... | of the TG node interfaces. Incrementing of IP.dst (IPv6 destination\
+| ... | address) field is applied to both streams.
+| ... | *[Ref] Applicable standard specifications:* RFC2544.
+
+*** Variables ***
+| @{plugins_to_enable}= | dpdk_plugin.so | avf_plugin.so
+| ${osi_layer}= | L3
+| ${nic_name}= | Intel-X710
+| ${overhead}= | ${0}
+| ${rts_per_flow}= | ${1000000}
+# Traffic profile:
+| ${traffic_profile}= | trex-sl-3n-ethip6-ip6dst${rts_per_flow}
+
+*** Keywords ***
+| Local Template
+| | [Documentation]
+| | ... | [Cfg] DUT runs IPv6 routing config.\
+| | ... | Each DUT 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 Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
+| | And Add DPDK no PCI to all DUTs
+| | And Set Max Rate And Jumbo
+| | And Apply startup configuration on all VPP DUTs
+| | When Initialize AVF interfaces
+| | And Initialize IPv6 forwarding with scaling in circular topology
+| | ... | ${rts_per_flow}
+| | Then Find NDR and PDR intervals using optimized search
+
+*** Test Cases ***
+| tc01-78B-1c-avf-ethip6-ip6scale2m-ndrpdr
+| | [Tags] | 78B | 1C
+| | frame_size=${78} | phy_cores=${1}
+
+| tc02-78B-2c-avf-ethip6-ip6scale2m-ndrpdr
+| | [Tags] | 78B | 2C
+| | frame_size=${78} | phy_cores=${2}
+
+| tc03-78B-4c-avf-ethip6-ip6scale2m-ndrpdr
+| | [Tags] | 78B | 4C
+| | frame_size=${78} | phy_cores=${4}
+
+| tc04-1518B-1c-avf-ethip6-ip6scale2m-ndrpdr
+| | [Tags] | 1518B | 1C
+| | frame_size=${1518} | phy_cores=${1}
+
+| tc05-1518B-2c-avf-ethip6-ip6scale2m-ndrpdr
+| | [Tags] | 1518B | 2C
+| | frame_size=${1518} | phy_cores=${2}
+
+| tc06-1518B-4c-avf-ethip6-ip6scale2m-ndrpdr
+| | [Tags] | 1518B | 4C
+| | frame_size=${1518} | phy_cores=${4}
+
+| tc07-9000B-1c-avf-ethip6-ip6scale2m-ndrpdr
+| | [Tags] | 9000B | 1C
+| | frame_size=${9000} | phy_cores=${1}
+
+| tc08-9000B-2c-avf-ethip6-ip6scale2m-ndrpdr
+| | [Tags] | 9000B | 2C
+| | frame_size=${9000} | phy_cores=${2}
+
+| tc09-9000B-4c-avf-ethip6-ip6scale2m-ndrpdr
+| | [Tags] | 9000B | 4C
+| | frame_size=${9000} | phy_cores=${4}
+
+| tc10-IMIX-1c-avf-ethip6-ip6scale2m-ndrpdr
+| | [Tags] | IMIX | 1C
+| | frame_size=IMIX_v4_1 | phy_cores=${1}
+
+| tc11-IMIX-2c-avf-ethip6-ip6scale2m-ndrpdr
+| | [Tags] | IMIX | 2C
+| | frame_size=IMIX_v4_1 | phy_cores=${2}
+
+| tc12-IMIX-4c-avf-ethip6-ip6scale2m-ndrpdr
+| | [Tags] | IMIX | 4C
+| | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/ip6/10ge2p1x710-ethip6-ip6base-ndrpdr.robot b/tests/vpp/perf/ip6/10ge2p1x710-ethip6-ip6base-ndrpdr.robot
index 58044911c5..d0b266e252 100644
--- a/tests/vpp/perf/ip6/10ge2p1x710-ethip6-ip6base-ndrpdr.robot
+++ b/tests/vpp/perf/ip6/10ge2p1x710-ethip6-ip6base-ndrpdr.robot
@@ -26,12 +26,12 @@
 | ...
 | Documentation | *RFC2544: Pkt throughput IPv6 routing test cases*
 | ...
-| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology
+| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology\
 | ... | with single links between nodes.
 | ... | *[Enc] Packet Encapsulations:* Eth-IPv6 for IPv6 routing.
-| ... | *[Cfg] DUT configuration:* DUT1 and DUT2 are configured with IPv6
-| ... | routing and two static IPv6 /64 route entries. DUT1 and DUT2
-| ... | tested with ${nic_name}.\
+| ... | *[Cfg] DUT configuration:* DUT1 and DUT2 are configured with IPv6\
+| ... | routing and two static IPv6 /64 route entries. DUT1 and DUT2\
+| ... | tested with ${nic_name}.
 | ... | *[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\
diff --git a/tests/vpp/perf/ip6/10ge2p1x710-ethip6-ip6scale200k-ndrpdr.robot b/tests/vpp/perf/ip6/10ge2p1x710-ethip6-ip6scale200k-ndrpdr.robot
index 4cde20ce37..87187f04c7 100644
--- a/tests/vpp/perf/ip6/10ge2p1x710-ethip6-ip6scale200k-ndrpdr.robot
+++ b/tests/vpp/perf/ip6/10ge2p1x710-ethip6-ip6scale200k-ndrpdr.robot
@@ -31,7 +31,7 @@
 | ... | *[Enc] Packet Encapsulations:* Eth-IPv6 for IPv6 routing.
 | ... | *[Cfg] DUT configuration:* DUT1 and DUT2 are configured with IPv6\
 | ... | routing and 2x100k static IPv6 /64 route entries. DUT1 and DUT2 tested\
-| ... | with ${nic_name}.\
+| ... | with ${nic_name}.
 | ... | *[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\
diff --git a/tests/vpp/perf/ip6/10ge2p1x710-ethip6-ip6scale20k-ndrpdr.robot b/tests/vpp/perf/ip6/10ge2p1x710-ethip6-ip6scale20k-ndrpdr.robot
index 96de50b879..51dbcba498 100644
--- a/tests/vpp/perf/ip6/10ge2p1x710-ethip6-ip6scale20k-ndrpdr.robot
+++ b/tests/vpp/perf/ip6/10ge2p1x710-ethip6-ip6scale20k-ndrpdr.robot
@@ -31,7 +31,7 @@
 | ... | *[Enc] Packet Encapsulations:* Eth-IPv6 for IPv6 routing.
 | ... | *[Cfg] DUT configuration:* DUT1 and DUT2 are configured with IPv6\
 | ... | routing and 2x10k static IPv6 /64 route entries. DUT1 and DUT2 tested\
-| ... | with ${nic_name}.\
+| ... | with ${nic_name}.
 | ... | *[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\
diff --git a/tests/vpp/perf/ip6/10ge2p1x710-ethip6-ip6scale2m-ndrpdr.robot b/tests/vpp/perf/ip6/10ge2p1x710-ethip6-ip6scale2m-ndrpdr.robot
index db3ae9b445..a9311a0ba3 100644
--- a/tests/vpp/perf/ip6/10ge2p1x710-ethip6-ip6scale2m-ndrpdr.robot
+++ b/tests/vpp/perf/ip6/10ge2p1x710-ethip6-ip6scale2m-ndrpdr.robot
@@ -31,7 +31,7 @@
 | ... | *[Enc] Packet Encapsulations:* Eth-IPv6 for IPv6 routing.
 | ... | *[Cfg] DUT configuration:* DUT1 and DUT2 are configured with IPv6\
 | ... | routing and 2x1M static IPv6 /64 route entries. DUT1 and DUT2 tested\
-| ... | with ${nic_name}.\
+| ... | with ${nic_name}.
 | ... | *[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\
@@ -57,7 +57,7 @@
 *** Keywords ***
 | Local Template
 | | [Documentation]
-| | ... | [Cfg] DUT runs IPv6 routing config.
+| | ... | [Cfg] DUT runs IPv6 routing config.\
 | | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads.
 | | ... | [Ver] Measure NDR and PDR values using MLRsearch algorithm.\
 | | ...
diff --git a/tests/vpp/perf/ip6/2n1l-10ge2p1x710-avf-dot1q-ip6base-ndrpdr.robot b/tests/vpp/perf/ip6/2n1l-10ge2p1x710-avf-dot1q-ip6base-ndrpdr.robot
new file mode 100644
index 0000000000..c28f219983
--- /dev/null
+++ b/tests/vpp/perf/ip6/2n1l-10ge2p1x710-avf-dot1q-ip6base-ndrpdr.robot
@@ -0,0 +1,135 @@
+# 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 | IP6FWD | BASE | DOT1Q | IP6BASE | DRV_AVF
+| ...
+| Suite Setup | Setup suite single link | performance_avf
+| Suite Teardown | Tear down suite | performance | vifs
+| Test Setup | Setup test
+| Test Teardown | Tear down test | performance
+| ...
+| Test Template | Local Template
+| ...
+| Documentation | *RFC2544: Pkt throughput IPv6 routing with IEEE 802.1Q test
+| ... | cases*
+| ...
+| ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology with\
+| ... | single links between nodes.
+| ... | *[Enc] Packet Encapsulations:* Eth-IPv6 for IPv6 routing. IEEE 802.1Q\
+| ... | tagging is applied on link between DUT1-if2 and TG-if2.
+| ... | *[Cfg] DUT configuration:* DUT1 is configured with IPv6 routing and\
+| ... | two static IPv6 /64 route entries. DUT1 is 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 DUT1. TG traffic profile contains two L3\
+| ... | flow-groups (flow-group per direction, 253 flows per flow-group) with\
+| ... | all packets containing Ethernet header, IPv6 header with IP\
+| ... | no next header and static payload. MAC addresses are matching MAC\
+| ... | addresses of the TG node interfaces.
+| ... | *[Ref] Applicable standard specifications:* RFC2544.
+
+*** Variables ***
+| @{plugins_to_enable}= | dpdk_plugin.so | avf_plugin.so
+| ${osi_layer}= | L3
+| ${nic_name}= | Intel-X710
+| ${overhead}= | ${4}
+| ${subid}= | 10
+| ${tag_rewrite}= | pop-1
+# TG subnets used by T-Rex
+| ${tg_if1_net}= | 2001:1::0
+| ${tg_if2_net}= | 2001:2::0
+# Traffic profile:
+| ${traffic_profile}= | trex-sl-2n-dot1qip6asym-ip6src253
+
+*** Keywords ***
+| Local Template
+| | [Documentation]
+| | ... | [Cfg] Each DUT runs IPv6 routing 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 Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
+| | And Add DPDK no PCI to all DUTs
+| | And Set Max Rate And Jumbo
+| | And Apply startup configuration on all VPP DUTs
+| | When Initialize IPv6 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
+
+*** Test Cases ***
+| tc01-78B-1c-avf-dot1q-ip6base-ndrpdr
+| | [Tags] | 78B | 1C
+| | frame_size=${78} | phy_cores=${1}
+
+| tc02-78B-2c-avf-dot1q-ip6base-ndrpdr
+| | [Tags] | 78B | 2C
+| | frame_size=${78} | phy_cores=${2}
+
+| tc03-78B-4c-avf-dot1q-ip6base-ndrpdr
+| | [Tags] | 78B | 4C
+| | frame_size=${78} | phy_cores=${4}
+
+| tc04-1518B-1c-avf-dot1q-ip6base-ndrpdr
+| | [Tags] | 1518B | 1C
+| | frame_size=${1518} | phy_cores=${1}
+
+| tc05-1518B-2c-avf-dot1q-ip6base-ndrpdr
+| | [Tags] | 1518B | 2C
+| | frame_size=${1518} | phy_cores=${2}
+
+| tc06-1518B-4c-avf-dot1q-ip6base-ndrpdr
+| | [Tags] | 1518B | 4C
+| | frame_size=${1518} | phy_cores=${4}
+
+| tc07-9000B-1c-avf-dot1q-ip6base-ndrpdr
+| | [Tags] | 9000B | 1C
+| | frame_size=${9000} | phy_cores=${1}
+
+| tc08-9000B-2c-avf-dot1q-ip6base-ndrpdr
+| | [Tags] | 9000B | 2C
+| | frame_size=${9000} | phy_cores=${2}
+
+| tc09-9000B-4c-avf-dot1q-ip6base-ndrpdr
+| | [Tags] | 9000B | 4C
+| | frame_size=${9000} | phy_cores=${4}
+
+| tc10-IMIX-1c-avf-dot1q-ip6base-ndrpdr
+| | [Tags] | IMIX | 1C
+| | frame_size=IMIX_v4_1 | phy_cores=${1}
+
+| tc11-IMIX-2c-avf-dot1q-ip6base-ndrpdr
+| | [Tags] | IMIX | 2C
+| | frame_size=IMIX_v4_1 | phy_cores=${2}
+
+| tc12-IMIX-4c-avf-dot1q-ip6base-ndrpdr
+| | [Tags] | IMIX | 4C
+| | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/ip6/2n1l-10ge2p1x710-avf-ethip6-ip6base-ndrpdr.robot b/tests/vpp/perf/ip6/2n1l-10ge2p1x710-avf-ethip6-ip6base-ndrpdr.robot
new file mode 100644
index 0000000000..f58161ff6b
--- /dev/null
+++ b/tests/vpp/perf/ip6/2n1l-10ge2p1x710-avf-ethip6-ip6base-ndrpdr.robot
@@ -0,0 +1,127 @@
+# 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 | IP6FWD | BASE | IP6BASE | DRV_AVF
+| ...
+| Suite Setup | Setup suite single link | performance_avf
+| Suite Teardown | Tear down suite | performance | vifs
+| Test Setup | Setup test
+| Test Teardown | Tear down test | performance
+| ...
+| Test Template | Local Template
+| ...
+| Documentation | *RFC2544: Pkt throughput IPv6 routing test cases*
+| ...
+| ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology\
+| ... | with single links between nodes.
+| ... | *[Enc] Packet Encapsulations:* Eth-IPv6 for IPv6 routing.
+| ... | *[Cfg] DUT configuration:* DUT1 is configured with IPv6 routing and two\
+| ... | static IPv6 /64 route entries. 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 DUTs. TG traffic profile\
+| ... | contains two L3 flow-groups (flow-group per direction, 253 flows per\
+| ... | flow-group) with all packets containing Ethernet header, IPv6 header\
+| ... | with IP no next header and static payload. MAC addresses are matching\
+| ... | MAC addresses of the TG node interfaces.
+| ... | *[Ref] Applicable standard specifications:* RFC2544.
+
+*** Variables ***
+| @{plugins_to_enable}= | dpdk_plugin.so | avf_plugin.so
+| ${osi_layer}= | L3
+| ${nic_name}= | Intel-X710
+| ${overhead}= | ${0}
+# Traffic profile:
+| ${traffic_profile}= | trex-sl-2n-ethip6-ip6src253
+
+*** Keywords ***
+| Local Template
+| | [Documentation]
+| | ... | [Cfg] DUT runs IPv6 routing config.\
+| | ... | Each DUT 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 Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
+| | And Add DPDK no PCI to all DUTs
+| | And Set Max Rate And Jumbo
+| | And Apply startup configuration on all VPP DUTs
+| | When Initialize AVF interfaces
+| | And Initialize IPv6 forwarding in circular topology
+| | Then Find NDR and PDR intervals using optimized search
+
+*** Test Cases ***
+| tc01-78B-1c-avf-ethip6-ip6base-ndrpdr
+| | [Tags] | 78B | 1C
+| | frame_size=${78} | phy_cores=${1}
+
+| tc02-78B-2c-avf-ethip6-ip6base-ndrpdr
+| | [Tags] | 78B | 2C
+| | frame_size=${78} | phy_cores=${2}
+
+| tc03-78B-4c-avf-ethip6-ip6base-ndrpdr
+| | [Tags] | 78B | 4C
+| | frame_size=${78} | phy_cores=${4}
+
+| tc04-1518B-1c-avf-ethip6-ip6base-ndrpdr
+| | [Tags] | 1518B | 1C
+| | frame_size=${1518} | phy_cores=${1}
+
+| tc05-1518B-2c-avf-ethip6-ip6base-ndrpdr
+| | [Tags] | 1518B | 2C
+| | frame_size=${1518} | phy_cores=${2}
+
+| tc06-1518B-4c-avf-ethip6-ip6base-ndrpdr
+| | [Tags] | 1518B | 4C
+| | frame_size=${1518} | phy_cores=${4}
+
+| tc07-9000B-1c-avf-ethip6-ip6base-ndrpdr
+| | [Tags] | 9000B | 1C
+| | frame_size=${9000} | phy_cores=${1}
+
+| tc08-9000B-2c-avf-ethip6-ip6base-ndrpdr
+| | [Tags] | 9000B | 2C
+| | frame_size=${9000} | phy_cores=${2}
+
+| tc09-9000B-4c-avf-ethip6-ip6base-ndrpdr
+| | [Tags] | 9000B | 4C
+| | frame_size=${9000} | phy_cores=${4}
+
+| tc10-IMIX-1c-avf-ethip6-ip6base-ndrpdr
+| | [Tags] | IMIX | 1C
+| | frame_size=IMIX_v4_1 | phy_cores=${1}
+
+| tc11-IMIX-2c-avf-ethip6-ip6base-ndrpdr
+| | [Tags] | IMIX | 2C
+| | frame_size=IMIX_v4_1 | phy_cores=${2}
+
+| tc12-IMIX-4c-avf-ethip6-ip6base-ndrpdr
+| | [Tags] | IMIX | 4C
+| | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/ip6/2n1l-10ge2p1x710-avf-ethip6-ip6scale200k-ndrpdr.robot b/tests/vpp/perf/ip6/2n1l-10ge2p1x710-avf-ethip6-ip6scale200k-ndrpdr.robot
new file mode 100644
index 0000000000..825271eb57
--- /dev/null
+++ b/tests/vpp/perf/ip6/2n1l-10ge2p1x710-avf-ethip6-ip6scale200k-ndrpdr.robot
@@ -0,0 +1,130 @@
+# 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 | IP6FWD | SCALE | FIB_200K | DRV_AVF
+| ...
+| Suite Setup | Setup suite single link | performance_avf
+| Suite Teardown | Tear down suite | performance | vifs
+| Test Setup | Setup test
+| Test Teardown | Tear down test | performance
+| ...
+| Test Template | Local Template
+| ...
+| Documentation | *RFC2544: Pkt throughput IPv6 routing test cases*
+| ...
+| ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology\
+| ... | with single links between nodes.
+| ... | *[Enc] Packet Encapsulations:* Eth-IPv6 for IPv6 routing.
+| ... | *[Cfg] DUT configuration:* DUT1 is configured with IPv6 routing and\
+| ... | 2x100k static IPv6 /64 route entries. DUT1 is 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 DUT1. TG traffic profile\
+| ... | contains two L3 flow-groups (flow-group per direction, 100k flows per\
+| ... | flow-group) with all packets containing Ethernet header, IPv6 header\
+| ... | with IP and static payload. MAC addresses are matching MAC addresses\
+| ... | of the TG node interfaces. Incrementing of IP.dst (IPv6 destination\
+| ... | address) field is applied to both streams.
+| ... | *[Ref] Applicable standard specifications:* RFC2544.
+
+*** Variables ***
+| @{plugins_to_enable}= | dpdk_plugin.so | avf_plugin.so
+| ${osi_layer}= | L3
+| ${nic_name}= | Intel-X710
+| ${overhead}= | ${0}
+| ${rts_per_flow}= | ${100000}
+# Traffic profile:
+| ${traffic_profile}= | trex-sl-3n-ethip6-ip6dst${rts_per_flow}
+
+*** Keywords ***
+| Local Template
+| | [Documentation]
+| | ... | [Cfg] DUT runs IPv6 routing config.\
+| | ... | Each DUT 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 Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
+| | And Add DPDK no PCI to all DUTs
+| | And Set Max Rate And Jumbo
+| | And Apply startup configuration on all VPP DUTs
+| | When Initialize AVF interfaces
+| | And Initialize IPv6 forwarding with scaling in circular topology
+| | ... | ${rts_per_flow}
+| | Then Find NDR and PDR intervals using optimized search
+
+*** Test Cases ***
+| tc01-78B-1c-avf-ethip6-ip6scale200k-ndrpdr
+| | [Tags] | 78B | 1C
+| | frame_size=${78} | phy_cores=${1}
+
+| tc02-78B-2c-avf-ethip6-ip6scale200k-ndrpdr
+| | [Tags] | 78B | 2C
+| | frame_size=${78} | phy_cores=${2}
+
+| tc03-78B-4c-avf-ethip6-ip6scale200k-ndrpdr
+| | [Tags] | 78B | 4C
+| | frame_size=${78} | phy_cores=${4}
+
+| tc04-1518B-1c-avf-ethip6-ip6scale200k-ndrpdr
+| | [Tags] | 1518B | 1C
+| | frame_size=${1518} | phy_cores=${1}
+
+| tc05-1518B-2c-avf-ethip6-ip6scale200k-ndrpdr
+| | [Tags] | 1518B | 2C
+| | frame_size=${1518} | phy_cores=${2}
+
+| tc06-1518B-4c-avf-ethip6-ip6scale200k-ndrpdr
+| | [Tags] | 1518B | 4C
+| | frame_size=${1518} | phy_cores=${4}
+
+| tc07-9000B-1c-avf-ethip6-ip6scale200k-ndrpdr
+| | [Tags] | 9000B | 1C
+| | frame_size=${9000} | phy_cores=${1}
+
+| tc08-9000B-2c-avf-ethip6-ip6scale200k-ndrpdr
+| | [Tags] | 9000B | 2C
+| | frame_size=${9000} | phy_cores=${2}
+
+| tc09-9000B-4c-avf-ethip6-ip6scale200k-ndrpdr
+| | [Tags] | 9000B | 4C
+| | frame_size=${9000} | phy_cores=${4}
+
+| tc10-IMIX-1c-avf-ethip6-ip6scale200k-ndrpdr
+| | [Tags] | IMIX | 1C
+| | frame_size=IMIX_v4_1 | phy_cores=${1}
+
+| tc11-IMIX-2c-avf-ethip6-ip6scale200k-ndrpdr
+| | [Tags] | IMIX | 2C
+| | frame_size=IMIX_v4_1 | phy_cores=${2}
+
+| tc12-IMIX-4c-avf-ethip6-ip6scale200k-ndrpdr
+| | [Tags] | IMIX | 4C
+| | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/ip6/2n1l-10ge2p1x710-avf-ethip6-ip6scale20k-ndrpdr.robot b/tests/vpp/perf/ip6/2n1l-10ge2p1x710-avf-ethip6-ip6scale20k-ndrpdr.robot
new file mode 100644
index 0000000000..2714557750
--- /dev/null
+++ b/tests/vpp/perf/ip6/2n1l-10ge2p1x710-avf-ethip6-ip6scale20k-ndrpdr.robot
@@ -0,0 +1,130 @@
+# 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 | IP6FWD | SCALE | FIB_20K | DRV_AVF
+| ...
+| Suite Setup | Setup suite single link | performance_avf
+| Suite Teardown | Tear down suite | performance | vifs
+| Test Setup | Setup test
+| Test Teardown | Tear down test | performance
+| ...
+| Test Template | Local Template
+| ...
+| Documentation | *RFC2544: Pkt throughput IPv6 routing test cases*
+| ...
+| ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology\
+| ... | with single links between nodes.
+| ... | *[Enc] Packet Encapsulations:* Eth-IPv6 for IPv6 routing.
+| ... | *[Cfg] DUT configuration:* DUT1 is configured with IPv6 routing and two\
+| ... | static IPv6 /64 route entries. 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 DUT1. TG traffic profile\
+| ... | contains two L3 flow-groups (flow-group per direction, 1M flows per\
+| ... | flow-group) with all packets containing Ethernet header, IPv6 header\
+| ... | with IP and static payload. MAC addresses are matching MAC addresses\
+| ... | of the TG node interfaces. Incrementing of IP.dst (IPv6 destination\
+| ... | address) field is applied to both streams.
+| ... | *[Ref] Applicable standard specifications:* RFC2544.
+
+*** Variables ***
+| @{plugins_to_enable}= | dpdk_plugin.so | avf_plugin.so
+| ${osi_layer}= | L3
+| ${nic_name}= | Intel-X710
+| ${overhead}= | ${0}
+| ${rts_per_flow}= | ${10000}
+# Traffic profile:
+| ${traffic_profile}= | trex-sl-3n-ethip6-ip6dst${rts_per_flow}
+
+*** Keywords ***
+| Local Template
+| | [Documentation]
+| | ... | [Cfg] DUT runs IPv6 routing config.\
+| | ... | Each DUT 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 Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
+| | And Add DPDK no PCI to all DUTs
+| | And Set Max Rate And Jumbo
+| | And Apply startup configuration on all VPP DUTs
+| | When Initialize AVF interfaces
+| | And Initialize IPv6 forwarding with scaling in circular topology
+| | ... | ${rts_per_flow}
+| | Then Find NDR and PDR intervals using optimized search
+
+*** Test Cases ***
+| tc01-78B-1c-avf-ethip6-ip6scale20k-ndrpdr
+| | [Tags] | 78B | 1C
+| | frame_size=${78} | phy_cores=${1}
+
+| tc02-78B-2c-avf-ethip6-ip6scale20k-ndrpdr
+| | [Tags] | 78B | 2C
+| | frame_size=${78} | phy_cores=${2}
+
+| tc03-78B-4c-avf-ethip6-ip6scale20k-ndrpdr
+| | [Tags] | 78B | 4C
+| | frame_size=${78} | phy_cores=${4}
+
+| tc04-1518B-1c-avf-ethip6-ip6scale20k-ndrpdr
+| | [Tags] | 1518B | 1C
+| | frame_size=${1518} | phy_cores=${1}
+
+| tc05-1518B-2c-avf-ethip6-ip6scale20k-ndrpdr
+| | [Tags] | 1518B | 2C
+| | frame_size=${1518} | phy_cores=${2}
+
+| tc06-1518B-4c-avf-ethip6-ip6scale20k-ndrpdr
+| | [Tags] | 1518B | 4C
+| | frame_size=${1518} | phy_cores=${4}
+
+| tc07-9000B-1c-avf-ethip6-ip6scale20k-ndrpdr
+| | [Tags] | 9000B | 1C
+| | frame_size=${9000} | phy_cores=${1}
+
+| tc08-9000B-2c-avf-ethip6-ip6scale20k-ndrpdr
+| | [Tags] | 9000B | 2C
+| | frame_size=${9000} | phy_cores=${2}
+
+| tc09-9000B-4c-avf-ethip6-ip6scale20k-ndrpdr
+| | [Tags] | 9000B | 4C
+| | frame_size=${9000} | phy_cores=${4}
+
+| tc10-IMIX-1c-avf-ethip6-ip6scale20k-ndrpdr
+| | [Tags] | IMIX | 1C
+| | frame_size=IMIX_v4_1 | phy_cores=${1}
+
+| tc11-IMIX-2c-avf-ethip6-ip6scale20k-ndrpdr
+| | [Tags] | IMIX | 2C
+| | frame_size=IMIX_v4_1 | phy_cores=${2}
+
+| tc12-IMIX-4c-avf-ethip6-ip6scale20k-ndrpdr
+| | [Tags] | IMIX | 4C
+| | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/ip6/2n1l-10ge2p1x710-avf-ethip6-ip6scale2m-ndrpdr.robot b/tests/vpp/perf/ip6/2n1l-10ge2p1x710-avf-ethip6-ip6scale2m-ndrpdr.robot
new file mode 100644
index 0000000000..ed6c7c9572
--- /dev/null
+++ b/tests/vpp/perf/ip6/2n1l-10ge2p1x710-avf-ethip6-ip6scale2m-ndrpdr.robot
@@ -0,0 +1,130 @@
+# 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 | IP6FWD | SCALE | FIB_2M | DRV_AVF
+| ...
+| Suite Setup | Setup suite single link | performance_avf
+| Suite Teardown | Tear down suite | performance | vifs
+| Test Setup | Setup test
+| Test Teardown | Tear down test | performance
+| ...
+| Test Template | Local Template
+| ...
+| Documentation | *RFC2544: Pkt throughput IPv6 routing test cases*
+| ...
+| ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology\
+| ... | with single links between nodes.
+| ... | *[Enc] Packet Encapsulations:* Eth-IPv6 for IPv6 routing.
+| ... | *[Cfg] DUT configuration:* DUT1 is configured with IPv6 routing and\
+| ... | 2x1M static IPv6 /64 route entries. DUT1 is 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 DUT1. TG traffic profile\
+| ... | contains two L3 flow-groups (flow-group per direction, 1M flows per\
+| ... | flow-group) with all packets containing Ethernet header, IPv6 header\
+| ... | with IP and static payload. MAC addresses are matching MAC addresses\
+| ... | of the TG node interfaces. Incrementing of IP.dst (IPv6 destination\
+| ... | address) field is applied to both streams.
+| ... | *[Ref] Applicable standard specifications:* RFC2544.
+
+*** Variables ***
+| @{plugins_to_enable}= | dpdk_plugin.so | avf_plugin.so
+| ${osi_layer}= | L3
+| ${nic_name}= | Intel-X710
+| ${overhead}= | ${0}
+| ${rts_per_flow}= | ${1000000}
+# Traffic profile:
+| ${traffic_profile}= | trex-sl-3n-ethip6-ip6dst${rts_per_flow}
+
+*** Keywords ***
+| Local Template
+| | [Documentation]
+| | ... | [Cfg] DUT runs IPv6 routing config.\
+| | ... | Each DUT 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 Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
+| | And Add DPDK no PCI to all DUTs
+| | And Set Max Rate And Jumbo
+| | And Apply startup configuration on all VPP DUTs
+| | When Initialize AVF interfaces
+| | And Initialize IPv6 forwarding with scaling in circular topology
+| | ... | ${rts_per_flow}
+| | Then Find NDR and PDR intervals using optimized search
+
+*** Test Cases ***
+| tc01-78B-1c-avf-ethip6-ip6scale2m-ndrpdr
+| | [Tags] | 78B | 1C
+| | frame_size=${78} | phy_cores=${1}
+
+| tc02-78B-2c-avf-ethip6-ip6scale2m-ndrpdr
+| | [Tags] | 78B | 2C
+| | frame_size=${78} | phy_cores=${2}
+
+| tc03-78B-4c-avf-ethip6-ip6scale2m-ndrpdr
+| | [Tags] | 78B | 4C
+| | frame_size=${78} | phy_cores=${4}
+
+| tc04-1518B-1c-avf-ethip6-ip6scale2m-ndrpdr
+| | [Tags] | 1518B | 1C
+| | frame_size=${1518} | phy_cores=${1}
+
+| tc05-1518B-2c-avf-ethip6-ip6scale2m-ndrpdr
+| | [Tags] | 1518B | 2C
+| | frame_size=${1518} | phy_cores=${2}
+
+| tc06-1518B-4c-avf-ethip6-ip6scale2m-ndrpdr
+| | [Tags] | 1518B | 4C
+| | frame_size=${1518} | phy_cores=${4}
+
+| tc07-9000B-1c-avf-ethip6-ip6scale2m-ndrpdr
+| | [Tags] | 9000B | 1C
+| | frame_size=${9000} | phy_cores=${1}
+
+| tc08-9000B-2c-avf-ethip6-ip6scale2m-ndrpdr
+| | [Tags] | 9000B | 2C
+| | frame_size=${9000} | phy_cores=${2}
+
+| tc09-9000B-4c-avf-ethip6-ip6scale2m-ndrpdr
+| | [Tags] | 9000B | 4C
+| | frame_size=${9000} | phy_cores=${4}
+
+| tc10-IMIX-1c-avf-ethip6-ip6scale2m-ndrpdr
+| | [Tags] | IMIX | 1C
+| | frame_size=IMIX_v4_1 | phy_cores=${1}
+
+| tc11-IMIX-2c-avf-ethip6-ip6scale2m-ndrpdr
+| | [Tags] | IMIX | 2C
+| | frame_size=IMIX_v4_1 | phy_cores=${2}
+
+| tc12-IMIX-4c-avf-ethip6-ip6scale2m-ndrpdr
+| | [Tags] | IMIX | 4C
+| | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/ip6/2n1l-10ge2p1x710-ethip6-ip6base-ndrpdr.robot b/tests/vpp/perf/ip6/2n1l-10ge2p1x710-ethip6-ip6base-ndrpdr.robot
index 84f91d646c..0670a3ccb3 100644
--- a/tests/vpp/perf/ip6/2n1l-10ge2p1x710-ethip6-ip6base-ndrpdr.robot
+++ b/tests/vpp/perf/ip6/2n1l-10ge2p1x710-ethip6-ip6base-ndrpdr.robot
@@ -24,23 +24,23 @@
 | ...
 | Test Template | Local Template
 | ...
-| Documentation | *Packet throughput routing test cases*
+| Documentation | *Packet throughput IPv6 routing test cases*
 | ...
-| ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology
+| ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology\
 | ... | with single links between nodes.
 | ... | *[Enc] Packet Encapsulations:* Eth-IPv6 for IPv6 routing.
-| ... | *[Cfg] DUT configuration:* DUT1 is configured with IPv6 routing and two
+| ... | *[Cfg] DUT configuration:* DUT1 is configured with IPv6 routing and two\
 | ... | static IPv6 /64 route entries. DUT1 tested with ${nic_name}.\
 | ... | *[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, 253 flows per flow-group) with\
-| ... | all packets containing Ethernet header,IPv6 header with static payload.\
-| ... | MAC addresses are matching MAC addresses of the TG node interfaces.
+| ... | Test packets are generated by TG on links to DUTs. TG traffic profile\
+| ... | contains two L3 flow-groups (flow-group per direction, 253 flows per\
+| ... | flow-group) with all packets containing Ethernet header, IPv6 header\
+| ... | with IP protocol=61 and static payload. MAC addresses are matching MAC\
+| ... | addresses of the TG node interfaces.
 | ... | *[Ref] Applicable standard specifications:* RFC2544.
 
 *** Variables ***
diff --git a/tests/vpp/perf/ip6/2n1l-10ge2p1x710-ethip6-ip6scale200k-ndrpdr.robot b/tests/vpp/perf/ip6/2n1l-10ge2p1x710-ethip6-ip6scale200k-ndrpdr.robot
index 458517baf9..aabcae6b12 100644
--- a/tests/vpp/perf/ip6/2n1l-10ge2p1x710-ethip6-ip6scale200k-ndrpdr.robot
+++ b/tests/vpp/perf/ip6/2n1l-10ge2p1x710-ethip6-ip6scale200k-ndrpdr.robot
@@ -15,7 +15,7 @@
 | Resource | resources/libraries/robot/shared/default.robot
 | ...
 | Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR
-| ... | NIC_Intel-X710 | ETH | IP6FWD | SCALE | FIB_200k
+| ... | NIC_Intel-X710 | ETH | IP6FWD | SCALE | FIB_200K
 | ...
 | Suite Setup | Setup suite single link | performance
 | Suite Teardown | Tear down suite | performance
@@ -30,7 +30,7 @@
 | ... | single links between nodes.
 | ... | *[Enc] Packet Encapsulations:* Eth-IPv6 for IPv6 routing.
 | ... | *[Cfg] DUT configuration:* DUT1 is configured with IPv6 routing and\
-| ... | 2x100k static IPv6 /64 route entries. DUT1 is tested with ${nic_name}.\
+| ... | 2x100k static IPv6 /64 route entries. DUT1 is tested with ${nic_name}.
 | ... | *[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\
diff --git a/tests/vpp/perf/ip6/2n1l-10ge2p1x710-ethip6-ip6scale20k-ndrpdr.robot b/tests/vpp/perf/ip6/2n1l-10ge2p1x710-ethip6-ip6scale20k-ndrpdr.robot
index ff3e64e2a9..cddf74a079 100644
--- a/tests/vpp/perf/ip6/2n1l-10ge2p1x710-ethip6-ip6scale20k-ndrpdr.robot
+++ b/tests/vpp/perf/ip6/2n1l-10ge2p1x710-ethip6-ip6scale20k-ndrpdr.robot
@@ -15,7 +15,7 @@
 | Resource | resources/libraries/robot/shared/default.robot
 | ...
 | Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR
-| ... | NIC_Intel-X710 | ETH | IP6FWD | SCALE | FIB_20k
+| ... | NIC_Intel-X710 | ETH | IP6FWD | SCALE | FIB_20K
 | ...
 | Suite Setup | Setup suite single link | performance
 | Suite Teardown | Tear down suite | performance
@@ -30,7 +30,7 @@
 | ... | single links between nodes.
 | ... | *[Enc] Packet Encapsulations:* Eth-IPv6 for IPv6 routing.
 | ... | *[Cfg] DUT configuration:* DUT1 is configured with IPv6 routing and\
-| ... | 2x10k static IPv6 /64 route entries. DUT1 is tested with ${nic_name}.\
+| ... | 2x10k static IPv6 /64 route entries. DUT1 is tested with ${nic_name}.
 | ... | *[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\
diff --git a/tests/vpp/perf/ip6/2n1l-10ge2p1x710-ethip6-ip6scale2m-ndrpdr.robot b/tests/vpp/perf/ip6/2n1l-10ge2p1x710-ethip6-ip6scale2m-ndrpdr.robot
index 304696957a..cd1cf8808a 100644
--- a/tests/vpp/perf/ip6/2n1l-10ge2p1x710-ethip6-ip6scale2m-ndrpdr.robot
+++ b/tests/vpp/perf/ip6/2n1l-10ge2p1x710-ethip6-ip6scale2m-ndrpdr.robot
@@ -30,7 +30,7 @@
 | ... | single links between nodes.
 | ... | *[Enc] Packet Encapsulations:* Eth-IPv6 for IPv6 routing.
 | ... | *[Cfg] DUT configuration:* DUT1 is configured with IPv6 routing and\
-| ... | 2x1M static IPv6 /64 route entries. DUT1 is tested with ${nic_name}.\
+| ... | 2x1M static IPv6 /64 route entries. DUT1 is tested with ${nic_name}.
 | ... | *[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\
@@ -56,7 +56,7 @@
 *** Keywords ***
 | Local Template
 | | [Documentation]
-| | ... | [Cfg] DUT runs IPv6 routing config.
+| | ... | [Cfg] DUT runs IPv6 routing config.\
 | | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads.
 | | ... | [Ver] Measure NDR and PDR values using MLRsearch algorithm.\
 | | ...
-- 
2.16.6