| 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
+| | 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
| 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
+| | 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
| 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
+| | 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
| 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
+| | 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
| 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_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
+| | 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
| 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_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
+| | 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
| 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
+| | 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
| 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
+| | 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
| 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
+| | 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
| 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
+| | 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
| 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_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
+| | 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
| 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_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
+| | 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
| 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
+| | 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
| 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
+| | 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
| 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
+| | 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
| 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
+| | 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
| 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_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
+| | 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
| 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_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
+| | 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