FIX: apply changes implemented for FIB settings

Change-Id: I00c3407f4324e282c438cb8fcd44470c331089c5
Signed-off-by: Jan Gelety <jgelety@cisco.com>
(cherry picked from commit 9d62c4fa8023daaf4aa6426b9648279df51dad03)

5 files changed, 281 insertions, 160 deletions

diff --git a/resources/libraries/robot/performance/performance_configuration.robot b/resources/libraries/robot/performance/performance_configuration.robot
index 7db6577095..0b7eafa761 100644
--- a/resources/libraries/robot/performance/performance_configuration.robot
+++ b/resources/libraries/robot/performance/performance_configuration.robot
@@ -236,30 +236,30 @@
 | | ${dut2_vif2}= | Set Variable | ${dut2_vhost_if2}
 | | Set Interface State | ${dut2} | ${dut2_vif1} | up
 | | Set Interface State | ${dut2} | ${dut2_vif2} | up
-| | ${dut1_vif1_idx}= | Get Interface SW Index | ${dut1} | ${dut1_vif1}
-| | ${dut1_vif2_idx}= | Get Interface SW Index | ${dut1} | ${dut1_vif2}
-| | ${dut1_if1_idx}= | Get Interface SW Index | ${dut1} | ${dut1_if1}
-| | ${dut1_if2_idx}= | Get Interface SW Index | ${dut1} | ${dut1_if2}
-| | ${dut2_vif1_idx}= | Get Interface SW Index | ${dut2} | ${dut2_vif1}
-| | ${dut2_vif2_idx}= | Get Interface SW Index | ${dut2} | ${dut2_vif2}
-| | ${dut2_if1_idx}= | Get Interface SW Index | ${dut2} | ${dut2_if1}
-| | ${dut2_if2_idx}= | Get Interface SW Index | ${dut2} | ${dut2_if2}
-| | Add fib table | ${dut1} | 20.20.20.0 | 24 | ${fib_table_1}
-| | ... | via 4.4.4.2 sw_if_index ${dut1_vif1_idx} multipath
-| | Add fib table | ${dut1} | 10.10.10.0 | 24 | ${fib_table_1}
-| | ... | via 1.1.1.2 sw_if_index ${dut1_if1_idx} multipath
-| | Add fib table | ${dut1} | 20.20.20.0 | 24 | ${fib_table_2}
-| | ... | via 2.2.2.2 sw_if_index ${dut1_if2_idx} multipath
-| | Add fib table | ${dut1} | 10.10.10.0 | 24 | ${fib_table_2}
-| | ... | via 5.5.5.2 sw_if_index ${dut1_vif2_idx} multipath
-| | Add fib table | ${dut2} | 10.10.10.0 | 24 | ${fib_table_1}
-| | ... | via 2.2.2.1 sw_if_index ${dut2_if1_idx} multipath
-| | Add fib table | ${dut2} | 20.20.20.0 | 24 | ${fib_table_1}
-| | ... | via 4.4.4.1 sw_if_index ${dut2_vif1_idx} multipath
-| | Add fib table | ${dut2} | 10.10.10.0 | 24 | ${fib_table_2}
-| | ... | via 5.5.5.2 sw_if_index ${dut2_vif2_idx} multipath
-| | Add fib table | ${dut2} | 20.20.20.0 | 24 | ${fib_table_2}
-| | ... | via 3.3.3.2 sw_if_index ${dut2_if2_idx} multipath
+| | Add Fib Table | ${dut1} | ${fib_table_1}
+| | And Vpp Route Add | ${dut1} | 20.20.20.0 | 24 | vrf=${fib_table_1}
+| | ... | gateway=4.4.4.2 | interface=${dut1_vif1} | multipath=${TRUE}
+| | Add Fib Table | ${dut1} | ${fib_table_1}
+| | And Vpp Route Add | ${dut1} | 10.10.10.0 | 24 | vrf=${fib_table_1}
+| | ... | gateway=1.1.1.2 | interface=${dut1_if1} | multipath=${TRUE}
+| | Add Fib Table | ${dut1} | ${fib_table_2}
+| | And Vpp Route Add | ${dut1} | 20.20.20.0 | 24 | vrf=${fib_table_2}
+| | ... | gateway=2.2.2.2 | interface=${dut1_if2} | multipath=${TRUE}
+| | Add Fib Table | ${dut1} | ${fib_table_2}
+| | And Vpp Route Add | ${dut1} | 10.10.10.0 | 24 | vrf=${fib_table_2}
+| | ... | gateway=5.5.5.2 | interface=${dut1_vif2} | multipath=${TRUE}
+| | Add Fib Table | ${dut2} | ${fib_table_1}
+| | And Vpp Route Add | ${dut2} | 10.10.10.0 | 24 | vrf=${fib_table_1}
+| | ... | gateway=2.2.2.1 | interface=${dut2_if1} | multipath=${TRUE}
+| | Add Fib Table | ${dut2} | ${fib_table_1}
+| | And Vpp Route Add | ${dut2} | 20.20.20.0 | 24 | vrf=${fib_table_1}
+| | ... | gateway=4.4.4.1 | interface=${dut2_vif1} | multipath=${TRUE}
+| | Add Fib Table | ${dut2} | ${fib_table_2}
+| | And Vpp Route Add | ${dut2} | 10.10.10.0 | 24 | vrf=${fib_table_2}
+| | ... | gateway=5.5.5.2 | interface=${dut2_vif2} | multipath=${TRUE}
+| | Add Fib Table | ${dut2} | ${fib_table_2}
+| | And Vpp Route Add | ${dut2} | 20.20.20.0 | 24 | vrf=${fib_table_2}
+| | ... | gateway=3.3.3.2 | interface=${dut2_if2} | multipath=${TRUE}
 | | Assign Interface To Fib Table | ${dut1} | ${dut1_if1} | ${fib_table_1}
 | | Assign Interface To Fib Table | ${dut1} | ${dut1_vif1} | ${fib_table_1}
 | | Assign Interface To Fib Table | ${dut1} | ${dut1_if2} | ${fib_table_2}
