From 552491e8bcff9745b04fbdd92609351ec9597cdc Mon Sep 17 00:00:00 2001
From: Jan Gelety <jgelety@cisco.com>
Date: Thu, 24 Jan 2019 12:31:25 +0100
Subject: FIX: correct call of vpp_add_route

Change-Id: I63a2b5f484ac627c020e30c9f01a868c57aacf42
Signed-off-by: Jan Gelety <jgelety@cisco.com>
---
 ...ethip6ip4-ip4base--ip6base-swirelw46-func.robot |  8 +--
 ...ethip6ip4-ip4base--ip6base-swiremape-func.robot | 62 +++++++++++-----------
 ...ethip6ip4-ip4base--ip6base-swiremapt-func.robot | 10 ++--
 3 files changed, 40 insertions(+), 40 deletions(-)

(limited to 'tests/vpp/func/ip4_tunnels/softwire')

diff --git a/tests/vpp/func/ip4_tunnels/softwire/eth2p-ethip4--ethip6ip4-ip4base--ip6base-swirelw46-func.robot b/tests/vpp/func/ip4_tunnels/softwire/eth2p-ethip4--ethip6ip4-ip4base--ip6base-swirelw46-func.robot
index c8c81f23bd..e78f2627f2 100644
--- a/tests/vpp/func/ip4_tunnels/softwire/eth2p-ethip4--ethip6ip4-ip4base--ip6base-swirelw46-func.robot
+++ b/tests/vpp/func/ip4_tunnels/softwire/eth2p-ethip4--ethip6ip4-ip4base--ip6base-swirelw46-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:
@@ -81,7 +81,7 @@
 | |       ... | ${tg_to_dut_if2_mac}
 | | And Vpp Route Add
 | |       ... | ${dut_node} | ${lw_rule_ipv6_dst} | 128
-| |       ... | ${tg_ip6} | ${dut_to_tg_if2} | resolve_attempts=${NONE}
+| |       ... | gateway=${tg_ip6} | interface=${dut_to_tg_if2} | resolve_attempts=${NONE}
 | | ${domain_index}=
 | | ... | When Map Add Domain
 | |            ... | ${dut_node} | ${lw_ipv4_pfx} | ${lw_ipv6_pfx}
@@ -118,7 +118,7 @@ TC02: Encapsulate IPv4 ICMP into IPv6. IPv6 dst depends on IPv4 addr and ICMP ID
 | |       ... | ${tg_to_dut_if2_mac}
 | | And Vpp Route Add
 | |       ... | ${dut_node} | ${lw_rule_ipv6_dst} | 128
-| |       ... | ${tg_ip6} | ${dut_to_tg_if2} | resolve_attempts=${NONE}
+| |       ... | gateway=${tg_ip6} | interface=${dut_to_tg_if2} | resolve_attempts=${NONE}
 | | ${domain_index}=
 | | ... | When Map Add Domain
 | |            ... | ${dut_node} | ${lw_ipv4_pfx} | ${lw_ipv6_pfx}
@@ -187,7 +187,7 @@ TC04: Hairpinning of traffic between two lwB4
 | |       ... | ${tg_to_dut_if2_mac}
 | | And Vpp Route Add
 | |       ... | ${dut_node} | ${lw_rule_2_ipv6_dst} | 128
-| |       ... | ${tg_ip6} | ${dut_to_tg_if2} | resolve_attempts=${NONE}
+| |       ... | gateway=${tg_ip6} | interface=${dut_to_tg_if2} | resolve_attempts=${NONE}
 | | ${domain_index}=
 | | ... | When Map Add Domain
 | |            ... | ${dut_node} | ${lw_ipv4_pfx} | ${lw_ipv6_pfx}
