X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=tests%2Fvpp%2Fperf%2Fip6%2F10ge2p1x520-ethip6-ip6base-copwhtlistbase-ndrpdrdisc.robot;h=b2d3f7134a11816d63c8c4a438b286d1f24b9820;hb=ad71afc5baa8008bd5d4ea26f51a71eefe3fbe62;hp=6808603262038ce71c14ac72195ba2f40569cb7e;hpb=6721e7f09aa95bff6622068332a3f56afad9c87b;p=csit.git

diff --git a/tests/vpp/perf/ip6/10ge2p1x520-ethip6-ip6base-copwhtlistbase-ndrpdrdisc.robot b/tests/vpp/perf/ip6/10ge2p1x520-ethip6-ip6base-copwhtlistbase-ndrpdrdisc.robot
index 6808603262..b2d3f7134a 100644
--- a/tests/vpp/perf/ip6/10ge2p1x520-ethip6-ip6base-copwhtlistbase-ndrpdrdisc.robot
+++ b/tests/vpp/perf/ip6/10ge2p1x520-ethip6-ip6base-copwhtlistbase-ndrpdrdisc.robot
@@ -60,23 +60,25 @@
 | tc01-78B-1t1c-ethip6-ip6base-copwhtlistbase-ndrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 routing and whitelist filters config with \
-| | ... | 1 thread, 1 phy core, 1 receive queue per NIC port. [Ver] Find NDR
+| | ... | 1 phy core, 1 receive queue per NIC port. [Ver] Find NDR
 | | ... | for 78 Byte frames using binary search start at 10GE linerate,
-| | ... | step 100kpps.
-| | [Tags] | 78B | 1T1C | STHREAD | NDRDISC
+| | ... | step 50kpps.
+| | [Tags] | 78B | 1C | NDRDISC
 | | ${framesize}= | Set Variable | ${78}
-| | ${min_rate}= | Set Variable | ${100000}
+| | ${min_rate}= | Set Variable | ${50000}
 | | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize}
 | | ${binary_min}= | Set Variable | ${min_rate}
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
-| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology
-| | And Add PCI devices to DUTs in 3-node single link topology
+| | Given Add worker threads and rxqueues to all DUTs | 1
+| | And Add PCI devices to all DUTs
 | | And Add no multi seg to all DUTs
 | | And Apply startup configuration on all VPP DUTs
 | | When Initialize IPv6 forwarding in 3-node circular topology
-| | And Add fib table | ${dut1} | 2001:1:: | 64 | 1 | local
-| | And Add fib table | ${dut2} | 2001:2:: | 64 | 1 | local
+| | And Add Fib Table | ${dut1} | 1 | ipv6=${TRUE}
+| | And Vpp Route Add | ${dut1} | 2001:1:: | 64 | vrf=1 | local=${TRUE}
+| | And Add Fib Table | ${dut2} | 1 | ipv6=${TRUE}
+| | And Vpp Route Add | ${dut2} | 2001:2:: | 64 | vrf=1 | local=${TRUE}
 | | And COP Add whitelist Entry | ${dut1} | ${dut1_if1} | ip6 | 1
 | | And COP Add whitelist Entry | ${dut2} | ${dut2_if2} | ip6 | 1
 | | And COP interface enable or disable | ${dut1} | ${dut1_if1} | enable
@@ -88,23 +90,25 @@
 | tc02-78B-1t1c-ethip6-ip6base-copwhtlistbase-pdrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 routing and whitelist filters config with \
-| | ... | 1 thread, 1 phy core, 1 receive queue per NIC port. [Ver] Find PDR
+| | ... | 1 phy core, 1 receive queue per NIC port. [Ver] Find PDR
 | | ... | for 78 Byte frames using binary search start at 10GE linerate,
-| | ... | step 100kpps, LT=0.5%.
-| | [Tags] | 78B | 1T1C | STHREAD | PDRDISC | SKIP_PATCH
+| | ... | step 50kpps, LT=0.5%.
+| | [Tags] | 78B | 1C | PDRDISC | SKIP_PATCH
 | | ${framesize}= | Set Variable | ${78}
-| | ${min_rate}= | Set Variable | ${100000}
+| | ${min_rate}= | Set Variable | ${50000}
 | | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize}
 | | ${binary_min}= | Set Variable | ${min_rate}
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
-| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology
-| | And Add PCI devices to DUTs in 3-node single link topology
+| | Given Add worker threads and rxqueues to all DUTs | 1
+| | And Add PCI devices to all DUTs
 | | And Add no multi seg to all DUTs
 | | And Apply startup configuration on all VPP DUTs
 | | When Initialize IPv6 forwarding in 3-node circular topology