@@ -280,6 +280,10 @@
 | | ${dut1_if2_mac}= | Get Interface MAC | ${dut1} | ${dut1_if2}
 | | ${tg1_if2_mac}= | Get Interface MAC | ${tg} | ${tg_if2}
 | | ${dut2_if1_mac}= | Get Interface MAC | ${dut2} | ${dut2_if1}
+| | ${dut1_vif1_idx}= | Get Interface SW Index | ${dut1} | ${dut1_vif1}
+| | ${dut1_vif2_idx}= | Get Interface SW Index | ${dut1} | ${dut1_vif2}
+| | ${dut2_vif1_idx}= | Get Interface SW Index | ${dut2} | ${dut2_vif1}
+| | ${dut2_vif2_idx}= | Get Interface SW Index | ${dut2} | ${dut2_vif2}
 | | ${dut1_vif1_mac}= | Get Vhost User Mac By Sw Index | ${dut1}
 | | ... | ${dut1_vif1_idx}
 | | ${dut1_vif2_mac}= | Get Vhost User Mac By Sw Index | ${dut1}
@@ -347,18 +351,18 @@
 | | Set interfaces in path in 3-node circular topology up
 | | ${fib_table_1}= | Set Variable | ${101}
 | | ${fib_table_2}= | Evaluate | ${fib_table_1}+${nr}
-| | ${dut1_if1_idx}= | Get Interface SW Index | ${dut1} | ${dut1_if1}
-| | ${dut1_if2_idx}= | Get Interface SW Index | ${dut1} | ${dut1_if2}
-| | Add fib table | ${dut1} | 10.10.10.0 | 24 | ${fib_table_1}
-| | ... | via 1.1.1.2 sw_if_index ${dut1_if1_idx} multipath
-| | Add fib table | ${dut1} | 20.20.20.0 | 24 | ${fib_table_2}
-| | ... | via 2.2.2.2 sw_if_index ${dut1_if2_idx} multipath
-| | ${dut2_if1_idx}= | Get Interface SW Index | ${dut2} | ${dut2_if1}
-| | ${dut2_if2_idx}= | Get Interface SW Index | ${dut2} | ${dut2_if2}
-| | Add fib table | ${dut2} | 10.10.10.0 | 24 | ${fib_table_1}
-| | ... | via 2.2.2.1 sw_if_index ${dut2_if1_idx} multipath
-| | Add fib table | ${dut2} | 20.20.20.0 | 24 | ${fib_table_2}
-| | ... | via 3.3.3.2 sw_if_index ${dut2_if2_idx} multipath
+| | Add Fib Table | ${dut1} | ${fib_table_1}
+| | And Vpp Route Add | ${dut1} | 10.10.10.0 | 24 | vrf=${fib_table_1}
+| | ... | gateway=1.1.1.2 | interface=${dut1_if1} | multipath=${TRUE}
+| | Add Fib Table | ${dut1} | ${fib_table_2}
+| | And Vpp Route Add | ${dut1} | 20.20.20.0 | 24 | vrf=${fib_table_2}
+| | ... | gateway=2.2.2.2 | interface=${dut1_if2} | multipath=${TRUE}
+| | Add Fib Table | ${dut2} | ${fib_table_1}
+| | And Vpp Route Add | ${dut2} | 10.10.10.0 | 24 | vrf=${fib_table_1}
+| | ... | gateway=2.2.2.1 | interface=${dut2_if1} | multipath=${TRUE}
+| | Add Fib Table | ${dut2} | ${fib_table_2}
+| | And Vpp Route Add | ${dut2} | 20.20.20.0 | 24 | vrf=${fib_table_2}
+| | ... | gateway=3.3.3.2 | interface=${dut2_if2} | multipath=${TRUE}
 | | Assign Interface To Fib Table | ${dut1} | ${dut1_if1} | ${fib_table_1}
 | | Assign Interface To Fib Table | ${dut1} | ${dut1_if2} | ${fib_table_2}
 | | Assign Interface To Fib Table | ${dut2} | ${dut2_if1} | ${fib_table_1}
@@ -400,27 +404,27 @@
 | | | ... | dut1-vhost-${number}-if2
 | | | Set Interface State | ${dut1} | ${dut1-vhost-${number}-if1} | up
 | | | Set Interface State | ${dut1} | ${dut1-vhost-${number}-if2} | up
-| | | ${dut1_vif1_idx}= | Get Interface SW Index | ${dut1}
-| | | ... | ${dut1-vhost-${number}-if1}
-| | | ${dut1_vif2_idx}= | Get Interface SW Index | ${dut1}
-| | | ... | ${dut1-vhost-${number}-if2}
 | | | Configure vhost interfaces for L2BD forwarding | ${dut2}
 | | | ... | ${sock1} | ${sock2} | dut2-vhost-${number}-if1
 | | | ... | dut2-vhost-${number}-if2
 | | | Set Interface State | ${dut2} | ${dut2-vhost-${number}-if1} | up
 | | | Set Interface State | ${dut2} | ${dut2-vhost-${number}-if2} | up