diff --git a/tests/vpp/func/ip4_tunnels/softwire/eth2p-ethip4--ethip6ip4-ip4base--ip6base-swiremape-func.robot b/tests/vpp/func/ip4_tunnels/softwire/eth2p-ethip4--ethip6ip4-ip4base--ip6base-swiremape-func.robot
index 04450d6148..665585bdd3 100644
--- a/tests/vpp/func/ip4_tunnels/softwire/eth2p-ethip4--ethip6ip4-ip4base--ip6base-swiremape-func.robot
+++ b/tests/vpp/func/ip4_tunnels/softwire/eth2p-ethip4--ethip6ip4-ip4base--ip6base-swiremape-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:
@@ -251,12 +251,12 @@
 | | And Configure IP addresses on interfaces
 | | ... | ${dut_node} | ${dut_to_tg_if1} | ${dut_ip4} | ${ipv4_prefix_len}
 | | ... | ${dut_node} | ${dut_to_tg_if2} | ${dut_ip6} | ${ipv6_prefix_len}
-| | And Vpp Route Add | ${dut_node} | :: | 0 | ${dut_ip6_gw}
-| | ... | ${dut_to_tg_if2} | resolve_attempts=${NONE} | count=${NONE}
+| | And Vpp Route Add | ${dut_node} | :: | 0 | gateway=${dut_ip6_gw}
+| | ... | interface=${dut_to_tg_if2} | resolve_attempts=${NONE} | count=${NONE}
 | | And Add IP Neighbor | ${dut_node} | ${dut_to_tg_if2} | ${dut_ip6_gw}
 | | ... | ${tg_to_dut_if2_mac}
-| | And Vpp Route Add | ${dut_node} | 0.0.0.0 | 0 | ${dut_ip4_gw}
-| | ... | ${dut_to_tg_if1} | resolve_attempts=${NONE} | count=${NONE}
+| | And Vpp Route Add | ${dut_node} | 0.0.0.0 | 0 | gateway=${dut_ip4_gw}
+| | ... | interface=${dut_to_tg_if1} | resolve_attempts=${NONE} | count=${NONE}
 | | And Add IP Neighbor | ${dut_node} | ${dut_to_tg_if1} | ${dut_ip4_gw}
 | | ... | ${tg_to_dut_if1_mac}
 | | :FOR | ${domain_set} | IN | @{domain_sets}
@@ -273,7 +273,7 @@
 | | | And Send IPv4 UDP In IPv6 And Check Headers For Lightweight 4over6
 | | | ... | ${tg_node} | ${tg_to_dut_if2} | ${tg_to_dut_if1}
 | | | ... | ${dut_to_tg_if2_mac} | ${tg_to_dut_if2_mac} | ${ipv6_br} | ${ipv6}
-| | | ... | ${ipv4_outside} |  ${ipv4} | ${port} | ${tg_to_dut_if1_mac}
+| | | ... | ${ipv4_outside} | ${ipv4} | ${port} | ${tg_to_dut_if1_mac}
 | | | ... | ${dut_to_tg_if1_mac}
 
 
@@ -291,19 +291,19 @@
 | | And Configure IP addresses on interfaces
 | | ... | ${dut_node} | ${dut_to_tg_if1} | ${dut_ip4} | ${ipv4_prefix_len}
 | | ... | ${dut_node} | ${dut_to_tg_if2} | ${dut_ip6} | ${ipv6_prefix_len}
-| | And Vpp Route Add | ${dut_node} | :: | 0 | ${dut_ip6_gw}
-| | ... | ${dut_to_tg_if2} | resolve_attempts=${NONE} | count=${NONE}
+| | And Vpp Route Add | ${dut_node} | :: | 0 | gateway=${dut_ip6_gw}
+| | ... | interface=${dut_to_tg_if2} | resolve_attempts=${NONE} | count=${NONE}
 | | And Add IP Neighbor | ${dut_node} | ${dut_to_tg_if2} | ${dut_ip6_gw}
 | | ... | ${tg_to_dut_if2_mac}
-| | And Vpp Route Add | ${dut_node} | 0.0.0.0 | 0 | ${dut_ip4_gw}
-| | ... | ${dut_to_tg_if1} | resolve_attempts=${NONE} | count=${NONE}
+| | And Vpp Route Add | ${dut_node} | 0.0.0.0 | 0 | gateway=${dut_ip4_gw}
+| | ... | interface=${dut_to_tg_if1} | resolve_attempts=${NONE} | count=${NONE}
 | | And Add IP Neighbor | ${dut_node} | ${dut_to_tg_if1} | ${dut_ip4_gw}
 | | ... | ${tg_to_dut_if1_mac}
 | | :FOR | ${domain_set} | IN | @{domain_sets}
 | | | When Map Add Domain | ${dut_node} | @{domain_set}
 | | ${ip_set_A}= | Get From List | ${ip_sets} | 0
 | | ${ip_set_B}= | Get From List | ${ip_sets} | 1