-| | And Add fib table | ${dut1} | 2001:1:: | 64 | 1 | local
-| | And Add fib table | ${dut2} | 2001:2:: | 64 | 1 | local
+| | And Add Fib Table | ${dut1} | 1 | ipv6=${TRUE}
+| | And Vpp Route Add | ${dut1} | 2001:1:: | 64 | vrf=1 | local=${TRUE}
+| | And Add Fib Table | ${dut2} | 1 | ipv6=${TRUE}
+| | And Vpp Route Add | ${dut2} | 2001:2:: | 64 | vrf=1 | local=${TRUE}
 | | And COP Add whitelist Entry | ${dut1} | ${dut1_if1} | ip6 | 1
 | | And COP Add whitelist Entry | ${dut2} | ${dut2_if2} | ip6 | 1
 | | And COP interface enable or disable | ${dut1} | ${dut1_if1} | enable
@@ -117,23 +121,25 @@
 | tc03-1518B-1t1c-ethip6-ip6base-copwhtlistbase-ndrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 routing and whitelist filters config with \
-| | ... | 1 thread, 1 phy core, 1 receive queue per NIC port. [Ver] Find NDR
+| | ... | 1 phy core, 1 receive queue per NIC port. [Ver] Find NDR
 | | ... | for 1518 Byte frames using binary search start at 10GE linerate,
-| | ... | step 10kpps.
-| | [Tags] | 1518B | 1T1C | STHREAD | NDRDISC
+| | ... | step 50kpps.
+| | [Tags] | 1518B | 1C | NDRDISC
 | | ${framesize}= | Set Variable | ${1518}
-| | ${min_rate}= | Set Variable | ${10000}
+| | ${min_rate}= | Set Variable | ${50000}
 | | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize}
 | | ${binary_min}= | Set Variable | ${min_rate}
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
-| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology
-| | And Add PCI devices to DUTs in 3-node single link topology
+| | Given Add worker threads and rxqueues to all DUTs | 1
+| | And Add PCI devices to all DUTs
 | | And Add no multi seg to all DUTs
 | | And Apply startup configuration on all VPP DUTs
 | | When Initialize IPv6 forwarding in 3-node circular topology
-| | And Add fib table | ${dut1} | 2001:1:: | 64 | 1 | local
-| | And Add fib table | ${dut2} | 2001:2:: | 64 | 1 | local
+| | And Add Fib Table | ${dut1} | 1 | ipv6=${TRUE}
+| | And Vpp Route Add | ${dut1} | 2001:1:: | 64 | vrf=1 | local=${TRUE}
+| | And Add Fib Table | ${dut2} | 1 | ipv6=${TRUE}
+| | And Vpp Route Add | ${dut2} | 2001:2:: | 64 | vrf=1 | local=${TRUE}
 | | And COP Add whitelist Entry | ${dut1} | ${dut1_if1} | ip6 | 1
 | | And COP Add whitelist Entry | ${dut2} | ${dut2_if2} | ip6 | 1
 | | And COP interface enable or disable | ${dut1} | ${dut1_if1} | enable
@@ -145,23 +151,25 @@
 | tc04-1518B-1t1c-ethip6-ip6base-copwhtlistbase-pdrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 routing and whitelist filters config with \
-| | ... | 1 thread, 1 phy core, 1 receive queue per NIC port. [Ver] Find PDR
+| | ... | 1 phy core, 1 receive queue per NIC port. [Ver] Find PDR
 | | ... | for 1518 Byte frames using binary search start at 10GE linerate,
-| | ... | step 10kpps, LT=0.5%.
-| | [Tags] | 1518B | 1T1C | STHREAD | PDRDISC | SKIP_PATCH
+| | ... | step 50kpps, LT=0.5%.
+| | [Tags] | 1518B | 1C | PDRDISC | SKIP_PATCH
 | | ${framesize}= | Set Variable | ${1518}
-| | ${min_rate}= | Set Variable | ${10000}
+| | ${min_rate}= | Set Variable | ${50000}
 | | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize}
 | | ${binary_min}= | Set Variable | ${min_rate}
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
-| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology
-| | And Add PCI devices to DUTs in 3-node single link topology
+| | Given Add worker threads and rxqueues to all DUTs | 1
+| | And Add PCI devices to all DUTs
 | | And Add no multi seg to all DUTs
 | | And Apply startup configuration on all VPP DUTs
 | | When Initialize IPv6 forwarding in 3-node circular topology
-| | And Add fib table | ${dut1} | 2001:1:: | 64 | 1 | local
-| | And Add fib table | ${dut2} | 2001:2:: | 64 | 1 | local
+| | And Add Fib Table | ${dut1} | 1 | ipv6=${TRUE}
+| | And Vpp Route Add | ${dut1} | 2001:1:: | 64 | vrf=1 | local=${TRUE}
+| | And Add Fib Table | ${dut2} | 1 | ipv6=${TRUE}
+| | And Vpp Route Add | ${dut2} | 2001:2:: | 64 | vrf=1 | local=${TRUE}
 | | And COP Add whitelist Entry | ${dut1} | ${dut1_if1} | ip6 | 1
 | | And COP Add whitelist Entry | ${dut2} | ${dut2_if2} | ip6 | 1
 | | And COP interface enable or disable | ${dut1} | ${dut1_if1} | enable
@@ -174,22 +182,24 @@
 | tc05-9000B-1t1c-ethip6-ip6base-copwhtlistbase-ndrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 routing and whitelist filters config with \