-| | | ${dut2_vif1_idx}= | Get Interface SW Index | ${dut2}
-| | | ... | ${dut2-vhost-${number}-if1}
-| | | ${dut2_vif2_idx}= | Get Interface SW Index | ${dut2}
-| | | ... | ${dut2-vhost-${number}-if2}
-| | | Add fib table | ${dut1} | 20.20.20.0 | 24 | ${fib_table_1}
-| | | ... | via ${ip_net_vif1}.1 sw_if_index ${dut1_vif1_idx} multipath
-| | | Add fib table | ${dut1} | 10.10.10.0 | 24 | ${fib_table_2}
-| | | ... | via ${ip_net_vif2}.2 sw_if_index ${dut1_vif2_idx} multipath
-| | | Add fib table | ${dut2} | 20.20.20.0 | 24 | ${fib_table_1}
-| | | ... | via ${ip_net_vif1}.1 sw_if_index ${dut2_vif1_idx} multipath
-| | | Add fib table | ${dut2} | 10.10.10.0 | 24 | ${fib_table_2}
-| | | ... | via ${ip_net_vif2}.2 sw_if_index ${dut2_vif2_idx} multipath
+| | | Add Fib Table | ${dut1} | ${fib_table_1}
+| | | And Vpp Route Add | ${dut1} | 20.20.20.0 | 24 | vrf=${fib_table_1}
+| | | ... | gateway=${ip_net_vif1}.1 | interface=${dut1_vif1}
+| | | ... | multipath=${TRUE}
+| | | Add Fib Table | ${dut1} | ${fib_table_2}
+| | | And Vpp Route Add | ${dut1} | 10.10.10.0 | 24 | vrf=${fib_table_2}
+| | | ... | gateway=${ip_net_vif2}.2 | interface=${dut1_vif2}
+| | | ... | multipath=${TRUE}
+| | | Add Fib Table | ${dut2} | ${fib_table_1}
+| | | And Vpp Route Add | ${dut2} | 20.20.20.0 | 24 | vrf=${fib_table_1}
+| | | ... | gateway=${ip_net_vif1}.1 | interface=${dut2_vif1}
+| | | ... | multipath=${TRUE}
+| | | Add Fib Table | ${dut2} | ${fib_table_2}
+| | | And Vpp Route Add | ${dut2} | 10.10.10.0 | 24 | vrf=${fib_table_2}
+| | | ... | gateway=${ip_net_vif2}.2 | interface=${dut2_vif2}
+| | | ... | multipath=${TRUE}
 | | | Assign Interface To Fib Table | ${dut1} | ${dut1-vhost-${number}-if1}
 | | | ... | ${fib_table_1}
 | | | Assign Interface To Fib Table | ${dut1} | ${dut1-vhost-${number}-if2}
@@ -434,6 +438,14 @@
 | | | ... | ${dut1} | ${dut1-vhost-${number}-if2} | ${ip_net_vif2}.1 | 30
 | | | ... | ${dut2} | ${dut2-vhost-${number}-if1} | ${ip_net_vif1}.1 | 30
 | | | ... | ${dut2} | ${dut2-vhost-${number}-if2} | ${ip_net_vif2}.1 | 30
+| | | ${dut1_vif1_idx}= | Get Interface SW Index | ${dut1}
+| | | ... | ${dut1-vhost-${number}-if1}
+| | | ${dut1_vif2_idx}= | Get Interface SW Index | ${dut1}
+| | | ... | ${dut1-vhost-${number}-if2}
+| | | ${dut2_vif1_idx}= | Get Interface SW Index | ${dut2}
+| | | ... | ${dut2-vhost-${number}-if1}
+| | | ${dut2_vif2_idx}= | Get Interface SW Index | ${dut2}
+| | | ... | ${dut2-vhost-${number}-if2}
 | | | ${dut1_vif1_mac}= | Get Vhost User Mac By Sw Index | ${dut1}
 | | | ... | ${dut1_vif1_idx}
 | | | ${dut1_vif2_mac}= | Get Vhost User Mac By Sw Index | ${dut1}
diff --git a/tests/vpp/perf/ip4/10ge2p1x520-ethip4-ip4base-copwhtlistbase-ndrchk.robot b/tests/vpp/perf/ip4/10ge2p1x520-ethip4-ip4base-copwhtlistbase-ndrchk.robot
index 5dc941725f..8d88399a3e 100644
--- a/tests/vpp/perf/ip4/10ge2p1x520-ethip4-ip4base-copwhtlistbase-ndrchk.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x520-ethip4-ip4base-copwhtlistbase-ndrchk.robot
@@ -69,8 +69,10 @@
 | | And Add no multi seg to all DUTs
 | | And Apply startup configuration on all VPP DUTs
 | | When Initialize IPv4 forwarding in 3-node circular topology
-| | And Add fib table | ${dut1} | 10.10.10.0 | 24 | 1 | local
-| | And Add fib table | ${dut2} | 20.20.20.0 | 24 | 1 | local
+| | And Add Fib Table | ${dut1} | 1
+| | And Vpp Route Add | ${dut1} | 10.10.10.0 | 24 | vrf=1 | local=${TRUE}
+| | And Add Fib Table | ${dut2} | 1
+| | And Vpp Route Add | ${dut2} | 20.20.20.0 | 24 | vrf=1 | local=${TRUE}
 | | And COP Add whitelist Entry | ${dut1} | ${dut1_if1} | ip4 | 1
 | | And COP Add whitelist Entry | ${dut2} | ${dut2_if2} | ip4 | 1
 | | And COP interface enable or disable | ${dut1} | ${dut1_if1} | enable
@@ -92,8 +94,10 @@
 | | And Add no multi seg to all DUTs
 | | And Apply startup configuration on all VPP DUTs
 | | When Initialize IPv4 forwarding in 3-node circular topology
-| | And Add fib table | ${dut1} | 10.10.10.0 | 24 | 1 | local
-| | And Add fib table | ${dut2} | 20.20.20.0 | 24 | 1 | local
+| | And Add Fib Table | ${dut1} | 1
+| | And Vpp Route Add | ${dut1} | 10.10.10.0 | 24 | vrf=1 | local=${TRUE}
+| | And Add Fib Table | ${dut2} | 1
+| | And Vpp Route Add | ${dut2} | 20.20.20.0 | 24 | vrf=1 | local=${TRUE}
 | | And COP Add whitelist Entry | ${dut1} | ${dut1_if1} | ip4 | 1
 | | And COP Add whitelist Entry | ${dut2} | ${dut2_if2} | ip4 | 1
 | | And COP interface enable or disable | ${dut1} | ${dut1_if1} | enable
@@ -114,8 +118,10 @@
 | | And Add PCI devices to DUTs in 3-node single link topology
 | | And Apply startup configuration on all VPP DUTs
 | | When Initialize IPv4 forwarding in 3-node circular topology