-| | ${ipv6_br}=  | Get From List | ${ip_set_A} | 3
+| | ${ipv6_br}= | Get From List | ${ip_set_A} | 3
 | | ${port_A}= | Get From List | ${ip_set_A} | 2
 | | ${port_B}= | Get From List | ${ip_set_B} | 2
 | | ${ipv6_A}= | Get From List | ${ip_set_A} | 1
@@ -312,7 +312,7 @@
 | | ${ipv4_B}= | Get From List | ${ip_set_B} | 0
 | | Then Send IPv4 UDP In IPv6 And Check Headers For Lightweight Hairpinning
 | | ... | ${tg_node} | ${tg_to_dut_if2}
-| | ... | ${tg_to_dut_if2}  | ${dut_to_tg_if2_mac}
+| | ... | ${tg_to_dut_if2} | ${dut_to_tg_if2_mac}
 | | ... | ${ipv6_br} | ${ipv6_A}
 | | ... | ${ipv4_B} | ${ipv4_A}
 | | ... | ${port_B} | ${port_A}
@@ -337,12 +337,12 @@
 | | And Configure IP addresses on interfaces
 | | ... | ${dut_node} | ${dut_to_tg_if1} | ${dut_ip4} | ${ipv4_prefix_len}
 | | ... | ${dut_node} | ${dut_to_tg_if2} | ${dut_ip6} | ${ipv6_prefix_len}
-| | And Vpp Route Add | ${dut_node} | :: | 0 | ${dut_ip6_gw}
-| | ... | ${dut_to_tg_if2} | resolve_attempts=${NONE} | count=${NONE}
+| | And Vpp Route Add | ${dut_node} | :: | 0 | gateway=${dut_ip6_gw}
+| | ... | interface=${dut_to_tg_if2} | resolve_attempts=${NONE} | count=${NONE}
 | | And Add IP Neighbor | ${dut_node} | ${dut_to_tg_if2} | ${dut_ip6_gw}
 | | ... | ${tg_to_dut_if2_mac}
-| | And Vpp Route Add | ${dut_node} | 0.0.0.0 | 0 | ${dut_ip4_gw}
-| | ... | ${dut_to_tg_if1} | resolve_attempts=${NONE} | count=${NONE}
+| | And Vpp Route Add | ${dut_node} | 0.0.0.0 | 0 | gateway=${dut_ip4_gw}
+| | ... | interface=${dut_to_tg_if1} | resolve_attempts=${NONE} | count=${NONE}
 | | And Add IP Neighbor | ${dut_node} | ${dut_to_tg_if1} | ${dut_ip4_gw}
 | | ... | ${tg_to_dut_if1_mac}
 | | :FOR | ${domain_set} | IN | @{domain_sets}
@@ -351,7 +351,7 @@
 | | ${ipv4_A}= | Get From List | ${ip_set_A} | 0
 | | ${ipv6_A}= | Get From List | ${ip_set_A} | 1
 | | ${icmp_id_A}= | Get From List | ${ip_set_A} | 2
-| | ${ipv6_br}=  | Get From List | ${ip_set_A} | 3
+| | ${ipv6_br}= | Get From List | ${ip_set_A} | 3
 | | Then Send IPv4 ICMP And Check Headers For Lightweight 4over6
 | | ... | ${tg_node} | ${tg_to_dut_if1} | ${tg_to_dut_if2}
 | | ... | ${dut_to_tg_if1_mac} | ${ipv4_A} | ${ipv4_outside}
@@ -364,7 +364,7 @@
 | | ... | Original issue described in https://jira.fd.io/browse/VPP-312.
 | | ... | [Top] TG=DUT1.
 | | ... | [Cfg] IP address are set on interfaces, ip neighbor multiple times