-| | ... | 1 thread, 1 phy core, 1 receive queue per NIC port. [Ver] Find NDR
+| | ... | 1 phy core, 1 receive queue per NIC port. [Ver] Find NDR
 | | ... | for 9000 Byte frames using binary search start at 10GE linerate,
-| | ... | step 5kpps.
-| | [Tags] | 9000B | 1T1C | STHREAD | NDRDISC
+| | ... | step 10kpps.
+| | [Tags] | 9000B | 1C | NDRDISC
 | | ${framesize}= | Set Variable | ${9000}
 | | ${min_rate}= | Set Variable | ${10000}
 | | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize}
 | | ${binary_min}= | Set Variable | ${min_rate}
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
-| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology
-| | And Add PCI devices to DUTs in 3-node single link topology
+| | Given Add worker threads and rxqueues to all DUTs | 1
+| | And Add PCI devices to all DUTs
 | | And Apply startup configuration on all VPP DUTs
 | | When Initialize IPv6 forwarding in 3-node circular topology
-| | And Add fib table | ${dut1} | 2001:1:: | 64 | 1 | local
-| | And Add fib table | ${dut2} | 2001:2:: | 64 | 1 | local
+| | And Add Fib Table | ${dut1} | 1 | ipv6=${TRUE}
+| | And Vpp Route Add | ${dut1} | 2001:1:: | 64 | vrf=1 | local=${TRUE}
+| | And Add Fib Table | ${dut2} | 1 | ipv6=${TRUE}
+| | And Vpp Route Add | ${dut2} | 2001:2:: | 64 | vrf=1 | local=${TRUE}
 | | And COP Add whitelist Entry | ${dut1} | ${dut1_if1} | ip6 | 1
 | | And COP Add whitelist Entry | ${dut2} | ${dut2_if2} | ip6 | 1
 | | And COP interface enable or disable | ${dut1} | ${dut1_if1} | enable
@@ -201,22 +211,24 @@
 | tc06-9000B-1t1c-ethip6-ip6base-copwhtlistbase-pdrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 routing and whitelist filters config with \
-| | ... | 1 thread, 1 phy core, 1 receive queue per NIC port. [Ver] Find PDR
+| | ... | 1 phy core, 1 receive queue per NIC port. [Ver] Find PDR
 | | ... | for 9000 Byte frames using binary search start at 10GE linerate,
-| | ... | step 5kpps, LT=0.5%.
-| | [Tags] | 9000B | 1T1C | STHREAD | PDRDISC | SKIP_PATCH
+| | ... | step 10kpps, LT=0.5%.
+| | [Tags] | 9000B | 1C | PDRDISC | SKIP_PATCH
 | | ${framesize}= | Set Variable | ${9000}
 | | ${min_rate}= | Set Variable | ${10000}
 | | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize}
 | | ${binary_min}= | Set Variable | ${min_rate}
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
-| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology
-| | And Add PCI devices to DUTs in 3-node single link topology
+| | Given Add worker threads and rxqueues to all DUTs | 1
+| | And Add PCI devices to all DUTs
 | | And Apply startup configuration on all VPP DUTs
 | | When Initialize IPv6 forwarding in 3-node circular topology
-| | And Add fib table | ${dut1} | 2001:1:: | 64 | 1 | local
-| | And Add fib table | ${dut2} | 2001:2:: | 64 | 1 | local
+| | And Add Fib Table | ${dut1} | 1 | ipv6=${TRUE}
+| | And Vpp Route Add | ${dut1} | 2001:1:: | 64 | vrf=1 | local=${TRUE}
+| | And Add Fib Table | ${dut2} | 1 | ipv6=${TRUE}
+| | And Vpp Route Add | ${dut2} | 2001:2:: | 64 | vrf=1 | local=${TRUE}
 | | And COP Add whitelist Entry | ${dut1} | ${dut1_if1} | ip6 | 1
 | | And COP Add whitelist Entry | ${dut2} | ${dut2_if2} | ip6 | 1
 | | And COP interface enable or disable | ${dut1} | ${dut1_if1} | enable
@@ -229,23 +241,25 @@
 | tc07-78B-2t2c-ethip6-ip6base-copwhtlistbase-ndrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 routing and whitelist filters config with \
-| | ... | 2 threads, 2 phy cores, 1 receive queue per NIC port. [Ver] Find NDR
+| | ... | 2 phy cores, 1 receive queue per NIC port. [Ver] Find NDR
 | | ... | for 78 Byte frames using binary search start at 10GE linerate,
-| | ... | step 100kpps.
-| | [Tags] | 78B | 2T2C | MTHREAD | NDRDISC
+| | ... | step 50kpps.
+| | [Tags] | 78B | 2C | NDRDISC
 | | ${framesize}= | Set Variable | ${78}
-| | ${min_rate}= | Set Variable | ${100000}
+| | ${min_rate}= | Set Variable | ${50000}
 | | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize}
 | | ${binary_min}= | Set Variable | ${min_rate}
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
-| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology
-| | And Add PCI devices to DUTs in 3-node single link topology
+| | Given Add worker threads and rxqueues to all DUTs | 2
+| | And Add PCI devices to all DUTs
 | | And Add no multi seg to all DUTs
 | | And Apply startup configuration on all VPP DUTs
 | | When Initialize IPv6 forwarding in 3-node circular topology