-| | And Add fib table | ${dut1} | 10.10.10.0 | 24 | 1 | local
-| | And Add fib table | ${dut2} | 20.20.20.0 | 24 | 1 | local
+| | And Add Fib Table | ${dut1} | 1
+| | And Vpp Route Add | ${dut1} | 10.10.10.0 | 24 | vrf=1 | local=${TRUE}
+| | And Add Fib Table | ${dut2} | 1
+| | And Vpp Route Add | ${dut2} | 20.20.20.0 | 24 | vrf=1 | local=${TRUE}
 | | And COP Add whitelist Entry | ${dut1} | ${dut1_if1} | ip4 | 1
 | | And COP Add whitelist Entry | ${dut2} | ${dut2_if2} | ip4 | 1
 | | And COP interface enable or disable | ${dut1} | ${dut1_if1} | enable
@@ -137,8 +143,10 @@
 | | And Add no multi seg to all DUTs
 | | And Apply startup configuration on all VPP DUTs
 | | When Initialize IPv4 forwarding in 3-node circular topology
-| | And Add fib table | ${dut1} | 10.10.10.0 | 24 | 1 | local
-| | And Add fib table | ${dut2} | 20.20.20.0 | 24 | 1 | local
+| | And Add Fib Table | ${dut1} | 1
+| | And Vpp Route Add | ${dut1} | 10.10.10.0 | 24 | vrf=1 | local=${TRUE}
+| | And Add Fib Table | ${dut2} | 1
+| | And Vpp Route Add | ${dut2} | 20.20.20.0 | 24 | vrf=1 | local=${TRUE}
 | | And COP Add whitelist Entry | ${dut1} | ${dut1_if1} | ip4 | 1
 | | And COP Add whitelist Entry | ${dut2} | ${dut2_if2} | ip4 | 1
 | | And COP interface enable or disable | ${dut1} | ${dut1_if1} | enable
@@ -160,8 +168,10 @@
 | | And Add no multi seg to all DUTs
 | | And Apply startup configuration on all VPP DUTs
 | | When Initialize IPv4 forwarding in 3-node circular topology
-| | And Add fib table | ${dut1} | 10.10.10.0 | 24 | 1 | local
-| | And Add fib table | ${dut2} | 20.20.20.0 | 24 | 1 | local
+| | And Add Fib Table | ${dut1} | 1
+| | And Vpp Route Add | ${dut1} | 10.10.10.0 | 24 | vrf=1 | local=${TRUE}
+| | And Add Fib Table | ${dut2} | 1
+| | And Vpp Route Add | ${dut2} | 20.20.20.0 | 24 | vrf=1 | local=${TRUE}
 | | And COP Add whitelist Entry | ${dut1} | ${dut1_if1} | ip4 | 1
 | | And COP Add whitelist Entry | ${dut2} | ${dut2_if2} | ip4 | 1
 | | And COP interface enable or disable | ${dut1} | ${dut1_if1} | enable
@@ -182,8 +192,10 @@
 | | And Add PCI devices to DUTs in 3-node single link topology
 | | And Apply startup configuration on all VPP DUTs
 | | When Initialize IPv4 forwarding in 3-node circular topology
-| | And Add fib table | ${dut1} | 10.10.10.0 | 24 | 1 | local
-| | And Add fib table | ${dut2} | 20.20.20.0 | 24 | 1 | local
+| | And Add Fib Table | ${dut1} | 1
+| | And Vpp Route Add | ${dut1} | 10.10.10.0 | 24 | vrf=1 | local=${TRUE}
+| | And Add Fib Table | ${dut2} | 1
+| | And Vpp Route Add | ${dut2} | 20.20.20.0 | 24 | vrf=1 | local=${TRUE}
 | | And COP Add whitelist Entry | ${dut1} | ${dut1_if1} | ip4 | 1
 | | And COP Add whitelist Entry | ${dut2} | ${dut2_if2} | ip4 | 1
 | | And COP interface enable or disable | ${dut1} | ${dut1_if1} | enable
@@ -205,8 +217,10 @@
 | | And Add no multi seg to all DUTs
 | | And Apply startup configuration on all VPP DUTs
 | | When Initialize IPv4 forwarding in 3-node circular topology
-| | And Add fib table | ${dut1} | 10.10.10.0 | 24 | 1 | local
-| | And Add fib table | ${dut2} | 20.20.20.0 | 24 | 1 | local
+| | And Add Fib Table | ${dut1} | 1
+| | And Vpp Route Add | ${dut1} | 10.10.10.0 | 24 | vrf=1 | local=${TRUE}
+| | And Add Fib Table | ${dut2} | 1
+| | And Vpp Route Add | ${dut2} | 20.20.20.0 | 24 | vrf=1 | local=${TRUE}
 | | And COP Add whitelist Entry | ${dut1} | ${dut1_if1} | ip4 | 1
 | | And COP Add whitelist Entry | ${dut2} | ${dut2_if2} | ip4 | 1
 | | And COP interface enable or disable | ${dut1} | ${dut1_if1} | enable
@@ -228,8 +242,10 @@
 | | And Add no multi seg to all DUTs
 | | And Apply startup configuration on all VPP DUTs
 | | When Initialize IPv4 forwarding in 3-node circular topology
-| | And Add fib table | ${dut1} | 10.10.10.0 | 24 | 1 | local
-| | And Add fib table | ${dut2} | 20.20.20.0 | 24 | 1 | local
+| | And Add Fib Table | ${dut1} | 1
+| | And Vpp Route Add | ${dut1} | 10.10.10.0 | 24 | vrf=1 | local=${TRUE}
+| | And Add Fib Table | ${dut2} | 1
+| | And Vpp Route Add | ${dut2} | 20.20.20.0 | 24 | vrf=1 | local=${TRUE}
 | | And COP Add whitelist Entry | ${dut1} | ${dut1_if1} | ip4 | 1
 | | And COP Add whitelist Entry | ${dut2} | ${dut2_if2} | ip4 | 1
 | | And COP interface enable or disable | ${dut1} | ${dut1_if1} | enable
