X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=tests%2Fvpp%2Ffunc%2Fip4%2Feth2p-ethip4-ip4base-iaclbase-func.robot;fp=tests%2Fvpp%2Ffunc%2Fip4%2Feth2p-ethip4-ip4base-iaclbase-func.robot;h=0c07bf6674106d7b5a57b3a6fbb1785233037938;hp=45c0b4e8276699207089da3074c8e9d7ce4f80bd;hb=552491e8bcff9745b04fbdd92609351ec9597cdc;hpb=4ecbd6dc1e6dd07efa58f2bc001e838aad0457f4

diff --git a/tests/vpp/func/ip4/eth2p-ethip4-ip4base-iaclbase-func.robot b/tests/vpp/func/ip4/eth2p-ethip4-ip4base-iaclbase-func.robot
index 45c0b4e827..0c07bf6674 100644
--- a/tests/vpp/func/ip4/eth2p-ethip4-ip4base-iaclbase-func.robot
+++ b/tests/vpp/func/ip4/eth2p-ethip4-ip4base-iaclbase-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:
@@ -66,7 +66,7 @@
 | | ... | ${tg_to_dut2_mac}
 | | And Vpp Route Add
 | | ... | ${dut1_node} | ${test_dst_ip} | ${prefix_length}
-| | ... | ${dut1_to_dut2_ip_GW} | ${dut1_to_dut2}
+| | ... | gateway=${dut1_to_dut2_ip_GW} | interface=${dut1_to_dut2}
 | | And Configure L2XC
 | | ... | ${dut2_node} | ${dut2_to_dut1} | ${dut2_to_tg}
 | | Then Send packet and verify headers | ${tg_node}
@@ -110,10 +110,10 @@
 | | ... | ${tg_to_dut2_mac}
 | | And Vpp Route Add
 | | ... | ${dut1_node} | ${test_dst_ip} | ${prefix_length}
-| | ... | ${dut1_to_dut2_ip_GW} | ${dut1_to_dut2}
+| | ... | gateway=${dut1_to_dut2_ip_GW} | interface=${dut1_to_dut2}
 | | And Vpp Route Add
 | | ... | ${dut1_node} | ${non_drop_dst_ip} | ${prefix_length}
-| | ... | ${dut1_to_dut2_ip_GW} | ${dut1_to_dut2}
+| | ... | gateway=${dut1_to_dut2_ip_GW} | interface=${dut1_to_dut2}
 | | And Configure L2XC
 | | ... | ${dut2_node} | ${dut2_to_dut1} | ${dut2_to_tg}
 | | Then Send packet and verify headers | ${tg_node}
@@ -157,10 +157,10 @@
 | | ... | ${tg_to_dut2_mac}
 | | And Vpp Route Add
 | | ... | ${dut1_node} | ${test_dst_ip} | ${prefix_length}
-| | ... | ${dut1_to_dut2_ip_GW} | ${dut1_to_dut2}
+| | ... | gateway=${dut1_to_dut2_ip_GW} | interface=${dut1_to_dut2}
 | | And Vpp Route Add
 | | ... | ${dut1_node} | ${non_drop_dst_ip} | ${prefix_length}
-| | ... | ${dut1_to_dut2_ip_GW} | ${dut1_to_dut2}
+| | ... | gateway=${dut1_to_dut2_ip_GW} | interface=${dut1_to_dut2}
 | | And Configure L2XC
 | | ... | ${dut2_node} | ${dut2_to_dut1} | ${dut2_to_tg}
 | | Then Send packet and verify headers | ${tg_node}
@@ -211,7 +211,7 @@
 | | ... | ${tg_to_dut2_mac}
 | | And Vpp Route Add
 | | ... | ${dut1_node} | ${test_dst_ip} | ${prefix_length}
-| | ... | ${dut1_to_dut2_ip_GW} | ${dut1_to_dut2}
+| | ... | gateway=${dut1_to_dut2_ip_GW} | interface=${dut1_to_dut2}
 | | And Configure L2XC
 | | ... | ${dut2_node} | ${dut2_to_dut1} | ${dut2_to_tg}
 | | Then Send TCP or UDP packet and verify received packet | ${tg_node}
@@ -251,7 +251,7 @@
 | | ... | ${tg_to_dut2_mac}
 | | And Vpp Route Add
 | | ... | ${dut1_node} | ${test_dst_ip} | ${prefix_length}
-| | ... | ${dut1_to_dut2_ip_GW} | ${dut1_to_dut2}
+| | ... | gateway=${dut1_to_dut2_ip_GW} | interface=${dut1_to_dut2}
 | | And Configure L2XC
 | | ... | ${dut2_node} | ${dut2_to_dut1} | ${dut2_to_tg}
 | | Then Send TCP or UDP packet and verify received packet | ${tg_node}
@@ -291,7 +291,7 @@
 | | ... | ${tg_to_dut2_mac}
 | | And Vpp Route Add
 | | ... | ${dut1_node} | ${test_dst_ip} | ${prefix_length}