-| | And Add fib table | ${dut1} | 2001:1:: | 64 | 1 | local
-| | And Add fib table | ${dut2} | 2001:2:: | 64 | 1 | local
+| | And Add Fib Table | ${dut1} | 1 | ipv6=${TRUE}
+| | And Vpp Route Add | ${dut1} | 2001:1:: | 64 | vrf=1 | local=${TRUE}
+| | And Add Fib Table | ${dut2} | 1 | ipv6=${TRUE}
+| | And Vpp Route Add | ${dut2} | 2001:2:: | 64 | vrf=1 | local=${TRUE}
 | | And COP Add whitelist Entry | ${dut1} | ${dut1_if1} | ip6 | 1
 | | And COP Add whitelist Entry | ${dut2} | ${dut2_if2} | ip6 | 1
 | | And COP interface enable or disable | ${dut1} | ${dut1_if1} | enable
@@ -257,23 +271,25 @@
 | tc08-78B-2t2c-ethip6-ip6base-copwhtlistbase-pdrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 routing and whitelist filters config with \
-| | ... | 2 threads, 2 phy cores, 1 receive queue per NIC port. [Ver] Find PDR
+| | ... | 2 phy cores, 1 receive queue per NIC port. [Ver] Find PDR
 | | ... | for 78 Byte frames using binary search start at 10GE linerate,
-| | ... | step 100kpps, LT=0.5%.
-| | [Tags] | 78B | 2T2C | MTHREAD | PDRDISC | SKIP_PATCH
+| | ... | step 50kpps, LT=0.5%.
+| | [Tags] | 78B | 2C | PDRDISC | SKIP_PATCH
 | | ${framesize}= | Set Variable | ${78}
-| | ${min_rate}= | Set Variable | ${100000}
+| | ${min_rate}= | Set Variable | ${50000}
 | | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize}
 | | ${binary_min}= | Set Variable | ${min_rate}
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
-| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology
-| | And Add PCI devices to DUTs in 3-node single link topology
+| | Given Add worker threads and rxqueues to all DUTs | 2
+| | And Add PCI devices to all DUTs
 | | And Add no multi seg to all DUTs
 | | And Apply startup configuration on all VPP DUTs
 | | When Initialize IPv6 forwarding in 3-node circular topology
-| | And Add fib table | ${dut1} | 2001:1:: | 64 | 1 | local
-| | And Add fib table | ${dut2} | 2001:2:: | 64 | 1 | local
+| | And Add Fib Table | ${dut1} | 1 | ipv6=${TRUE}
+| | And Vpp Route Add | ${dut1} | 2001:1:: | 64 | vrf=1 | local=${TRUE}
+| | And Add Fib Table | ${dut2} | 1 | ipv6=${TRUE}
+| | And Vpp Route Add | ${dut2} | 2001:2:: | 64 | vrf=1 | local=${TRUE}
 | | And COP Add whitelist Entry | ${dut1} | ${dut1_if1} | ip6 | 1
 | | And COP Add whitelist Entry | ${dut2} | ${dut2_if2} | ip6 | 1
 | | And COP interface enable or disable | ${dut1} | ${dut1_if1} | enable
@@ -286,23 +302,25 @@
 | tc09-1518B-2t2c-ethip6-ip6base-copwhtlistbase-ndrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 routing and whitelist filters config with \
-| | ... | 2 threads, 2 phy cores, 1 receive queue per NIC port. [Ver] Find NDR
+| | ... | 2 phy cores, 1 receive queue per NIC port. [Ver] Find NDR
 | | ... | for 1518 Byte frames using binary search start at 10GE linerate,
-| | ... | step 10kpps.
-| | [Tags] | 1518B | 2T2C | MTHREAD | NDRDISC | SKIP_PATCH
+| | ... | step 50kpps.
+| | [Tags] | 1518B | 2C | NDRDISC | SKIP_PATCH
 | | ${framesize}= | Set Variable | ${1518}
-| | ${min_rate}= | Set Variable | ${10000}
+| | ${min_rate}= | Set Variable | ${50000}
 | | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize}
 | | ${binary_min}= | Set Variable | ${min_rate}
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
-| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology
-| | And Add PCI devices to DUTs in 3-node single link topology
+| | Given Add worker threads and rxqueues to all DUTs | 2
+| | And Add PCI devices to all DUTs
 | | And Add no multi seg to all DUTs
 | | And Apply startup configuration on all VPP DUTs
 | | When Initialize IPv6 forwarding in 3-node circular topology