@@ -250,8 +266,10 @@
 | | And Add PCI devices to DUTs in 3-node single link topology
 | | And Apply startup configuration on all VPP DUTs
 | | When Initialize IPv4 forwarding in 3-node circular topology
-| | And Add fib table | ${dut1} | 10.10.10.0 | 24 | 1 | local
-| | And Add fib table | ${dut2} | 20.20.20.0 | 24 | 1 | local
+| | And Add Fib Table | ${dut1} | 1
+| | And Vpp Route Add | ${dut1} | 10.10.10.0 | 24 | vrf=1 | local=${TRUE}
+| | And Add Fib Table | ${dut2} | 1
+| | And Vpp Route Add | ${dut2} | 20.20.20.0 | 24 | vrf=1 | local=${TRUE}
 | | And COP Add whitelist Entry | ${dut1} | ${dut1_if1} | ip4 | 1
 | | And COP Add whitelist Entry | ${dut2} | ${dut2_if2} | ip4 | 1
 | | And COP interface enable or disable | ${dut1} | ${dut1_if1} | enable
diff --git a/tests/vpp/perf/ip4/10ge2p1x520-ethip4-ip4base-copwhtlistbase-ndrpdrdisc.robot b/tests/vpp/perf/ip4/10ge2p1x520-ethip4-ip4base-copwhtlistbase-ndrpdrdisc.robot
index 2afbb093c8..b7203795e2 100644
--- a/tests/vpp/perf/ip4/10ge2p1x520-ethip4-ip4base-copwhtlistbase-ndrpdrdisc.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x520-ethip4-ip4base-copwhtlistbase-ndrpdrdisc.robot
@@ -79,8 +79,10 @@
 | | And Add no multi seg to all DUTs
 | | And Apply startup configuration on all VPP DUTs
 | | When Initialize IPv4 forwarding in 3-node circular topology
-| | And Add fib table | ${dut1} | 10.10.10.0 | 24 | 1 | local
-| | And Add fib table | ${dut2} | 20.20.20.0 | 24 | 1 | local
+| | And Add Fib Table | ${dut1} | 1
+| | And Vpp Route Add | ${dut1} | 10.10.10.0 | 24 | vrf=1 | local=${TRUE}
+| | And Add Fib Table | ${dut2} | 1
+| | And Vpp Route Add | ${dut2} | 20.20.20.0 | 24 | vrf=1 | local=${TRUE}
 | | And COP Add whitelist Entry | ${dut1} | ${dut1_if1} | ip4 | 1
 | | And COP Add whitelist Entry | ${dut2} | ${dut2_if2} | ip4 | 1
 | | And COP interface enable or disable | ${dut1} | ${dut1_if1} | enable
@@ -107,8 +109,10 @@
 | | And Add no multi seg to all DUTs
 | | And Apply startup configuration on all VPP DUTs
 | | When Initialize IPv4 forwarding in 3-node circular topology
-| | And Add fib table | ${dut1} | 10.10.10.0 | 24 | 1 | local
-| | And Add fib table | ${dut2} | 20.20.20.0 | 24 | 1 | local
+| | And Add Fib Table | ${dut1} | 1
+| | And Vpp Route Add | ${dut1} | 10.10.10.0 | 24 | vrf=1 | local=${TRUE}
+| | And Add Fib Table | ${dut2} | 1
+| | And Vpp Route Add | ${dut2} | 20.20.20.0 | 24 | vrf=1 | local=${TRUE}
 | | And COP Add whitelist Entry | ${dut1} | ${dut1_if1} | ip4 | 1
 | | And COP Add whitelist Entry | ${dut2} | ${dut2_if2} | ip4 | 1
 | | And COP interface enable or disable | ${dut1} | ${dut1_if1} | enable
@@ -136,8 +140,10 @@
 | | And Add no multi seg to all DUTs
 | | And Apply startup configuration on all VPP DUTs
 | | When Initialize IPv4 forwarding in 3-node circular topology
-| | And Add fib table | ${dut1} | 10.10.10.0 | 24 | 1 | local
-| | And Add fib table | ${dut2} | 20.20.20.0 | 24 | 1 | local
+| | And Add Fib Table | ${dut1} | 1
+| | And Vpp Route Add | ${dut1} | 10.10.10.0 | 24 | vrf=1 | local=${TRUE}
+| | And Add Fib Table | ${dut2} | 1
+| | And Vpp Route Add | ${dut2} | 20.20.20.0 | 24 | vrf=1 | local=${TRUE}
 | | And COP Add whitelist Entry | ${dut1} | ${dut1_if1} | ip4 | 1
 | | And COP Add whitelist Entry | ${dut2} | ${dut2_if2} | ip4 | 1
 | | And COP interface enable or disable | ${dut1} | ${dut1_if1} | enable
@@ -164,8 +170,10 @@
 | | And Add no multi seg to all DUTs
 | | And Apply startup configuration on all VPP DUTs
 | | When Initialize IPv4 forwarding in 3-node circular topology
-| | And Add fib table | ${dut1} | 10.10.10.0 | 24 | 1 | local
-| | And Add fib table | ${dut2} | 20.20.20.0 | 24 | 1 | local
+| | And Add Fib Table | ${dut1} | 1
+| | And Vpp Route Add | ${dut1} | 10.10.10.0 | 24 | vrf=1 | local=${TRUE}
+| | And Add Fib Table | ${dut2} | 1
+| | And Vpp Route Add | ${dut2} | 20.20.20.0 | 24 | vrf=1 | local=${TRUE}
 | | And COP Add whitelist Entry | ${dut1} | ${dut1_if1} | ip4 | 1
 | | And COP Add whitelist Entry | ${dut2} | ${dut2_if2} | ip4 | 1
 | | And COP interface enable or disable | ${dut1} | ${dut1_if1} | enable
@@ -192,8 +200,10 @@
 | | And Add PCI devices to DUTs in 3-node single link topology
 | | And Apply startup configuration on all VPP DUTs
 | | When Initialize IPv4 forwarding in 3-node circular topology