-| | ... | [Ver] FIB is not in broken state.  The steps are add route, \
+| | ... | [Ver] FIB is not in broken state. The steps are add route, \
 | | ... | check with traffic then add same route
 | | ... | again and check with traffic script.
 | | Given Configure path in 2-node circular topology
@@ -373,12 +373,12 @@
 | | When Configure IP addresses on interfaces
 | | ... | ${dut_node} | ${dut_to_tg_if1} | ${dut_ip4} | ${ipv4_prefix_len}
 | | ... | ${dut_node} | ${dut_to_tg_if2} | ${dut_ip6} | ${ipv6_prefix_len}
-| | And Vpp Route Add | ${dut_node} | 2001:: | 16 | ${dut_ip6_gw}
-| | ... | ${dut_to_tg_if2} | resolve_attempts=${NONE} | count=${NONE}
+| | And Vpp Route Add | ${dut_node} | 2001:: | 16 | gateway=${dut_ip6_gw}
+| | ... | interface=${dut_to_tg_if2} | resolve_attempts=${NONE} | count=${NONE}
 | | And Add IP Neighbor | ${dut_node} | ${dut_to_tg_if2} | ${dut_ip6_gw}
 | | ... | ${tg_to_dut_if2_mac}
-| | And Vpp Route Add | ${dut_node} | 0.0.0.0 | 0 | ${dut_ip4_gw}
-| | ... | ${dut_to_tg_if1} | resolve_attempts=${NONE} | count=${NONE}
+| | And Vpp Route Add | ${dut_node} | 0.0.0.0 | 0 | gateway=${dut_ip4_gw}
+| | ... | interface=${dut_to_tg_if1} | resolve_attempts=${NONE} | count=${NONE}
 | | And Add IP Neighbor | ${dut_node} | ${dut_to_tg_if1} | ${dut_ip4_gw}
 | | ... | ${tg_to_dut_if1_mac}
 | | Then Check MAP Configuration With Traffic Script
@@ -387,12 +387,12 @@
 | | When Configure IP addresses on interfaces
 | | ... | ${dut_node} | ${dut_to_tg_if1} | ${dut_ip4} | ${ipv4_prefix_len}
 | | ... | ${dut_node} | ${dut_to_tg_if2} | ${dut_ip6} | ${ipv6_prefix_len}
-| | And Vpp Route Add | ${dut_node} | 2001:: | 16 | ${dut_ip6_gw}
-| | ... | ${dut_to_tg_if2} | resolve_attempts=${NONE} | count=${NONE}
+| | And Vpp Route Add | ${dut_node} | 2001:: | 16 | gateway=${dut_ip6_gw}
+| | ... | interface=${dut_to_tg_if2} | resolve_attempts=${NONE} | count=${NONE}
 | | And Add IP Neighbor | ${dut_node} | ${dut_to_tg_if2} | ${dut_ip6_gw}
 | | ... | ${tg_to_dut_if2_mac}
-| | And Vpp Route Add | ${dut_node} | 0.0.0.0 | 0 | ${dut_ip4_gw}
-| | ... | ${dut_to_tg_if1} | resolve_attempts=${NONE} | count=${NONE}
+| | And Vpp Route Add | ${dut_node} | 0.0.0.0 | 0 | gateway=${dut_ip4_gw}
+| | ... | interface=${dut_to_tg_if1} | resolve_attempts=${NONE} | count=${NONE}
 | | And Add IP Neighbor | ${dut_node} | ${dut_to_tg_if1} | ${dut_ip4_gw}
 | | ... | ${tg_to_dut_if1_mac}
 | | Then Check MAP Configuration With Traffic Script
@@ -422,12 +422,12 @@
 | | Configure IP addresses on interfaces
 | | ... | ${dut_node} | ${dut_to_tg_if1} | ${dut_ip4} | ${ipv4_prefix_len}
 | | ... | ${dut_node} | ${dut_to_tg_if2} | ${dut_ip6} | ${ipv6_prefix_len}