-| | And Add fib table | ${dut1} | 2001:1:: | 64 | 1 | local
-| | And Add fib table | ${dut2} | 2001:2:: | 64 | 1 | local
+| | And Add Fib Table | ${dut1} | 1 | ipv6=${TRUE}
+| | And Vpp Route Add | ${dut1} | 2001:1:: | 64 | vrf=1 | local=${TRUE}
+| | And Add Fib Table | ${dut2} | 1 | ipv6=${TRUE}
+| | And Vpp Route Add | ${dut2} | 2001:2:: | 64 | vrf=1 | local=${TRUE}
 | | And COP Add whitelist Entry | ${dut1} | ${dut1_if1} | ip6 | 1
 | | And COP Add whitelist Entry | ${dut2} | ${dut2_if2} | ip6 | 1
 | | And COP interface enable or disable | ${dut1} | ${dut1_if1} | enable
@@ -314,23 +332,25 @@
 | tc10-1518B-2t2c-ethip6-ip6base-copwhtlistbase-pdrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 routing and whitelist filters config with \
-| | ... | 2 threads, 2 phy cores, 1 receive queue per NIC port. [Ver] Find PDR
+| | ... | 2 phy cores, 1 receive queue per NIC port. [Ver] Find PDR
 | | ... | for 1518 Byte frames using binary search start at 10GE linerate,
-| | ... | step 10kpps, LT=0.5%.
-| | [Tags] | 1518B | 2T2C | MTHREAD | PDRDISC | SKIP_PATCH
+| | ... | step 50kpps, LT=0.5%.
+| | [Tags] | 1518B | 2C | PDRDISC | SKIP_PATCH
 | | ${framesize}= | Set Variable | ${1518}
-| | ${min_rate}= | Set Variable | ${10000}
+| | ${min_rate}= | Set Variable | ${50000}
 | | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize}
 | | ${binary_min}= | Set Variable | ${min_rate}
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
-| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology
-| | And Add PCI devices to DUTs in 3-node single link topology
+| | Given Add worker threads and rxqueues to all DUTs | 2
+| | And Add PCI devices to all DUTs
 | | And Add no multi seg to all DUTs
 | | And Apply startup configuration on all VPP DUTs
 | | When Initialize IPv6 forwarding in 3-node circular topology
-| | And Add fib table | ${dut1} | 2001:1:: | 64 | 1 | local
-| | And Add fib table | ${dut2} | 2001:2:: | 64 | 1 | local
+| | And Add Fib Table | ${dut1} | 1 | ipv6=${TRUE}
+| | And Vpp Route Add | ${dut1} | 2001:1:: | 64 | vrf=1 | local=${TRUE}
+| | And Add Fib Table | ${dut2} | 1 | ipv6=${TRUE}
+| | And Vpp Route Add | ${dut2} | 2001:2:: | 64 | vrf=1 | local=${TRUE}
 | | And COP Add whitelist Entry | ${dut1} | ${dut1_if1} | ip6 | 1
 | | And COP Add whitelist Entry | ${dut2} | ${dut2_if2} | ip6 | 1
 | | And COP interface enable or disable | ${dut1} | ${dut1_if1} | enable
@@ -343,22 +363,24 @@
 | tc11-9000B-2t2c-ethip6-ip6base-copwhtlistbase-ndrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 routing and whitelist filters config with \
-| | ... | 2 threads, 2 phy cores, 1 receive queue per NIC port. [Ver] Find NDR
+| | ... | 2 phy cores, 1 receive queue per NIC port. [Ver] Find NDR
 | | ... | for 9000 Byte frames using binary search start at 10GE linerate,
-| | ... | step 5kpps.
-| | [Tags] | 9000B | 2T2C | MTHREAD | NDRDISC | SKIP_PATCH
+| | ... | step 10kpps.
+| | [Tags] | 9000B | 2C | NDRDISC | SKIP_PATCH
 | | ${framesize}= | Set Variable | ${9000}
 | | ${min_rate}= | Set Variable | ${10000}
 | | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize}
 | | ${binary_min}= | Set Variable | ${min_rate}
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
-| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology
-| | And Add PCI devices to DUTs in 3-node single link topology
+| | Given Add worker threads and rxqueues to all DUTs | 2
+| | And Add PCI devices to all DUTs
 | | And Apply startup configuration on all VPP DUTs
 | | When Initialize IPv6 forwarding in 3-node circular topology
-| | And Add fib table | ${dut1} | 2001:1:: | 64 | 1 | local
-| | And Add fib table | ${dut2} | 2001:2:: | 64 | 1 | local
+| | And Add Fib Table | ${dut1} | 1 | ipv6=${TRUE}
+| | And Vpp Route Add | ${dut1} | 2001:1:: | 64 | vrf=1 | local=${TRUE}
+| | And Add Fib Table | ${dut2} | 1 | ipv6=${TRUE}
+| | And Vpp Route Add | ${dut2} | 2001:2:: | 64 | vrf=1 | local=${TRUE}
 | | And COP Add whitelist Entry | ${dut1} | ${dut1_if1} | ip6 | 1
 | | And COP Add whitelist Entry | ${dut2} | ${dut2_if2} | ip6 | 1
 | | And COP interface enable or disable | ${dut1} | ${dut1_if1} | enable
@@ -370,22 +392,24 @@
 | tc12-9000B-2t2c-ethip6-ip6base-copwhtlistbase-pdrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 routing and whitelist filters config with \