-| | And Add fib table | ${dut1} | 10.10.10.0 | 24 | 1 | local
-| | And Add fib table | ${dut2} | 20.20.20.0 | 24 | 1 | local
+| | And Add Fib Table | ${dut1} | 1
+| | And Vpp Route Add | ${dut1} | 10.10.10.0 | 24 | vrf=1 | local=${TRUE}
+| | And Add Fib Table | ${dut2} | 1
+| | And Vpp Route Add | ${dut2} | 20.20.20.0 | 24 | vrf=1 | local=${TRUE}
 | | And COP Add whitelist Entry | ${dut1} | ${dut1_if1} | ip4 | 1
 | | And COP Add whitelist Entry | ${dut2} | ${dut2_if2} | ip4 | 1
 | | And COP interface enable or disable | ${dut1} | ${dut1_if1} | enable
@@ -219,8 +229,10 @@
 | | And Add PCI devices to DUTs in 3-node single link topology
 | | And Apply startup configuration on all VPP DUTs
 | | When Initialize IPv4 forwarding in 3-node circular topology
-| | And Add fib table | ${dut1} | 10.10.10.0 | 24 | 1 | local
-| | And Add fib table | ${dut2} | 20.20.20.0 | 24 | 1 | local
+| | And Add Fib Table | ${dut1} | 1
+| | And Vpp Route Add | ${dut1} | 10.10.10.0 | 24 | vrf=1 | local=${TRUE}
+| | And Add Fib Table | ${dut2} | 1
+| | And Vpp Route Add | ${dut2} | 20.20.20.0 | 24 | vrf=1 | local=${TRUE}
 | | And COP Add whitelist Entry | ${dut1} | ${dut1_if1} | ip4 | 1
 | | And COP Add whitelist Entry | ${dut2} | ${dut2_if2} | ip4 | 1
 | | And COP interface enable or disable | ${dut1} | ${dut1_if1} | enable
@@ -248,8 +260,10 @@
 | | And Add no multi seg to all DUTs
 | | And Apply startup configuration on all VPP DUTs
 | | When Initialize IPv4 forwarding in 3-node circular topology
-| | And Add fib table | ${dut1} | 10.10.10.0 | 24 | 1 | local
-| | And Add fib table | ${dut2} | 20.20.20.0 | 24 | 1 | local
+| | And Add Fib Table | ${dut1} | 1
+| | And Vpp Route Add | ${dut1} | 10.10.10.0 | 24 | vrf=1 | local=${TRUE}
+| | And Add Fib Table | ${dut2} | 1
+| | And Vpp Route Add | ${dut2} | 20.20.20.0 | 24 | vrf=1 | local=${TRUE}
 | | And COP Add whitelist Entry | ${dut1} | ${dut1_if1} | ip4 | 1
 | | And COP Add whitelist Entry | ${dut2} | ${dut2_if2} | ip4 | 1
 | | And COP interface enable or disable | ${dut1} | ${dut1_if1} | enable
@@ -276,8 +290,10 @@
 | | And Add no multi seg to all DUTs
 | | And Apply startup configuration on all VPP DUTs
 | | When Initialize IPv4 forwarding in 3-node circular topology
-| | And Add fib table | ${dut1} | 10.10.10.0 | 24 | 1 | local
-| | And Add fib table | ${dut2} | 20.20.20.0 | 24 | 1 | local
+| | And Add Fib Table | ${dut1} | 1
+| | And Vpp Route Add | ${dut1} | 10.10.10.0 | 24 | vrf=1 | local=${TRUE}
+| | And Add Fib Table | ${dut2} | 1
+| | And Vpp Route Add | ${dut2} | 20.20.20.0 | 24 | vrf=1 | local=${TRUE}
 | | And COP Add whitelist Entry | ${dut1} | ${dut1_if1} | ip4 | 1
 | | And COP Add whitelist Entry | ${dut2} | ${dut2_if2} | ip4 | 1
 | | And COP interface enable or disable | ${dut1} | ${dut1_if1} | enable
@@ -305,8 +321,10 @@
 | | And Add no multi seg to all DUTs
 | | And Apply startup configuration on all VPP DUTs
 | | When Initialize IPv4 forwarding in 3-node circular topology
-| | And Add fib table | ${dut1} | 10.10.10.0 | 24 | 1 | local
-| | And Add fib table | ${dut2} | 20.20.20.0 | 24 | 1 | local
+| | And Add Fib Table | ${dut1} | 1
+| | And Vpp Route Add | ${dut1} | 10.10.10.0 | 24 | vrf=1 | local=${TRUE}
+| | And Add Fib Table | ${dut2} | 1
+| | And Vpp Route Add | ${dut2} | 20.20.20.0 | 24 | vrf=1 | local=${TRUE}
 | | And COP Add whitelist Entry | ${dut1} | ${dut1_if1} | ip4 | 1
 | | And COP Add whitelist Entry | ${dut2} | ${dut2_if2} | ip4 | 1
 | | And COP interface enable or disable | ${dut1} | ${dut1_if1} | enable
@@ -333,8 +351,10 @@
 | | And Add no multi seg to all DUTs
 | | And Apply startup configuration on all VPP DUTs
 | | When Initialize IPv4 forwarding in 3-node circular topology
-| | And Add fib table | ${dut1} | 10.10.10.0 | 24 | 1 | local
-| | And Add fib table | ${dut2} | 20.20.20.0 | 24 | 1 | local
+| | And Add Fib Table | ${dut1} | 1
+| | And Vpp Route Add | ${dut1} | 10.10.10.0 | 24 | vrf=1 | local=${TRUE}
+| | And Add Fib Table | ${dut2} | 1
+| | And Vpp Route Add | ${dut2} | 20.20.20.0 | 24 | vrf=1 | local=${TRUE}
 | | And COP Add whitelist Entry | ${dut1} | ${dut1_if1} | ip4 | 1
 | | And COP Add whitelist Entry | ${dut2} | ${dut2_if2} | ip4 | 1
 | | And COP interface enable or disable | ${dut1} | ${dut1_if1} | enable