-| | ... | ${dut1_to_dut2_ip_GW} | ${dut1_to_dut2}
+| | ... | gateway=${dut1_to_dut2_ip_GW} | interface=${dut1_to_dut2}
 | | And Configure L2XC
 | | ... | ${dut2_node} | ${dut2_to_dut1} | ${dut2_to_tg}
 | | Then Send TCP or UDP packet and verify received packet | ${tg_node}
@@ -332,7 +332,7 @@
 | | ... | ${tg_to_dut2_mac}
 | | And Vpp Route Add
 | | ... | ${dut1_node} | ${test_dst_ip} | ${prefix_length}
-| | ... | ${dut1_to_dut2_ip_GW} | ${dut1_to_dut2}
+| | ... | gateway=${dut1_to_dut2_ip_GW} | interface=${dut1_to_dut2}
 | | And Configure L2XC
 | | ... | ${dut2_node} | ${dut2_to_dut1} | ${dut2_to_tg}
 | | Then Send TCP or UDP packet and verify received packet | ${tg_node}
@@ -373,7 +373,7 @@
 | | ... | ${tg_to_dut2_mac}
 | | And Vpp Route Add
 | | ... | ${dut1_node} | ${test_dst_ip} | ${prefix_length}
-| | ... | ${dut1_to_dut2_ip_GW} | ${dut1_to_dut2}
+| | ... | gateway=${dut1_to_dut2_ip_GW} | interface=${dut1_to_dut2}
 | | And Configure L2XC
 | | ... | ${dut2_node} | ${dut2_to_dut1} | ${dut2_to_tg}
 | | Then Send TCP or UDP packet and verify received packet | ${tg_node}
@@ -383,7 +383,7 @@
 | | ... | ${test_src_ip} | ${test_dst_ip} | ${tg_to_dut1} | ${tg_to_dut1_mac}
 | | ... | ${tg_to_dut2} | ${dut1_to_tg_mac} | TCP | 80 | 20
 | | ${hex_mask}= | Compute Classify Hex Mask | ${ip_version} | TCP
-| | ...                                      | source + destination
+| | ... | source + destination
 | | ${hex_value}= | Compute Classify Hex Value | ${hex_mask} | 80 | 20
 | | ${table_index} | ${skip_n} | ${match_n}=
 | | ... | When Vpp Creates Classify Table Hex | ${dut1_node} | ${hex_mask}
@@ -415,7 +415,7 @@
 | | ... | ${tg_to_dut2_mac}
 | | And Vpp Route Add
 | | ... | ${dut1_node} | ${test_dst_ip} | ${prefix_length}
-| | ... | ${dut1_to_dut2_ip_GW} | ${dut1_to_dut2}
+| | ... | gateway=${dut1_to_dut2_ip_GW} | interface=${dut1_to_dut2}
 | | And Configure L2XC
 | | ... | ${dut2_node} | ${dut2_to_dut1} | ${dut2_to_tg}
 | | Then Send TCP or UDP packet and verify received packet | ${tg_node}
@@ -456,7 +456,7 @@
 | | ... | ${tg_to_dut2_mac}
 | | And Vpp Route Add
 | | ... | ${dut1_node} | ${test_dst_ip} | ${prefix_length}
-| | ... | ${dut1_to_dut2_ip_GW} | ${dut1_to_dut2}
+| | ... | gateway=${dut1_to_dut2_ip_GW} | interface=${dut1_to_dut2}
 | | And Configure L2XC
 | | ... | ${dut2_node} | ${dut2_to_dut1} | ${dut2_to_tg}
 | | Then Send TCP or UDP packet and verify received packet | ${tg_node}
@@ -497,7 +497,7 @@
 | | ... | ${tg_to_dut2_mac}
 | | And Vpp Route Add
 | | ... | ${dut1_node} | ${test_dst_ip} | ${prefix_length}
-| | ... | ${dut1_to_dut2_ip_GW} | ${dut1_to_dut2}
+| | ... | gateway=${dut1_to_dut2_ip_GW} | interface=${dut1_to_dut2}
 | | And Configure L2XC
 | | ... | ${dut2_node} | ${dut2_to_dut1} | ${dut2_to_tg}
 | | Then Send TCP or UDP packet and verify received packet | ${tg_node}
@@ -507,7 +507,7 @@
 | | ... | ${test_src_ip} | ${test_dst_ip} | ${tg_to_dut1} | ${tg_to_dut1_mac}
 | | ... | ${tg_to_dut2} | ${dut1_to_tg_mac} | UDP | 80 | 20
 | | ${hex_mask}= | Compute Classify Hex Mask | ${ip_version} | UDP
-| | ...                                      | source + destination
+| | ... | source + destination
 | | ${hex_value}= | Compute Classify Hex Value | ${hex_mask} | 80 | 20
 | | ${table_index} | ${skip_n} | ${match_n}=
 | | ... | When Vpp Creates Classify Table Hex | ${dut1_node} | ${hex_mask}