-| | ... | 2 threads, 2 phy cores, 1 receive queue per NIC port. [Ver] Find PDR
+| | ... | 2 phy cores, 1 receive queue per NIC port. [Ver] Find PDR
 | | ... | for 9000 Byte frames using binary search start at 10GE linerate,
-| | ... | step 5kpps, LT=0.5%.
-| | [Tags] | 9000B | 2T2C | MTHREAD | PDRDISC | SKIP_PATCH
+| | ... | step 10kpps, LT=0.5%.
+| | [Tags] | 9000B | 2C | PDRDISC | SKIP_PATCH
 | | ${framesize}= | Set Variable | ${9000}
 | | ${min_rate}= | Set Variable | ${10000}
 | | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize}
 | | ${binary_min}= | Set Variable | ${min_rate}
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
-| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology
-| | And Add PCI devices to DUTs in 3-node single link topology
+| | Given Add worker threads and rxqueues to all DUTs | 2
+| | And Add PCI devices to all DUTs
 | | And Apply startup configuration on all VPP DUTs
 | | When Initialize IPv6 forwarding in 3-node circular topology
-| | And Add fib table | ${dut1} | 2001:1:: | 64 | 1 | local
-| | And Add fib table | ${dut2} | 2001:2:: | 64 | 1 | local
+| | And Add Fib Table | ${dut1} | 1 | ipv6=${TRUE}
+| | And Vpp Route Add | ${dut1} | 2001:1:: | 64 | vrf=1 | local=${TRUE}
+| | And Add Fib Table | ${dut2} | 1 | ipv6=${TRUE}
+| | And Vpp Route Add | ${dut2} | 2001:2:: | 64 | vrf=1 | local=${TRUE}
 | | And COP Add whitelist Entry | ${dut1} | ${dut1_if1} | ip6 | 1
 | | And COP Add whitelist Entry | ${dut2} | ${dut2_if2} | ip6 | 1
 | | And COP interface enable or disable | ${dut1} | ${dut1_if1} | enable
@@ -398,23 +422,25 @@
 | tc13-78B-4t4c-ethip6-ip6base-copwhtlistbase-ndrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 routing and whitelist filters config with \
-| | ... | 4 threads, 4 phy cores, 2 receive queue per NIC port. [Ver] Find NDR
+| | ... | 4 phy cores, 2 receive queue per NIC port. [Ver] Find NDR
 | | ... | for 78 Byte frames using binary search start at 10GE linerate,
-| | ... | step 100kpps.
-| | [Tags] | 78B | 4T4C | MTHREAD | NDRDISC
+| | ... | step 50kpps.
+| | [Tags] | 78B | 4C | NDRDISC
 | | ${framesize}= | Set Variable | ${78}
-| | ${min_rate}= | Set Variable | ${100000}
+| | ${min_rate}= | Set Variable | ${50000}
 | | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize}
 | | ${binary_min}= | Set Variable | ${min_rate}
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
-| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology
-| | And Add PCI devices to DUTs in 3-node single link topology
+| | Given Add worker threads and rxqueues to all DUTs | 4
+| | And Add PCI devices to all DUTs
 | | And Add no multi seg to all DUTs
 | | And Apply startup configuration on all VPP DUTs
 | | When Initialize IPv6 forwarding in 3-node circular topology
-| | And Add fib table | ${dut1} | 2001:1:: | 64 | 1 | local
-| | And Add fib table | ${dut2} | 2001:2:: | 64 | 1 | local
+| | And Add Fib Table | ${dut1} | 1 | ipv6=${TRUE}
+| | And Vpp Route Add | ${dut1} | 2001:1:: | 64 | vrf=1 | local=${TRUE}
+| | And Add Fib Table | ${dut2} | 1 | ipv6=${TRUE}
+| | And Vpp Route Add | ${dut2} | 2001:2:: | 64 | vrf=1 | local=${TRUE}
 | | And COP Add whitelist Entry | ${dut1} | ${dut1_if1} | ip6 | 1
 | | And COP Add whitelist Entry | ${dut2} | ${dut2_if2} | ip6 | 1
 | | And COP interface enable or disable | ${dut1} | ${dut1_if1} | enable
@@ -426,23 +452,25 @@
 | tc14-78B-4t4c-ethip6-ip6base-copwhtlistbase-pdrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 routing and whitelist filters config with \
-| | ... | 4 threads, 4 phy cores, 2 receive queue per NIC port. [Ver] Find PDR
+| | ... | 4 phy cores, 2 receive queue per NIC port. [Ver] Find PDR
 | | ... | for 78 Byte frames using binary search start at 10GE linerate,
-| | ... | step 100kpps, LT=0.5%.
-| | [Tags] | 78B | 4T4C | MTHREAD | PDRDISC | SKIP_PATCH
+| | ... | step 50kpps, LT=0.5%.
+| | [Tags] | 78B | 4C | PDRDISC | SKIP_PATCH
 | | ${framesize}= | Set Variable | ${78}