@@ -361,8 +381,10 @@
 | | And Add PCI devices to DUTs in 3-node single link topology
 | | And Apply startup configuration on all VPP DUTs
 | | When Initialize IPv4 forwarding in 3-node circular topology
-| | And Add fib table | ${dut1} | 10.10.10.0 | 24 | 1 | local
-| | And Add fib table | ${dut2} | 20.20.20.0 | 24 | 1 | local
+| | And Add Fib Table | ${dut1} | 1
+| | And Vpp Route Add | ${dut1} | 10.10.10.0 | 24 | vrf=1 | local=${TRUE}
+| | And Add Fib Table | ${dut2} | 1
+| | And Vpp Route Add | ${dut2} | 20.20.20.0 | 24 | vrf=1 | local=${TRUE}
 | | And COP Add whitelist Entry | ${dut1} | ${dut1_if1} | ip4 | 1
 | | And COP Add whitelist Entry | ${dut2} | ${dut2_if2} | ip4 | 1
 | | And COP interface enable or disable | ${dut1} | ${dut1_if1} | enable
@@ -388,8 +410,10 @@
 | | And Add PCI devices to DUTs in 3-node single link topology
 | | And Apply startup configuration on all VPP DUTs
 | | When Initialize IPv4 forwarding in 3-node circular topology
-| | And Add fib table | ${dut1} | 10.10.10.0 | 24 | 1 | local
-| | And Add fib table | ${dut2} | 20.20.20.0 | 24 | 1 | local
+| | And Add Fib Table | ${dut1} | 1
+| | And Vpp Route Add | ${dut1} | 10.10.10.0 | 24 | vrf=1 | local=${TRUE}
+| | And Add Fib Table | ${dut2} | 1
+| | And Vpp Route Add | ${dut2} | 20.20.20.0 | 24 | vrf=1 | local=${TRUE}
 | | And COP Add whitelist Entry | ${dut1} | ${dut1_if1} | ip4 | 1
 | | And COP Add whitelist Entry | ${dut2} | ${dut2_if2} | ip4 | 1
 | | And COP interface enable or disable | ${dut1} | ${dut1_if1} | enable
@@ -407,6 +431,7 @@
 | | ... | step 100kpps.
 | | [Tags] | 64B | 4T4C | MTHREAD | NDRDISC
 | | ${framesize}= | Set Variable | ${64}
+| | And Add fib table | ${dut2} | 20.20.20.0 | 24 | 1 | local
 | | ${min_rate}= | Set Variable | ${100000}
 | | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize}
 | | ${binary_min}= | Set Variable | ${min_rate}
@@ -417,8 +442,10 @@
 | | And Add no multi seg to all DUTs
 | | And Apply startup configuration on all VPP DUTs
 | | When Initialize IPv4 forwarding in 3-node circular topology
-| | And Add fib table | ${dut1} | 10.10.10.0 | 24 | 1 | local
-| | And Add fib table | ${dut2} | 20.20.20.0 | 24 | 1 | local
+| | And Add Fib Table | ${dut1} | 1
+| | And Vpp Route Add | ${dut1} | 10.10.10.0 | 24 | vrf=1 | local=${TRUE}
+| | And Add Fib Table | ${dut2} | 1
+| | And Vpp Route Add | ${dut2} | 20.20.20.0 | 24 | vrf=1 | local=${TRUE}
 | | And COP Add whitelist Entry | ${dut1} | ${dut1_if1} | ip4 | 1
 | | And COP Add whitelist Entry | ${dut2} | ${dut2_if2} | ip4 | 1
 | | And COP interface enable or disable | ${dut1} | ${dut1_if1} | enable
@@ -445,8 +472,10 @@
 | | And Add no multi seg to all DUTs
 | | And Apply startup configuration on all VPP DUTs
 | | When Initialize IPv4 forwarding in 3-node circular topology
-| | And Add fib table | ${dut1} | 10.10.10.0 | 24 | 1 | local
-| | And Add fib table | ${dut2} | 20.20.20.0 | 24 | 1 | local
+| | And Add Fib Table | ${dut1} | 1
+| | And Vpp Route Add | ${dut1} | 10.10.10.0 | 24 | vrf=1 | local=${TRUE}
+| | And Add Fib Table | ${dut2} | 1
+| | And Vpp Route Add | ${dut2} | 20.20.20.0 | 24 | vrf=1 | local=${TRUE}
 | | And COP Add whitelist Entry | ${dut1} | ${dut1_if1} | ip4 | 1
 | | And COP Add whitelist Entry | ${dut2} | ${dut2_if2} | ip4 | 1
 | | And COP interface enable or disable | ${dut1} | ${dut1_if1} | enable
@@ -474,8 +503,10 @@
 | | And Add no multi seg to all DUTs
 | | And Apply startup configuration on all VPP DUTs
 | | When Initialize IPv4 forwarding in 3-node circular topology
-| | And Add fib table | ${dut1} | 10.10.10.0 | 24 | 1 | local
-| | And Add fib table | ${dut2} | 20.20.20.0 | 24 | 1 | local
+| | And Add Fib Table | ${dut1} | 1
+| | And Vpp Route Add | ${dut1} | 10.10.10.0 | 24 | vrf=1 | local=${TRUE}
+| | And Add Fib Table | ${dut2} | 1
+| | And Vpp Route Add | ${dut2} | 20.20.20.0 | 24 | vrf=1 | local=${TRUE}
 | | And COP Add whitelist Entry | ${dut1} | ${dut1_if1} | ip4 | 1
 | | And COP Add whitelist Entry | ${dut2} | ${dut2_if2} | ip4 | 1
 | | And COP interface enable or disable | ${dut1} | ${dut1_if1} | enable
@@ -502,8 +533,10 @@
 | | And Add no multi seg to all DUTs
 | | And Apply startup configuration on all VPP DUTs
 | | When Initialize IPv4 forwarding in 3-node circular topology