-| | Vpp Route Add | ${dut_node} | :: | 0 | ${dut_ip6_gw} | ${dut_to_tg_if2}
-| | ... | resolve_attempts=${NONE} | count=${NONE}
+| | Vpp Route Add | ${dut_node} | :: | 0 | gateway=${dut_ip6_gw}
+| | ... | interface=${dut_to_tg_if2} | resolve_attempts=${NONE} | count=${NONE}
 | | Add IP Neighbor | ${dut_node} | ${dut_to_tg_if2} | ${dut_ip6_gw}
 | | ... | ${tg_to_dut_if2_mac}
-| | Vpp Route Add | ${dut_node} | ${ipv4_outside} | 32 | ${dut_ip4_gw}
-| | ... | ${dut_to_tg_if1} | resolve_attempts=${NONE} | count=${NONE}
+| | Vpp Route Add | ${dut_node} | ${ipv4_outside} | 32 | gateway=${dut_ip4_gw}
+| | ... | interface=${dut_to_tg_if1} | resolve_attempts=${NONE} | count=${NONE}
 | | Add IP Neighbor | ${dut_node} | ${dut_to_tg_if1} | ${dut_ip4_gw}
 | | ... | ${tg_to_dut_if1_mac}
 
@@ -451,7 +451,7 @@
 | | ... | ${psid_len} | ${ipv4_dst} | ${dst_port}
 | | ${ipv6_dst}= | Run Keyword If | "${expected_ipv6_dst}" == "${EMPTY}"
 | | ... | Set Variable | ${computed_ipv6_dst}
-| | ... | ELSE |  Set Variable | ${expected_ipv6_dst}
+| | ... | ELSE | Set Variable | ${expected_ipv6_dst}
 | | Run Keyword If | "${expected_ipv6_dst}" != "${EMPTY}"
 | | ... | IP Addresses Should Be Equal
 | | ... | ${computed_ipv6_dst} | ${expected_ipv6_dst}
diff --git a/tests/vpp/func/ip4_tunnels/softwire/eth2p-ethip4--ethip6ip4-ip4base--ip6base-swiremapt-func.robot b/tests/vpp/func/ip4_tunnels/softwire/eth2p-ethip4--ethip6ip4-ip4base--ip6base-swiremapt-func.robot
index 981367e1b0..6bedf88313 100644
--- a/tests/vpp/func/ip4_tunnels/softwire/eth2p-ethip4--ethip6ip4-ip4base--ip6base-swiremapt-func.robot
+++ b/tests/vpp/func/ip4_tunnels/softwire/eth2p-ethip4--ethip6ip4-ip4base--ip6base-swiremapt-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:
@@ -84,12 +84,12 @@
 | | Configure IP addresses on interfaces
 | | ... | ${dut_node} | ${dut_to_tg_if1} | ${dut_ip4} | ${ipv4_prefix_len}
 | | ... | ${dut_node} | ${dut_to_tg_if2} | ${dut_ip6} | ${ipv6_prefix_len}
-| | Vpp Route Add | ${dut_node} | :: | 0 | ${dut_ip6_gw} | ${dut_to_tg_if2}
-| | ... | resolve_attempts=${NONE} | count=${NONE}
+| | Vpp Route Add | ${dut_node} | :: | 0 | gateway=${dut_ip6_gw}
+| | ... | interface=${dut_to_tg_if2} | resolve_attempts=${NONE} | count=${NONE}
 | | Add IP neighbor | ${dut_node} | ${dut_to_tg_if2} | ${dut_ip6_gw}
 | | ... | ${tg_to_dut_if2_mac}
-| | Vpp Route Add | ${dut_node} | 0.0.0.0 | 0 | ${dut_ip4_gw} | ${dut_to_tg_if1}
-| | ... | resolve_attempts=${NONE} | count=${NONE}
+| | Vpp Route Add | ${dut_node} | 0.0.0.0 | 0 | gateway=${dut_ip4_gw}
+| | ... | interface=${dut_to_tg_if1} | resolve_attempts=${NONE} | count=${NONE}
 | | Add IP neighbor | ${dut_node} | ${dut_to_tg_if1} | ${dut_ip4_gw}
 | | ... | ${tg_to_dut_if1_mac}
 
-- 
cgit 1.2.3-korg