-| | ${min_rate}= | Set Variable | ${100000}
+| | ${min_rate}= | Set Variable | ${50000}
 | | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize}
 | | ${binary_min}= | Set Variable | ${min_rate}
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
-| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology
-| | And Add PCI devices to DUTs in 3-node single link topology
+| | Given Add worker threads and rxqueues to all DUTs | 4
+| | And Add PCI devices to all DUTs
 | | And Add no multi seg to all DUTs
 | | And Apply startup configuration on all VPP DUTs
 | | When Initialize IPv6 forwarding in 3-node circular topology
-| | And Add fib table | ${dut1} | 2001:1:: | 64 | 1 | local
-| | And Add fib table | ${dut2} | 2001:2:: | 64 | 1 | local
+| | And Add Fib Table | ${dut1} | 1 | ipv6=${TRUE}
+| | And Vpp Route Add | ${dut1} | 2001:1:: | 64 | vrf=1 | local=${TRUE}
+| | And Add Fib Table | ${dut2} | 1 | ipv6=${TRUE}
+| | And Vpp Route Add | ${dut2} | 2001:2:: | 64 | vrf=1 | local=${TRUE}
 | | And COP Add whitelist Entry | ${dut1} | ${dut1_if1} | ip6 | 1
 | | And COP Add whitelist Entry | ${dut2} | ${dut2_if2} | ip6 | 1
 | | And COP interface enable or disable | ${dut1} | ${dut1_if1} | enable
@@ -455,23 +483,25 @@
 | tc15-1518B-4t4c-ethip6-ip6base-copwhtlistbase-ndrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 routing and whitelist filters config with \
-| | ... | 4 threads, 4 phy cores, 2 receive queue per NIC port. [Ver] Find NDR
+| | ... | 4 phy cores, 2 receive queue per NIC port. [Ver] Find NDR
 | | ... | for 1518 Byte frames using binary search start at 10GE linerate,
-| | ... | step 10kpps.
-| | [Tags] | 1518B | 4T4C | MTHREAD | NDRDISC | SKIP_PATCH
+| | ... | step 50kpps.
+| | [Tags] | 1518B | 4C | NDRDISC | SKIP_PATCH
 | | ${framesize}= | Set Variable | ${1518}
-| | ${min_rate}= | Set Variable | ${10000}
+| | ${min_rate}= | Set Variable | ${50000}
 | | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize}
 | | ${binary_min}= | Set Variable | ${min_rate}
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
-| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology
-| | And Add PCI devices to DUTs in 3-node single link topology
+| | Given Add worker threads and rxqueues to all DUTs | 4
+| | And Add PCI devices to all DUTs
 | | And Add no multi seg to all DUTs
 | | And Apply startup configuration on all VPP DUTs
 | | When Initialize IPv6 forwarding in 3-node circular topology
-| | And Add fib table | ${dut1} | 2001:1:: | 64 | 1 | local
-| | And Add fib table | ${dut2} | 2001:2:: | 64 | 1 | local
+| | And Add Fib Table | ${dut1} | 1 | ipv6=${TRUE}
+| | And Vpp Route Add | ${dut1} | 2001:1:: | 64 | vrf=1 | local=${TRUE}
+| | And Add Fib Table | ${dut2} | 1 | ipv6=${TRUE}
+| | And Vpp Route Add | ${dut2} | 2001:2:: | 64 | vrf=1 | local=${TRUE}
 | | And COP Add whitelist Entry | ${dut1} | ${dut1_if1} | ip6 | 1
 | | And COP Add whitelist Entry | ${dut2} | ${dut2_if2} | ip6 | 1
 | | And COP interface enable or disable | ${dut1} | ${dut1_if1} | enable
@@ -483,23 +513,25 @@
 | tc16-1518B-4t4c-ethip6-ip6base-copwhtlistbase-pdrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 routing and whitelist filters config with \
-| | ... | 4 threads, 4 phy cores, 2 receive queue per NIC port. [Ver] Find PDR
+| | ... | 4 phy cores, 2 receive queue per NIC port. [Ver] Find PDR
 | | ... | for 1518 Byte frames using binary search start at 10GE linerate,
-| | ... | step 10kpps, LT=0.5%.
-| | [Tags] | 1518B | 4T4C | MTHREAD | PDRDISC | SKIP_PATCH
+| | ... | step 50kpps, LT=0.5%.
+| | [Tags] | 1518B | 4C | PDRDISC | SKIP_PATCH
 | | ${framesize}= | Set Variable | ${1518}
-| | ${min_rate}= | Set Variable | ${10000}
+| | ${min_rate}= | Set Variable | ${50000}
 | | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize}
 | | ${binary_min}= | Set Variable | ${min_rate}
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
-| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology
-| | And Add PCI devices to DUTs in 3-node single link topology
+| | Given Add worker threads and rxqueues to all DUTs | 4
+| | And Add PCI devices to all DUTs
 | | And Add no multi seg to all DUTs
 | | And Apply startup configuration on all VPP DUTs
 | | When Initialize IPv6 forwarding in 3-node circular topology