-| | And Add fib table | ${dut1} | 10.10.10.0 | 24 | 1 | local
-| | And Add fib table | ${dut2} | 20.20.20.0 | 24 | 1 | local
+| | And Add Fib Table | ${dut1} | 1
+| | And Vpp Route Add | ${dut1} | 10.10.10.0 | 24 | vrf=1 | local=${TRUE}
+| | And Add Fib Table | ${dut2} | 1
+| | And Vpp Route Add | ${dut2} | 20.20.20.0 | 24 | vrf=1 | local=${TRUE}
 | | And COP Add whitelist Entry | ${dut1} | ${dut1_if1} | ip4 | 1
 | | And COP Add whitelist Entry | ${dut2} | ${dut2_if2} | ip4 | 1
 | | And COP interface enable or disable | ${dut1} | ${dut1_if1} | enable
@@ -530,8 +563,10 @@
 | | And Add PCI devices to DUTs in 3-node single link topology
 | | And Apply startup configuration on all VPP DUTs
 | | When Initialize IPv4 forwarding in 3-node circular topology
-| | And Add fib table | ${dut1} | 10.10.10.0 | 24 | 1 | local
-| | And Add fib table | ${dut2} | 20.20.20.0 | 24 | 1 | local
+| | And Add Fib Table | ${dut1} | 1
+| | And Vpp Route Add | ${dut1} | 10.10.10.0 | 24 | vrf=1 | local=${TRUE}
+| | And Add Fib Table | ${dut2} | 1
+| | And Vpp Route Add | ${dut2} | 20.20.20.0 | 24 | vrf=1 | local=${TRUE}
 | | And COP Add whitelist Entry | ${dut1} | ${dut1_if1} | ip4 | 1
 | | And COP Add whitelist Entry | ${dut2} | ${dut2_if2} | ip4 | 1
 | | And COP interface enable or disable | ${dut1} | ${dut1_if1} | enable
@@ -557,8 +592,10 @@
 | | And Add PCI devices to DUTs in 3-node single link topology
 | | And Apply startup configuration on all VPP DUTs
 | | When Initialize IPv4 forwarding in 3-node circular topology
-| | And Add fib table | ${dut1} | 10.10.10.0 | 24 | 1 | local
-| | And Add fib table | ${dut2} | 20.20.20.0 | 24 | 1 | local
+| | And Add Fib Table | ${dut1} | 1
+| | And Vpp Route Add | ${dut1} | 10.10.10.0 | 24 | vrf=1 | local=${TRUE}
+| | And Add Fib Table | ${dut2} | 1
+| | And Vpp Route Add | ${dut2} | 20.20.20.0 | 24 | vrf=1 | local=${TRUE}
 | | And COP Add whitelist Entry | ${dut1} | ${dut1_if1} | ip4 | 1
 | | And COP Add whitelist Entry | ${dut2} | ${dut2_if2} | ip4 | 1
 | | And COP interface enable or disable | ${dut1} | ${dut1_if1} | enable
diff --git a/tests/vpp/perf/ip6/10ge2p1x520-ethip6-ip6base-copwhtlistbase-ndrchk.robot b/tests/vpp/perf/ip6/10ge2p1x520-ethip6-ip6base-copwhtlistbase-ndrchk.robot
index c619b6530b..90b5d9567a 100644
--- a/tests/vpp/perf/ip6/10ge2p1x520-ethip6-ip6base-copwhtlistbase-ndrchk.robot
+++ b/tests/vpp/perf/ip6/10ge2p1x520-ethip6-ip6base-copwhtlistbase-ndrchk.robot
@@ -65,8 +65,10 @@
 | | 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
+| | 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,8 +90,10 @@
 | | 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
+| | 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
@@ -110,8 +114,10 @@
 | | And Add PCI devices to DUTs in 3-node single link topology
 | | 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
+| | 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
@@ -133,8 +139,10 @@
 | | 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
+| | 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
@@ -156,8 +164,10 @@
 | | 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
+| | 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
@@ -178,8 +188,10 @@
 | | And Add PCI devices to DUTs in 3-node single link topology
 | | 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
+| | 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,8 +213,10 @@
 | | 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
+| | 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
@@ -224,8 +238,10 @@
 | | 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
+| | 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
@@ -246,8 +262,10 @@
 | | And Add PCI devices to DUTs in 3-node single link topology
 | | 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
+| | 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
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..5fb9c472cf 100644
--- a/tests/vpp/perf/ip6/10ge2p1x520-ethip6-ip6base-copwhtlistbase-ndrpdrdisc.robot
+++ b/tests/vpp/perf/ip6/10ge2p1x520-ethip6-ip6base-copwhtlistbase-ndrpdrdisc.robot
@@ -75,8 +75,10 @@
 | | 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
@@ -103,8 +105,10 @@
 | | 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
@@ -132,8 +136,10 @@
 | | 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
@@ -160,8 +166,10 @@
 | | 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
@@ -188,8 +196,10 @@
 | | And Add PCI devices to DUTs in 3-node single link topology
 | | 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
@@ -215,8 +225,10 @@
 | | And Add PCI devices to DUTs in 3-node single link topology
 | | 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
@@ -244,8 +256,10 @@
 | | 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
@@ -272,8 +286,10 @@
 | | 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
@@ -301,8 +317,10 @@
 | | 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
@@ -329,8 +347,10 @@
 | | 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
@@ -357,8 +377,10 @@
 | | And Add PCI devices to DUTs in 3-node single link topology
 | | 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
@@ -384,8 +406,10 @@
 | | And Add PCI devices to DUTs in 3-node single link topology
 | | 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
@@ -413,8 +437,10 @@
 | | 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
@@ -441,8 +467,10 @@
 | | 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
@@ -470,8 +498,10 @@
 | | 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
@@ -498,8 +528,10 @@
 | | 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
@@ -526,8 +558,10 @@
 | | And Add PCI devices to DUTs in 3-node single link topology
 | | 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
@@ -553,8 +587,10 @@
 | | And Add PCI devices to DUTs in 3-node single link topology
 | | 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