X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=tests%2Fvpp%2Ffunc%2Fip4%2Feth2p-ethip4-ip4basevrf-func.robot;h=0f71fab5fec7f52d2faf9871b677ef72395b4be8;hb=552491e8bcff9745b04fbdd92609351ec9597cdc;hp=b520d4df6cb2a15b5adf5c35fcfd94d341dbdd56;hpb=6721e7f09aa95bff6622068332a3f56afad9c87b;p=csit.git

diff --git a/tests/vpp/func/ip4/eth2p-ethip4-ip4basevrf-func.robot b/tests/vpp/func/ip4/eth2p-ethip4-ip4basevrf-func.robot
index b520d4df6c..0f71fab5fe 100644
--- a/tests/vpp/func/ip4/eth2p-ethip4-ip4basevrf-func.robot
+++ b/tests/vpp/func/ip4/eth2p-ethip4-ip4basevrf-func.robot
@@ -1,4 +1,4 @@
-# Copyright (c) 2016 Cisco and/or its affiliates.
+# Copyright (c) 2019 Cisco and/or its affiliates.
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at:
@@ -309,18 +309,22 @@
 | | ... | ${dut2_node} | ${dut2_to_dut1_if1}
 | | ${dut2_if2_idx}= | Get Interface SW Index
 | | ... | ${dut2_node} | ${dut2_to_dut1_if2}
-| | And Add fib table | ${dut1_node}
-| | ... | ${tg_dut2_ip1} | ${ip_prefix} | ${fib_table_1}
-| | ... | via ${dut2_to_dut1_ip1} sw_if_index ${dut1_if1_idx} multipath
-| | And Add fib table | ${dut1_node}
-| | ... | ${tg_dut2_ip2} | ${ip_prefix} | ${fib_table_2}
-| | ... | via ${dut1_to_dut2_ip2} sw_if_index ${dut1_if2_idx} multipath
-| | And Add fib table | ${dut2_node}
-| | ... | ${tg_dut1_ip1} | ${ip_prefix} | ${fib_table_1}
-| | ... | via ${dut2_to_dut1_ip1} sw_if_index ${dut2_if1_idx} multipath
-| | And Add fib table | ${dut2_node}
-| | ... | ${tg_dut1_ip2} | ${ip_prefix} | ${fib_table_2}
-| | ... | via ${dut2_to_dut1_ip2} sw_if_index ${dut2_if2_idx} multipath
+| | And Add fib table | ${dut1_node} | ${fib_table_1}
+| | And Add fib table | ${dut1_node} | ${fib_table_2}
+| | And Add fib table | ${dut2_node} | ${fib_table_1}
+| | And Add fib table | ${dut2_node} | ${fib_table_2}
+| | And Vpp Route Add | ${dut1_node}
+| | ... | ${tg_dut2_ip1} | ${ip_prefix} | gateway=${fib_table_1}
+| | ... | interface=via ${dut2_to_dut1_ip1} sw_if_index ${dut1_if1_idx} multipath
+| | And Vpp Route Add | ${dut1_node}
+| | ... | ${tg_dut2_ip2} | ${ip_prefix} | gateway=${fib_table_2}
+| | ... | interface=via ${dut1_to_dut2_ip2} sw_if_index ${dut1_if2_idx} multipath
+| | And Vpp Route Add | ${dut2_node}
+| | ... | ${tg_dut1_ip1} | ${ip_prefix} | gateway=${fib_table_1}
+| | ... | interface=via ${dut2_to_dut1_ip1} sw_if_index ${dut2_if1_idx} multipath
+| | And Vpp Route Add | ${dut2_node}
+| | ... | ${tg_dut1_ip2} | ${ip_prefix} | gateway=${fib_table_2}
+| | ... | interface=via ${dut2_to_dut1_ip2} sw_if_index ${dut2_if2_idx} multipath
 
 | | Assign Interface To Fib Table
 | | ... | ${dut1_node} | ${dut1_to_dut2_if1} | ${fib_table_1}
@@ -381,11 +385,15 @@
 | | ... | ${dut1_to_dut2_ip2} | ${dut1_to_dut2_if2_mac}
 
 | | And Vpp Route Add | ${dut1_node} | ${tg_dut2_ip1} | ${ip_prefix}
-| | ... | ${dut2_to_dut1_ip1} | ${dut1_to_dut2_if1} | vrf=${fib_table_1}
+| | ... | gateway=${dut2_to_dut1_ip1} | interface=${dut1_to_dut2_if1}
+| | ... | vrf=${fib_table_1}
 | | And Vpp Route Add | ${dut2_node} | ${tg_dut1_ip1} | ${ip_prefix}
-| | ... | ${dut1_to_dut2_ip1} | ${dut2_to_dut1_if1} | vrf=${fib_table_1}
+| | ... | gateway=${dut1_to_dut2_ip1} | interface=${dut2_to_dut1_if1}
+| | ... | vrf=${fib_table_1}
 
 | | And Vpp Route Add | ${dut1_node} | ${tg_dut2_ip2} | ${ip_prefix}
-| | ... | ${dut2_to_dut1_ip2} | ${dut1_to_dut2_if2} | vrf=${fib_table_2}
+| | ... | gateway=${dut2_to_dut1_ip2} | interface=${dut1_to_dut2_if2}
+| | ... | vrf=${fib_table_2}
 | | And Vpp Route Add | ${dut2_node} | ${tg_dut1_ip2} | ${ip_prefix}
-| | ... | ${dut1_to_dut2_ip2} | ${dut2_to_dut1_if2} | vrf=${fib_table_2}
+| | ... | gateway=${dut1_to_dut2_ip2} | interface=${dut2_to_dut1_if2}
+| | ... | vrf=${fib_table_2}