-| | And Add fib table | ${dut1} | 2001:1:: | 64 | 1 | local
-| | And Add fib table | ${dut2} | 2001:2:: | 64 | 1 | local
+| | And Add Fib Table | ${dut1} | 1 | ipv6=${TRUE}
+| | And Vpp Route Add | ${dut1} | 2001:1:: | 64 | vrf=1 | local=${TRUE}
+| | And Add Fib Table | ${dut2} | 1 | ipv6=${TRUE}
+| | And Vpp Route Add | ${dut2} | 2001:2:: | 64 | vrf=1 | local=${TRUE}
 | | And COP Add whitelist Entry | ${dut1} | ${dut1_if1} | ip6 | 1
 | | And COP Add whitelist Entry | ${dut2} | ${dut2_if2} | ip6 | 1
 | | And COP interface enable or disable | ${dut1} | ${dut1_if1} | enable
@@ -512,22 +544,24 @@
 | tc17-9000B-4t4c-ethip6-ip6base-copwhtlistbase-ndrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 routing and whitelist filters config with \
-| | ... | 4 threads, 4 phy cores, 2 receive queue per NIC port. [Ver] Find NDR
+| | ... | 4 phy cores, 2 receive queue per NIC port. [Ver] Find NDR
 | | ... | for 9000 Byte frames using binary search start at 10GE linerate,
-| | ... | step 5kpps.
-| | [Tags] | 9000B | 4T4C | MTHREAD | NDRDISC | SKIP_PATCH
+| | ... | step 10kpps.
+| | [Tags] | 9000B | 4C | NDRDISC | SKIP_PATCH
 | | ${framesize}= | Set Variable | ${9000}
 | | ${min_rate}= | Set Variable | ${10000}
 | | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize}
 | | ${binary_min}= | Set Variable | ${min_rate}
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
-| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology
-| | And Add PCI devices to DUTs in 3-node single link topology
+| | Given Add worker threads and rxqueues to all DUTs | 4
+| | And Add PCI devices to all DUTs
 | | And Apply startup configuration on all VPP DUTs
 | | When Initialize IPv6 forwarding in 3-node circular topology
-| | And Add fib table | ${dut1} | 2001:1:: | 64 | 1 | local
-| | And Add fib table | ${dut2} | 2001:2:: | 64 | 1 | local
+| | And Add Fib Table | ${dut1} | 1 | ipv6=${TRUE}
+| | And Vpp Route Add | ${dut1} | 2001:1:: | 64 | vrf=1 | local=${TRUE}
+| | And Add Fib Table | ${dut2} | 1 | ipv6=${TRUE}
+| | And Vpp Route Add | ${dut2} | 2001:2:: | 64 | vrf=1 | local=${TRUE}
 | | And COP Add whitelist Entry | ${dut1} | ${dut1_if1} | ip6 | 1
 | | And COP Add whitelist Entry | ${dut2} | ${dut2_if2} | ip6 | 1
 | | And COP interface enable or disable | ${dut1} | ${dut1_if1} | enable
@@ -539,22 +573,24 @@
 | tc18-9000B-4t4c-ethip6-ip6base-copwhtlistbase-pdrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv6 routing and whitelist filters config with \
-| | ... | 4 threads, 4 phy cores, 2 receive queue per NIC port. [Ver] Find PDR
+| | ... | 4 phy cores, 2 receive queue per NIC port. [Ver] Find PDR
 | | ... | for 9000 Byte frames using binary search start at 10GE linerate,
-| | ... | step 5kpps, LT=0.5%.
-| | [Tags] | 9000B | 4T4C | MTHREAD | PDRDISC | SKIP_PATCH
+| | ... | step 10kpps, LT=0.5%.
+| | [Tags] | 9000B | 4C | PDRDISC | SKIP_PATCH
 | | ${framesize}= | Set Variable | ${9000}
 | | ${min_rate}= | Set Variable | ${10000}
 | | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize}
 | | ${binary_min}= | Set Variable | ${min_rate}
 | | ${binary_max}= | Set Variable | ${max_rate}
 | | ${threshold}= | Set Variable | ${min_rate}
-| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology
-| | And Add PCI devices to DUTs in 3-node single link topology
+| | Given Add worker threads and rxqueues to all DUTs | 4
+| | And Add PCI devices to all DUTs
 | | And Apply startup configuration on all VPP DUTs
 | | When Initialize IPv6 forwarding in 3-node circular topology
-| | And Add fib table | ${dut1} | 2001:1:: | 64 | 1 | local
-| | And Add fib table | ${dut2} | 2001:2:: | 64 | 1 | local
+| | And Add Fib Table | ${dut1} | 1 | ipv6=${TRUE}
+| | And Vpp Route Add | ${dut1} | 2001:1:: | 64 | vrf=1 | local=${TRUE}
+| | And Add Fib Table | ${dut2} | 1 | ipv6=${TRUE}
+| | And Vpp Route Add | ${dut2} | 2001:2:: | 64 | vrf=1 | local=${TRUE}
 | | And COP Add whitelist Entry | ${dut1} | ${dut1_if1} | ip6 | 1
 | | And COP Add whitelist Entry | ${dut2} | ${dut2_if2} | ip6 | 1
 | | And COP interface enable or disable | ${dut1} | ${dut1_if1} | enable