diff options
| author |   Jan Gelety <jgelety@cisco.com> | 2019-01-24 12:31:25 +0100 |
|---|---|---|
| committer | Jan Gelety <jgelety@cisco.com> | 2019-01-24 15:14:36 +0000 |
| commit | 159d6db940f03a0b9abff24442a66888e21e18df (patch) | |
| tree | 6e226be5f235cb72b6db97ba782236b47135f999 | |
| parent | 453528c437622e48799d0a061a1fead4ed573e9e (diff) | |
FIX: correct call of vpp_add_route
Change-Id: I63a2b5f484ac627c020e30c9f01a868c57aacf42
Signed-off-by: Jan Gelety <jgelety@cisco.com>
(cherry picked from commit 552491e8bcff9745b04fbdd92609351ec9597cdc)
43 files changed, 421 insertions, 368 deletions
diff --git a/resources/libraries/robot/crypto/ipsec.robot b/resources/libraries/robot/crypto/ipsec.robot index d918a54159..5064646212 100644 --- a/resources/libraries/robot/crypto/ipsec.robot +++ b/resources/libraries/robot/crypto/ipsec.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: @@ -99,8 +99,8 @@ | | Set Interface Address | ${dut_node} | ${dut_lo} | ${dut_lo_ip4} | | ... | ${ip4_plen} | | dut1_v4.Set Arp | ${dut_if} | ${tg_if_ip4} | ${tg_if_mac} -| | Vpp Route Add | ${dut_node} | ${tg_lo_ip4} | ${ip4_plen} | ${tg_if_ip4} -| | ... | ${dut_if} +| | Vpp Route Add | ${dut_node} | ${tg_lo_ip4} | ${ip4_plen} +| | ... | gateway=${tg_if_ip4} | interface=${dut_if} | | Set Test Variable | ${dut_tun_ip} | ${dut_if_ip4} | | Set Test Variable | ${dut_src_ip} | ${dut_lo_ip4} | | Set Test Variable | ${tg_tun_ip} | ${tg_if_ip4} @@ -122,8 +122,8 @@ | | VPP Set If IPv6 Addr | ${dut_node} | ${dut_lo} | ${dut_lo_ip6} | ${ip6_plen} | | Add IP Neighbor | ${dut_node} | ${dut_if} | ${tg_if_ip6} | ${tg_if_mac} | | Vpp All RA Suppress Link Layer | ${nodes} -| | Vpp Route Add | ${dut_node} | ${tg_lo_ip6} | ${ip6_plen_rt} | ${tg_if_ip6} -| | ... | ${dut_if} +| | Vpp Route Add | ${dut_node} | ${tg_lo_ip6} | ${ip6_plen_rt} +| | ... | gateway=${tg_if_ip6} | interface=${dut_if} | | Set Test Variable | ${dut_tun_ip} | ${dut_if_ip6} | | Set Test Variable | ${dut_src_ip} | ${dut_lo_ip6} | | Set Test Variable | ${tg_tun_ip} | ${tg_if_ip6} diff --git a/resources/libraries/robot/ip/ip4.robot b/resources/libraries/robot/ip/ip4.robot index def7d3212c..d811d0deea 100644 --- a/resources/libraries/robot/ip/ip4.robot +++ b/resources/libraries/robot/ip/ip4.robot @@ -1,4 +1,4 @@ -# Copyright (c) 2018 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: @@ -55,13 +55,13 @@ | | :FOR | ${link} | IN | @{tg_dut1_links} | | | ${net}= | Get Link Address | ${link} | ${nodes_addr} | | | ${prefix}= | Get Link Prefix | ${link} | ${nodes_addr} -| | | Vpp Route Add | ${dut2} | ${net} | ${prefix} | ${dut1_if_addr} -| | | ... | ${dut2_if} +| | | Vpp Route Add | ${dut2} | ${net} | ${prefix} +| | | ... | gateway=${dut1_if_addr} | interface=${dut2_if} | | :FOR | ${link} | IN | @{tg_dut2_links} | | | ${net}= | Get Link Address | ${link} | ${nodes_addr} | | | ${prefix}= | Get Link Prefix | ${link} | ${nodes_addr} -| | | Vpp Route Add | ${dut1} | ${net} | ${prefix} | ${dut2_if_addr} -| | | ... | ${dut1_if} +| | | Vpp Route Add | ${dut1} | ${net} | ${prefix} +| | | ... | gateway=${dut2_if_addr} | interface=${dut1_if} | Configure DUT nodes for IPv4 testing | | Configure IPv4 addresses on all DUTs | ${nodes} | ${nodes_ipv4_addr} @@ -285,10 +285,12 @@ | | ... | | Run Keyword Unless | '${remote_host1_ip4}' == '${NONE}' | | ... | Vpp Route Add | ${dut_node} | ${remote_host1_ip4} -| | ... | ${remote_host_ip4_prefix} | ${tg_if1_ip4} | ${dut_to_tg_if1} +| | ... | ${remote_host_ip4_prefix} | gateway=${tg_if1_ip4} +| | ... | interface=${dut_to_tg_if1} | | Run Keyword Unless | '${remote_host2_ip4}' == '${NONE}' | | ... | Vpp Route Add | ${dut_node} | ${remote_host2_ip4} -| | ... | ${remote_host_ip4_prefix} | ${tg_if2_ip4} | ${dut_to_tg_if2} +| | ... | ${remote_host_ip4_prefix} | gateway=${tg_if2_ip4} +| | ... | interface=${dut_to_tg_if2} | Configure IPv4 forwarding in 3-node circular topology | | [Documentation] @@ -350,19 +352,23 @@ | | ... | ${dut2_if2_ip4} | ${dut_tg_ip4_prefix} | | ... | | Vpp Route Add | ${dut1_node} | ${tg_if2_ip4} | ${dut_tg_ip4_prefix} -| | ... | ${dut2_if1_ip4} | ${dut1_to_dut2} +| | ... | gateway=${dut2_if1_ip4} | interface=${dut1_to_dut2} | | Vpp Route Add | ${dut2_node} | ${tg_if1_ip4} | ${dut_tg_ip4_prefix} -| | ... | ${dut1_if2_ip4} | ${dut2_to_dut1} +| | ... | gateway=${dut1_if2_ip4} | interface=${dut2_to_dut1} | | ... | | Run Keyword Unless | '${remote_host1_ip4}' == '${NONE}' | | ... | Vpp Route Add | ${dut1_node} | ${remote_host1_ip4} -| | ... | ${remote_host_ip4_prefix} | ${tg_if1_ip4} | ${dut1_to_tg} +| | ... | ${remote_host_ip4_prefix} | gateway=${tg_if1_ip4} +| | ... | interface=${dut1_to_tg} | | Run Keyword Unless | '${remote_host2_ip4}' == '${NONE}' | | ... | Vpp Route Add | ${dut1_node} | ${remote_host2_ip4} -| | ... | ${remote_host_ip4_prefix} | ${dut2_if1_ip4} | ${dut1_to_dut2} +| | ... | ${remote_host_ip4_prefix} | gateway=${dut2_if1_ip4} +| | ... | interface=${dut1_to_dut2} | | Run Keyword Unless | '${remote_host1_ip4}' == '${NONE}' | | ... | Vpp Route Add | ${dut2_node} | ${remote_host1_ip4} -| | ... | ${remote_host_ip4_prefix} | ${dut1_if2_ip4} | ${dut2_to_dut1} +| | ... | ${remote_host_ip4_prefix} | gateway=${dut1_if2_ip4} +| | ... | interface=${dut2_to_dut1} | | Run Keyword Unless | '${remote_host2_ip4}' == '${NONE}' | | ... | Vpp Route Add | ${dut2_node} | ${remote_host2_ip4} -| | ... | ${remote_host_ip4_prefix} | ${tg_if2_ip4} | ${dut2_to_tg} +| | ... | ${remote_host_ip4_prefix} | gateway=${tg_if2_ip4} +| | ... | interface=${dut2_to_tg} diff --git a/resources/libraries/robot/ip/ip6.robot b/resources/libraries/robot/ip/ip6.robot index b547e7d147..73d486ed8f 100644 --- a/resources/libraries/robot/ip/ip6.robot +++ b/resources/libraries/robot/ip/ip6.robot @@ -1,4 +1,4 @@ -# Copyright (c) 2018 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: @@ -201,13 +201,13 @@ | | :FOR | ${link} | IN | @{tg_dut1_links} | | | ${net}= | Get Link Address | ${link} | ${nodes_addr} | | | ${prefix}= | Get Link Prefix | ${link} | ${nodes_addr} -| | | Vpp Route Add | ${dut2} | ${net} | ${prefix} | ${dut1_if_addr} -| | | ... | ${dut2_if} +| | | Vpp Route Add | ${dut2} | ${net} | ${prefix} | gateway=${dut1_if_addr} +| | | ... | interface=${dut2_if} | | :FOR | ${link} | IN | @{tg_dut2_links} | | | ${net}= | Get Link Address | ${link} | ${nodes_addr} | | | ${prefix}= | Get Link Prefix | ${link} | ${nodes_addr} -| | | Vpp Route Add | ${dut1} | ${net} | ${prefix} | ${dut2_if_addr} -| | | ... | ${dut1_if} +| | | Vpp Route Add | ${dut1} | ${net} | ${prefix} | gateway=${dut2_if_addr} +| | | ... | interface=${dut1_if} | Configure IPv6 forwarding in circular topology | | [Documentation] @@ -321,10 +321,12 @@ | | ... | | Run Keyword Unless | '${remote_host1_ip6}' == '${NONE}' | | ... | Vpp Route Add | ${dut_node} | ${remote_host1_ip6} -| | ... | ${remote_host_ip6_prefix} | ${tg_if1_ip6} | ${dut_to_tg_if1} +| | ... | ${remote_host_ip6_prefix} | gateway=${tg_if1_ip6} +| | ... | interface=${dut_to_tg_if1} | | Run Keyword Unless | '${remote_host2_ip6}' == '${NONE}' | | ... | Vpp Route Add | ${dut_node} | ${remote_host2_ip6} -| | ... | ${remote_host_ip6_prefix} | ${tg_if2_ip6} | ${dut_to_tg_if2} +| | ... | ${remote_host_ip6_prefix} | gateway=${tg_if2_ip6} +| | ... | interface=${dut_to_tg_if2} | Configure IPv6 forwarding in 3-node circular topology | | [Documentation] @@ -387,19 +389,23 @@ | | ... | ${dut_tg_ip6_prefix} | | ... | | Vpp Route Add | ${dut1_node} | ${tg_if2_ip6} | ${dut_tg_ip6_prefix} -| | ... | ${dut2_if1_ip6} | ${dut1_to_dut2} +| | ... | gateway=${dut2_if1_ip6} | interface=${dut1_to_dut2} | | Vpp Route Add | ${dut2_node} | ${tg_if1_ip6} | ${dut_tg_ip6_prefix} -| | ... | ${dut1_if2_ip6} | ${dut2_to_dut1} +| | ... | gateway=${dut1_if2_ip6} | interface=${dut2_to_dut1} | | ... | | Run Keyword Unless | '${remote_host1_ip6}' == '${NONE}' | | ... | Vpp Route Add | ${dut1_node} | ${remote_host1_ip6} -| | ... | ${remote_host_ip6_prefix} | ${tg_if1_ip6} | ${dut1_to_tg} +| | ... | ${remote_host_ip6_prefix} | gateway=${tg_if1_ip6} +| | ... | interface=${dut1_to_tg} | | Run Keyword Unless | '${remote_host2_ip6}' == '${NONE}' | | ... | Vpp Route Add | ${dut1_node} | ${remote_host2_ip6} -| | ... | ${remote_host_ip6_prefix} | ${dut2_if1_ip6} | ${dut1_to_dut2} +| | ... | ${remote_host_ip6_prefix} | gateway=${dut2_if1_ip6} +| | ... | interface=${dut1_to_dut2} | | Run Keyword Unless | '${remote_host1_ip6}' == '${NONE}' | | ... | Vpp Route Add | ${dut2_node} | ${remote_host1_ip6} -| | ... | ${remote_host_ip6_prefix} | ${dut1_if2_ip6} | ${dut2_to_dut1} +| | ... | ${remote_host_ip6_prefix} | gateway=${dut1_if2_ip6} +| | ... | interface=${dut2_to_dut1} | | Run Keyword Unless | '${remote_host2_ip6}' == '${NONE}' | | ... | Vpp Route Add | ${dut2_node} | ${remote_host2_ip6} -| | ... | ${remote_host_ip6_prefix} | ${tg_if2_ip6} | ${dut2_to_tg} +| | ... | ${remote_host_ip6_prefix} | gateway=${tg_if2_ip6} +| | ... | interface=${dut2_to_tg} diff --git a/resources/libraries/robot/performance/performance_configuration.robot b/resources/libraries/robot/performance/performance_configuration.robot index 53bb4365e6..2edc11b4e5 100644 --- a/resources/libraries/robot/performance/performance_configuration.robot +++ b/resources/libraries/robot/performance/performance_configuration.robot @@ -172,8 +172,10 @@ | | Add arp on dut | ${dut1} | ${dut1_if2} | ${dut2_if1_ip4} | ${dut2_if1_mac} | | Add arp on dut | ${dut2} | ${dut2_if2} | ${tg_if2_ip4} | ${tg_if2_mac} | | Add arp on dut | ${dut2} | ${dut2_if1} | ${dut1_if2_ip4} | ${dut1_if2_mac} -| | Vpp Route Add | ${dut1} | ${laddr_ip4} | 8 | ${tg_if1_ip4} | ${dut1_if1} -| | Vpp Route Add | ${dut2} | ${raddr_ip4} | 8 | ${tg_if2_ip4} | ${dut2_if2} +| | Vpp Route Add | ${dut1} | ${laddr_ip4} | 8 | gateway=${tg_if1_ip4} +| | ... | interface=${dut1_if1} +| | Vpp Route Add | ${dut2} | ${raddr_ip4} | 8 | gateway=${tg_if2_ip4} +| | ... | interface=${dut2_if2} | Initialize IPv4 forwarding in circular topology | | [Documentation] @@ -221,9 +223,11 @@ | | ... | 20.20.20.1 | 24 | | ... | | Run Keyword If | '${dut2_status}' == 'PASS' -| | ... | Vpp Route Add | ${dut1} | 20.20.20.0 | 24 | 1.1.1.2 | ${dut1_if2} +| | ... | Vpp Route Add | ${dut1} | 20.20.20.0 | 24 | gateway=1.1.1.2 +| | ... | interface=${dut1_if2} | | Run Keyword If | '${dut2_status}' == 'PASS' -| | ... | Vpp Route Add | ${dut2} | 10.10.10.0 | 24 | 1.1.1.1 | ${dut2_if1} +| | ... | Vpp Route Add | ${dut2} | 10.10.10.0 | 24 | gateway=1.1.1.1 +| | ... | interface=${dut2_if1} | Initialize IPv4 forwarding with scaling in circular topology | | [Documentation] @@ -274,16 +278,16 @@ | | ... | Configure IP addresses on interfaces | ${dut2} | ${dut2_if1} | 2.2.2.2 | | ... | 30 | | Configure IP addresses on interfaces | ${dut} | ${dut_if2} | 3.3.3.2 | 30 -| | Vpp Route Add | ${dut1} | 10.0.0.0 | 32 | 1.1.1.1 | ${dut1_if1} -| | ... | count=${count} +| | Vpp Route Add | ${dut1} | 10.0.0.0 | 32 | gateway=1.1.1.1 +| | ... | interface=${dut1_if1} | count=${count} | | Run Keyword If | '${dut2_status}' == 'PASS' -| | ... | Vpp Route Add | ${dut1} | 20.0.0.0 | 32 | 2.2.2.2 | ${dut1_if2} -| | ... | count=${count} +| | ... | Vpp Route Add | ${dut1} | 20.0.0.0 | 32 | gateway=2.2.2.2 +| | ... | interface=${dut1_if2} | count=${count} | | Run Keyword If | '${dut2_status}' == 'PASS' -| | ... | Vpp Route Add | ${dut2} | 10.0.0.0 | 32 | 2.2.2.1 | ${dut2_if1} -| | ... | count=${count} -| | Vpp Route Add | ${dut} | 20.0.0.0 | 32 | 3.3.3.1 | ${dut_if2} -| | ... | count=${count} +| | ... | Vpp Route Add | ${dut2} | 10.0.0.0 | 32 | gateway=2.2.2.1 +| | ... | interface=${dut2_if1} | count=${count} +| | Vpp Route Add | ${dut} | 20.0.0.0 | 32 | gateway=3.3.3.1 +| | ... | interface=${dut_if2} | count=${count} | Initialize IPv4 forwarding with vhost in 2-node circular topology | | [Documentation] @@ -328,10 +332,10 @@ | | ${tg1_if2_mac}= | Get Interface MAC | ${tg} | ${tg_if2} | | Add arp on dut | ${dut1} | ${dut1_if1} | 1.1.1.1 | ${tg1_if1_mac} | | Add arp on dut | ${dut1} | ${dut1_if2} | 2.2.2.2 | ${tg1_if2_mac} -| | Vpp Route Add | ${dut1} | 10.10.10.0 | 24 | 1.1.1.1 | ${dut1_if1} -| | ... | vrf=${fib_table_1} -| | Vpp Route Add | ${dut1} | 20.20.20.0 | 24 | 2.2.2.2 | ${dut1_if2} -| | ... | vrf=${fib_table_2} +| | Vpp Route Add | ${dut1} | 10.10.10.0 | 24 | gateway=1.1.1.1 +| | ... | interface=${dut1_if1} | vrf=${fib_table_1} +| | Vpp Route Add | ${dut1} | 20.20.20.0 | 24 | gateway=2.2.2.2 +| | ... | interface=${dut1_if2} | vrf=${fib_table_2} | | ${ip_base_start}= | Set Variable | ${4} | | :FOR | ${number} | IN RANGE | 1 | ${vm_count}+1 | | | ${sock1}= | Set Variable | /tmp/sock-${number}-1 @@ -382,10 +386,10 @@ | | | ... | ${ip_net_vif1}.2 | 52:54:00:00:${qemu_id}:01 | | | Add arp on dut | ${dut1} | ${dut1-vhost-${number}-if2} | | | ... | ${ip_net_vif2}.2 | 52:54:00:00:${qemu_id}:02 -| | | Vpp Route Add | ${dut1} | 20.20.20.0 | 24 | ${ip_net_vif1}.2 -| | | ... | ${dut1-vhost-${number}-if1} | vrf=${fib_table_1} -| | | Vpp Route Add | ${dut1} | 10.10.10.0 | 24 | ${ip_net_vif2}.2 -| | | ... | ${dut1-vhost-${number}-if2} | vrf=${fib_table_2} +| | | Vpp Route Add | ${dut1} | 20.20.20.0 | 24 | gateway=${ip_net_vif1}.2 +| | | ... | interface=${dut1-vhost-${number}-if1} | vrf=${fib_table_1} +| | | Vpp Route Add | ${dut1} | 10.10.10.0 | 24 | gateway=${ip_net_vif2}.2 +| | | ... | interface=${dut1-vhost-${number}-if2} | vrf=${fib_table_2} | Initialize IPv4 forwarding with vhost in 3-node circular topology | | [Documentation] @@ -444,14 +448,14 @@ | | Add arp on dut | ${dut1} | ${dut1_if2} | 2.2.2.2 | ${dut2_if1_mac} | | Add arp on dut | ${dut2} | ${dut2_if1} | 2.2.2.1 | ${dut1_if2_mac} | | Add arp on dut | ${dut2} | ${dut2_if2} | 3.3.3.2 | ${tg1_if2_mac} -| | Vpp Route Add | ${dut1} | 10.10.10.0 | 24 | 1.1.1.1 | ${dut1_if1} -| | ... | vrf=${fib_table_1} -| | Vpp Route Add | ${dut1} | 20.20.20.0 | 24 | 2.2.2.2 | ${dut1_if2} -| | ... | vrf=${fib_table_2} -| | Vpp Route Add | ${dut2} | 10.10.10.0 | 24 | 2.2.2.1 | ${dut2_if1} -| | ... | vrf=${fib_table_1} -| | Vpp Route Add | ${dut2} | 20.20.20.0 | 24 | 3.3.3.2 | ${dut2_if2} -| | ... | vrf=${fib_table_2} +| | Vpp Route Add | ${dut1} | 10.10.10.0 | 24 | gateway=1.1.1.1 +| | ... | interface=${dut1_if1} | vrf=${fib_table_1} +| | Vpp Route Add | ${dut1} | 20.20.20.0 | 24 | gateway=2.2.2.2 +| | ... | interface=${dut1_if2} | vrf=${fib_table_2} +| | Vpp Route Add | ${dut2} | 10.10.10.0 | 24 | gateway=2.2.2.1 +| | ... | interface=${dut2_if1} | vrf=${fib_table_1} +| | Vpp Route Add | ${dut2} | 20.20.20.0 | 24 | gateway=3.3.3.2 +| | ... | interface=${dut2_if2} | vrf=${fib_table_2} | | ${ip_base_start}= | Set Variable | ${4} | | :FOR | ${number} | IN RANGE | 1 | ${vm_count}+1 | | | ${sock1}= | Set Variable | /tmp/sock-${number}-1 @@ -537,14 +541,14 @@ | | | ... | ${ip_net_vif1}.2 | 52:54:00:00:${qemu_id}:01 | | | Add arp on dut | ${dut2} | ${dut2-vhost-${number}-if2} | | | ... | ${ip_net_vif2}.2 | 52:54:00:00:${qemu_id}:02 -| | | Vpp Route Add | ${dut1} | 20.20.20.0 | 24 | ${ip_net_vif1}.2 -| | | ... | ${dut1-vhost-${number}-if1} | vrf=${fib_table_1} -| | | Vpp Route Add | ${dut1} | 10.10.10.0 | 24 | ${ip_net_vif2}.2 -| | | ... | ${dut1-vhost-${number}-if2} | vrf=${fib_table_2} -| | | Vpp Route Add | ${dut2} | 20.20.20.0 | 24 | ${ip_net_vif1}.2 -| | | ... | ${dut2-vhost-${number}-if1} | vrf=${fib_table_1} -| | | Vpp Route Add | ${dut2} | 10.10.10.0 | 24 | ${ip_net_vif2}.2 -| | | ... | ${dut2-vhost-${number}-if2} | vrf=${fib_table_2} +| | | Vpp Route Add | ${dut1} | 20.20.20.0 | 24 | gateway=${ip_net_vif1}.2 +| | | ... | interface=${dut1-vhost-${number}-if1} | vrf=${fib_table_1} +| | | Vpp Route Add | ${dut1} | 10.10.10.0 | 24 | gateway=${ip_net_vif2}.2 +| | | ... | interface=${dut1-vhost-${number}-if2} | vrf=${fib_table_2} +| | | Vpp Route Add | ${dut2} | 20.20.20.0 | 24 | gateway=${ip_net_vif1}.2 +| | | ... | interface=${dut2-vhost-${number}-if1} | vrf=${fib_table_1} +| | | Vpp Route Add | ${dut2} | 10.10.10.0 | 24 | gateway=${ip_net_vif2}.2 +| | | ... | interface=${dut2-vhost-${number}-if2} | vrf=${fib_table_2} | Initialize IPv4 forwarding with VLAN dot1q sub-interfaces in circular topology | | [Documentation] @@ -623,14 +627,16 @@ | | ... | Configure IP addresses on interfaces | ${dut2} | ${subif_index_2} | | ... | 2.2.2.2 | 30 | | Configure IP addresses on interfaces | ${dut} | ${dut_if2} | 3.3.3.2 | 30 -| | Vpp Route Add | ${dut1} | ${tg_if1_net} | 30 | 1.1.1.1 | ${dut1_if1} +| | Vpp Route Add | ${dut1} | ${tg_if1_net} | 30 | gateway=1.1.1.1 +| | ... | interface=${dut1_if1} | | Run Keyword If | '${dut2_status}' == 'PASS' -| | ... | Vpp Route Add | ${dut1} | ${tg_if2_net} | 30 | 2.2.2.2 -| | ... | ${subif_index_1} +| | ... | Vpp Route Add | ${dut1} | ${tg_if2_net} | 30 | gateway=2.2.2.2 +| | ... | interface=${subif_index_1} | | Run Keyword If | '${dut2_status}' == 'PASS' -| | ... | Vpp Route Add | ${dut2} | ${tg_if1_net} | 30 | 2.2.2.1 -| | ... | ${subif_index_2} -| | Vpp Route Add | ${dut} | ${tg_if2_net} | 30 | 3.3.3.1 | ${dut_if2} +| | ... | Vpp Route Add | ${dut2} | ${tg_if1_net} | 30 | gateway=2.2.2.1 +| | ... | interface=${subif_index_2} +| | Vpp Route Add | ${dut} | ${tg_if2_net} | 30 | gateway=3.3.3.1 +| | ... | interface=${dut_if2} | Initialize IPv4 policer 2r3c-${t} in circular topology | | [Documentation] @@ -712,8 +718,10 @@ | | Add Ip Neighbor | ${dut2} | ${dut2_if2} | 2001:2::2 | ${tg1_if2_mac} | | Add Ip Neighbor | ${dut1} | ${dut1_if2} | 2001:3::2 | ${dut2_if1_mac} | | Add Ip Neighbor | ${dut2} | ${dut2_if1} | 2001:3::1 | ${dut1_if2_mac} -| | Vpp Route Add | ${dut1} | 2001:2::0 | ${prefix} | 2001:3::2 | ${dut1_if2} -| | Vpp Route Add | ${dut2} | 2001:1::0 | ${prefix} | 2001:3::1 | ${dut2_if1} +| | Vpp Route Add | ${dut1} | 2001:2::0 | ${prefix} | gateway=2001:3::2 +| | ... | interface=${dut1_if2} +| | Vpp Route Add | ${dut2} | 2001:1::0 | ${prefix} | gateway=2001:3::1 +| | ... | interface=${dut2_if1} | Initialize IPv6 forwarding with scaling in circular topology | | [Documentation] @@ -765,15 +773,15 @@ | | Run Keyword If | '${dut2_status}' == 'PASS' | | ... | Add Ip Neighbor | ${dut2} | ${dut2_if1} | 2001:4::1 | ${dut1_if2_mac} | | Add Ip Neighbor | ${dut} | ${dut_if2} | 2001:5::2 | ${tg1_if2_mac} -| | Vpp Route Add | ${dut1} | 2001:1::0 | ${host_prefix} | 2001:3::2 +| | Vpp Route Add | ${dut1} | 2001:1::0 | ${host_prefix} | gateway=2001:3::2 | | ... | interface=${dut1_if1} | count=${count} | | Run Keyword If | '${dut2_status}' == 'PASS' -| | ... | Vpp Route Add | ${dut1} | 2001:2::0 | ${host_prefix} | 2001:4::2 -| | ... | interface=${dut1_if2} | count=${count} +| | ... | Vpp Route Add | ${dut1} | 2001:2::0 | ${host_prefix} +| | ... | gateway=2001:4::2 | interface=${dut1_if2} | count=${count} | | Run Keyword If | '${dut2_status}' == 'PASS' -| | ... | Vpp Route Add | ${dut2} | 2001:1::0 | ${host_prefix} | 2001:4::1 -| | ... | interface=${dut2_if1} | count=${count} -| | Vpp Route Add | ${dut} | 2001:2::0 | ${host_prefix} | 2001:5::2 +| | ... | Vpp Route Add | ${dut2} | 2001:1::0 | ${host_prefix} +| | ... | gateway=2001:4::1 | interface=${dut2_if1} | count=${count} +| | Vpp Route Add | ${dut} | 2001:2::0 | ${host_prefix} | gateway=2001:5::2 | | ... | interface=${dut_if2} | count=${count} | Initialize IPv6 forwarding with VLAN dot1q sub-interfaces in circular topology @@ -856,16 +864,16 @@ | | ... | ${prefix} | | VPP Set If IPv6 Addr | ${dut} | ${dut_if2} | 2002:3::2 | ${prefix} | | Suppress ICMPv6 router advertisement message | ${nodes} -| | Vpp Route Add | ${dut1} | ${tg_if1_net} | ${host_prefix} | 2002:1::1 -| | ... | interface=${dut1_if1} +| | Vpp Route Add | ${dut1} | ${tg_if1_net} | ${host_prefix} +| | ... | gateway=2002:1::1 | interface=${dut1_if1} | | Run Keyword If | '${dut2_status}' == 'PASS' -| | ... | Vpp Route Add | ${dut1} | ${tg_if2_net} | ${host_prefix} | 2002:2::2 -| | ... | interface=${subif_index_1} +| | ... | Vpp Route Add | ${dut1} | ${tg_if2_net} | ${host_prefix} +| | ... | gateway=2002:2::2 | interface=${subif_index_1} | | Run Keyword If | '${dut2_status}' == 'PASS' -| | ... | Vpp Route Add | ${dut2} | ${tg_if1_net} | ${host_prefix} | 2002:2::1 -| | ... | interface=${subif_index_2} -| | Vpp Route Add | ${dut} | ${tg_if2_net} | ${host_prefix} | 2002:3::1 -| | ... | interface=${dut_if2} +| | ... | Vpp Route Add | ${dut2} | ${tg_if1_net} | ${host_prefix} +| | ... | gateway=2002:2::1 | interface=${subif_index_2} +| | Vpp Route Add | ${dut} | ${tg_if2_net} | ${host_prefix} +| | ... | gateway=2002:3::1 | interface=${dut_if2} | Initialize IPv6 iAcl whitelist in 3-node circular topology | | [Documentation] @@ -918,10 +926,10 @@ | | ${sid2}= | Set Variable If | | ... | "${n}" == "1" | ${dut1_sid2} | | ... | "${n}" == "2" | ${dut1_sid2_1} -| | Vpp Route Add | ${dut1} | ${sid1} | ${sid_prefix} | ${dut2_if1_ip6} -| | ... | ${dut1_if2} -| | Vpp Route Add | ${dut2} | ${sid2} | ${sid_prefix} | ${dut1_if2_ip6} -| | ... | ${dut2_if1} +| | Vpp Route Add | ${dut1} | ${sid1} | ${sid_prefix} | gateway=${dut2_if1_ip6} +| | ... | interface=${dut1_if2} +| | Vpp Route Add | ${dut2} | ${sid2} | ${sid_prefix} | gateway=${dut1_if2_ip6} +| | ... | interface=${dut2_if1} # Configure SRv6 for direction0 | | Set SR Encaps Source Address on DUT | ${dut1} | ${dut1_sid1} | | @{sid_list_dir0}= | Run Keyword If | "${n}" == "1" @@ -942,7 +950,7 @@ | | ... | interface=${dut2_if2} | next_hop=${tg_if2_ip6_subnet}2 | | Run Keyword If | "${n}" == "2" and "${prepos}" == "without" | | ... | Vpp Route Add | ${dut2} | ${dut2_sid1_2} | ${sid_prefix} -| | ... | ${tg_if2_ip6_subnet}2 | ${dut2_if2} +| | ... | gateway=${tg_if2_ip6_subnet}2 | interface=${dut2_if2} # Configure SRv6 for direction1 | | Set SR Encaps Source Address on DUT | ${dut2} | ${dut2_sid2} | | @{sid_list_dir1}= | Run Keyword If | "${n}" == "1" @@ -963,7 +971,7 @@ | | ... | interface=${dut1_if1} | next_hop=${tg_if1_ip6_subnet}2 | | Run Keyword If | "${n}" == "2" and "${prepos}" == "without" | | ... | Vpp Route Add | ${dut1} | ${dut1_sid2_2} | ${sid_prefix} -| | ... | ${tg_if1_ip6_subnet}2 | ${dut1_if1} +| | ... | gateway=${tg_if1_ip6_subnet}2 | interface=${dut1_if1} | | Set interfaces in path up | Initialize IPv6 forwarding over SRv6 with endpoint to SR-unaware Service Function via '${behavior}' behaviour in 3-node circular topology @@ -1023,14 +1031,14 @@ | | ... | ${dut1-memif-1-if2_mac} | | Add Ip Neighbor | ${dut2} | ${dut2-memif-1-if1} | ${dut2_nh} | | ... | ${dut2-memif-1-if2_mac} -| | Vpp Route Add | ${dut1} | ${dut2_sid1} | ${sid_prefix} | ${dut2_if1_ip6} -| | ... | ${dut1_if2} +| | Vpp Route Add | ${dut1} | ${dut2_sid1} | ${sid_prefix} +| | ... | gateway=${dut2_if1_ip6} | interface=${dut1_if2} | | Vpp Route Add | ${dut1} | ${out_sid2_1} | ${sid_prefix} -| | ... | ${tg_if1_ip6_subnet}2 | ${dut1_if1} -| | Vpp Route Add | ${dut2} | ${dut1_sid2} | ${sid_prefix} | ${dut1_if2_ip6} -| | ... | ${dut2_if1} +| | ... | gateway=${tg_if1_ip6_subnet}2 | interface=${dut1_if1} +| | Vpp Route Add | ${dut2} | ${dut1_sid2} | ${sid_prefix} +| | ... | gateway=${dut1_if2_ip6} | interface=${dut2_if1} | | Vpp Route Add | ${dut2} | ${out_sid1_1} | ${sid_prefix} -| | ... | ${tg_if2_ip6_subnet}2 | ${dut2_if2} +| | ... | gateway=${tg_if2_ip6_subnet}2 | interface=${dut2_if2} # Configure SRv6 for direction0 on DUT1 | | Set SR Encaps Source Address on DUT | ${dut1} | ${dut1_sid1} | | @{sid_list_dir0}= | Create List | ${dut2_sid1} | ${out_sid1_1} @@ -1550,9 +1558,11 @@ | | ... | ${dut2} | ${dut2_if1} | 1.1.1.2 | 30 | | ... | | Run Keyword If | '${dut2_status}' == 'PASS' -| | ... | Vpp Route Add | ${dut1} | 20.20.20.0 | 24 | 1.1.1.2 | ${dut1_if2} +| | ... | Vpp Route Add | ${dut1} | 20.20.20.0 | 24 | gateway=1.1.1.2 +| | ... | interface=${dut1_if2} | | Run Keyword If | '${dut2_status}' == 'PASS' -| | ... | Vpp Route Add | ${dut2} | 10.10.10.0 | 24 | 1.1.1.1 | ${dut2_if1} +| | ... | Vpp Route Add | ${dut2} | 10.10.10.0 | 24 | gateway=1.1.1.1 +| | ... | interface=${dut2_if1} | | ... | | Configure IPv4 ACLs | ${dut1} | ${dut1_if1} | ${dut1_if2} @@ -1936,9 +1946,9 @@ | | Add arp on dut | ${dut1} | ${dut1_if1} | ${dut1_gw} | ${tg_if1_mac} | | Add arp on dut | ${dut2} | ${dut2_if2} | ${dut2_gw} | ${tg_if2_mac} | | Vpp Route Add | ${dut1} | ${dut1_route_subnet} | ${dut1_route_mask} -| | ... | ${dut1_gw} | ${dut1_if1} +| | ... | gateway=${dut1_gw} | interface=${dut1_if1} | | Vpp Route Add | ${dut2} | ${dut2_route_subnet} | ${dut2_route_mask} -| | ... | ${dut2_gw} | ${dut2_if2} +| | ... | gateway=${dut2_gw} | interface=${dut2_if2} | | Add interface to bridge domain | ${dut1} | ${dut1_if2} | ${dut1_bd_id2} | | Add interface to bridge domain | ${dut2} | ${dut2_if1} | ${dut2_bd_id1} | | Add interface to bridge domain | ${dut1} | ${vhost_if1} | ${dut1_bd_id1} @@ -2935,13 +2945,17 @@ | | ... | Add arp on dut | ${dut2} | ${dut2_if1} | 11.0.0.1 | ${dut1_if2_mac} | | Add arp on dut | ${dut} | ${dut_if2} | 12.0.0.2 | ${tg_if2_mac} | | ... -| | Vpp Route Add | ${dut1} | 20.0.0.0 | 18 | 10.0.0.2 | ${dut1_if1} +| | Vpp Route Add | ${dut1} | 20.0.0.0 | 18 | gateway=10.0.0.2 +| | ... | interface=${dut1_if1} | | Run Keyword If | '${dut2_status}' == 'PASS' -| | ... | Vpp Route Add | ${dut1} | 12.0.0.2 | 32 | 11.0.0.2 | ${dut1_if2} +| | ... | Vpp Route Add | ${dut1} | 12.0.0.2 | 32 | gateway=11.0.0.2 +| | ... | interface=${dut1_if2} | | Run Keyword If | '${dut2_status}' == 'PASS' -| | ... | Vpp Route Add | ${dut2} | 12.0.0.0 | 24 | 12.0.0.2 | ${dut2_if2} +| | ... | Vpp Route Add | ${dut2} | 12.0.0.0 | 24 | gateway=12.0.0.2 +| | ... | interface=${dut2_if2} | | Run Keyword If | '${dut2_status}' == 'PASS' -| | ... | Vpp Route Add | ${dut2} | 200.0.0.0 | 30 | 11.0.0.1 | ${dut2_if1} +| | ... | Vpp Route Add | ${dut2} | 200.0.0.0 | 30 | gateway=11.0.0.1 +| | ... | interface=${dut2_if1} | | ... | | Configure inside and outside interfaces | | ... | ${dut1} | ${dut1_if1} | ${dut1_if2} @@ -3177,8 +3191,9 @@ | | ${ip_base_if1}= | Evaluate | ${dut_index} + ${1} | | ${ip_net_if1}= | Set Variable | | ... | ${ip_base_if1}.${ip_base_if1}.${ip_base_if1} -| | Vpp Route Add | ${nodes['${dut}']} | ${tg_if1_net} | 24 | vrf=${fib_table_1} -| | ... | gateway=${ip_net_if1}.1 | interface=${${dut}_if1} | multipath=${TRUE} +| | Vpp Route Add | ${nodes['${dut}']} | ${tg_if1_net} | 24 +| | ... | vrf=${fib_table_1} | gateway=${ip_net_if1}.1 +| | ... | interface=${${dut}_if1} | multipath=${TRUE} | | Assign Interface To Fib Table | ${nodes['${dut}']} | ${${dut}_if1} | | ... | ${fib_table_1} | | Configure IP addresses on interfaces | ${nodes['${dut}']} | ${${dut}_if1} @@ -3199,8 +3214,9 @@ | | ${ip_base_if2}= | Evaluate | ${ip_base_if1} + ${1} | | ${ip_net_if2}= | Set Variable | | ... | ${ip_base_if2}.${ip_base_if2}.${ip_base_if2} -| | Vpp Route Add | ${nodes['${dut}']} | ${tg_if2_net} | 24 | vrf=${fib_table_2} -| | ... | gateway=${ip_net_if2}.2 | interface=${${dut}_if2} | multipath=${TRUE} +| | Vpp Route Add | ${nodes['${dut}']} | ${tg_if2_net} | 24 +| | ... | vrf=${fib_table_2} | gateway=${ip_net_if2}.2 +| | ... | interface=${${dut}_if2} | multipath=${TRUE} | | Assign Interface To Fib Table | ${nodes['${dut}']} | ${${dut}_if2} | | ... | ${fib_table_2} | | Configure IP addresses on interfaces | ${nodes['${dut}']} | ${${dut}_if2} diff --git a/tests/honeycomb/func/mgmt-cfg-dhcp-apihc-apivat-func.robot b/tests/honeycomb/func/mgmt-cfg-dhcp-apihc-apivat-func.robot index 958b27fd32..10b59ca002 100644 --- a/tests/honeycomb/func/mgmt-cfg-dhcp-apihc-apivat-func.robot +++ b/tests/honeycomb/func/mgmt-cfg-dhcp-apihc-apivat-func.robot @@ -1,4 +1,4 @@ -# Copyright (c) 2017 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: @@ -112,8 +112,8 @@ | | ... | ${tg_to_dut_if2_mac} | | Add ARP on DUT | ${dut_node} | ${dut_to_tg_if2} | ${dhcp_server2_ip} | | ... | ${tg_to_dut_if2_mac} -| | And VPP Route Add | ${dut_node} | 255.255.255.255 | 32 | ${NONE} | local -| | ... | ${FALSE} | ${NONE} +| | And VPP Route Add | ${dut_node} | 255.255.255.255 | 32 | gateway=${NONE} +| | ... | interface=local | use_sw_index=${FALSE} | resolve_attempts=${NONE} | DHCP relay test setup IPv6 | | Configure path in 2-node circular topology @@ -127,5 +127,5 @@ | | ... | ${dut_to_tg_if2} | ${dut_to_tg_if2_ip6} | ${prefix_length_v6} | | And Add IP Neighbor | ${dut_node} | ${dut_to_tg_if2} | ${dhcp_server_ip6} | | ... | ${tg_to_dut_if2_mac} -| | And VPP Route Add | ${dut_node} | ff02::1:2 | 128 | ${NONE} | local -| | ... | ${FALSE} | ${NONE} +| | And VPP Route Add | ${dut_node} | ff02::1:2 | 128 | gateway=${NONE} +| | ... | interface=local | use_sw_index=${FALSE} | resolve_attempts=${NONE} diff --git a/tests/honeycomb/func/mgmt-cfg-pluginacl-apihc-apivat-func.robot b/tests/honeycomb/func/mgmt-cfg-pluginacl-apihc-apivat-func.robot index 677dab1710..3e7e8aecbe 100644 --- a/tests/honeycomb/func/mgmt-cfg-pluginacl-apihc-apivat-func.robot +++ b/tests/honeycomb/func/mgmt-cfg-pluginacl-apihc-apivat-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: @@ -450,9 +450,9 @@ | | And Honeycomb adds interface IPv6 neighbor | | ... | ${node} | ${dut_to_tg_if2} | ${gateway} | ${tg_to_dut_if2_mac} | | And VPP Route Add | ${node} | ${dst_net} | ${prefix_length} -| | ... | ${gateway} | interface=${dut_to_tg_if2} | use_sw_index=False +| | ... | gateway=${gateway} | interface=${dut_to_tg_if2} | use_sw_index=False | | And VPP Route Add | ${node} | ${classify_dst_net} | ${prefix_length} -| | ... | ${gateway} | interface=${dut_to_tg_if2} | use_sw_index=False +| | ... | gateway=${gateway} | interface=${dut_to_tg_if2} | use_sw_index=False | | When Honeycomb Creates ACL Chain Through ACL plugin | | ... | ${dut_node} | ${acl_name_l3_ip6} | ${acl_settings} | | And Honeycomb Assigns plugin-acl Chain To Interface @@ -627,9 +627,9 @@ | | ... | ${node} | ${dut_to_tg_if2} | ${gateway} | ${tg_to_dut_if2_mac} | | And VPP RA suppress link layer | ${dut_node} | ${dut_to_tg_if2} | | And VPP Route Add | ${node} | ${dst_net} | ${prefix_length} -| | ... | ${gateway} | interface=${dut_to_tg_if2} | use_sw_index=False +| | ... | gateway=${gateway} | interface=${dut_to_tg_if2} | use_sw_index=False | | And VPP Route Add | ${node} | ${classify_dst_net} | ${prefix_length} -| | ... | ${gateway} | interface=${dut_to_tg_if2} | use_sw_index=False +| | ... | gateway=${gateway} | interface=${dut_to_tg_if2} | use_sw_index=False | | When Honeycomb Creates ACL Chain Through ACL plugin | | ... | ${dut_node} | ${acl_name_icmpv6} | ${acl_settings} | | And Honeycomb Assigns plugin-acl Chain To Interface @@ -677,11 +677,11 @@ | | And Add ARP on DUT | | ... | ${node} | ${dut_to_tg_if1} | ${gateway2} | ${tg_to_dut_if1_mac} | | And VPP Route Add -| | ... | ${node} | ${src_net} | ${prefix_length} | ${gateway2} +| | ... | ${node} | ${src_net} | ${prefix_length} | gateway=${gateway2} | | ... | interface=${dut_to_tg_if1} | use_sw_index=False | | And VPP Route Add -| | ... | ${node} | ${classify_src_net} | ${prefix_length} | ${gateway2} -| | ... | interface=${dut_to_tg_if1} | use_sw_index=False +| | ... | ${node} | ${classify_src_net} | ${prefix_length} +| | ... | gateway=${gateway2} | interface=${dut_to_tg_if1} | use_sw_index=False | | When Honeycomb Creates ACL Chain Through ACL plugin | | ... | ${dut_node} | ${acl_name_reflex} | ${acl_settings} | | And Honeycomb Assigns plugin-acl Chain To Interface @@ -729,10 +729,10 @@ | | And Honeycomb adds interface IPv4 neighbor | | ... | ${node} | ${dut_to_tg_if2} | ${gateway} | ${tg_to_dut_if2_mac} | | VPP Route Add -| | ... | ${node} | ${dst_net} | ${prefix_length} | ${gateway} +| | ... | ${node} | ${dst_net} | ${prefix_length} | gateway=${gateway} | | ... | interface=${dut_to_tg_if2} | use_sw_index=False | | VPP Route Add -| | ... | ${node} | ${classify_dst_net} | ${prefix_length} | ${gateway} +| | ... | ${node} | ${classify_dst_net} | ${prefix_length} | gateway=${gateway} | | ... | interface=${dut_to_tg_if2} | use_sw_index=False | Setup interfaces and bridge domain for plugin-acl test diff --git a/tests/vpp/device/container_memif/eth2p-ethip4-ip4base-eth-2memif-1dcr-dev.robot b/tests/vpp/device/container_memif/eth2p-ethip4-ip4base-eth-2memif-1dcr-dev.robot index 35be8c05f9..e32dd6e04d 100644 --- a/tests/vpp/device/container_memif/eth2p-ethip4-ip4base-eth-2memif-1dcr-dev.robot +++ b/tests/vpp/device/container_memif/eth2p-ethip4-ip4base-eth-2memif-1dcr-dev.robot @@ -96,11 +96,12 @@ | | ${memif_if2_key}= | Get interface by sw index | ${nodes['DUT1']} | | ... | ${memif_if2} | | ${memif_if2_mac}= | Get interface MAC | ${nodes['DUT1']} | ${memif_if2_key} -| | And Vpp Route Add | ${dut_node} | ${net3} | ${prefix_length} | ${net2_ip2} -| | ... | ${memif_if1} | resolve_attempts=${NONE} | count=${NONE} -| | And Vpp Route Add | ${dut_node} | ${net1} | ${prefix_length} | ${net2_ip1} -| | ... | ${memif_if2} | resolve_attempts=${NONE} | count=${NONE} -| | ... | vrf=${fib_table_2} +| | And Vpp Route Add | ${dut_node} | ${net3} | ${prefix_length} +| | ... | gateway=${net2_ip2} | interface=${memif_if1} +| | ... | resolve_attempts=${NONE} | count=${NONE} +| | And Vpp Route Add | ${dut_node} | ${net1} | ${prefix_length} +| | ... | gateway=${net2_ip1} | interface=${memif_if2} +| | ... | resolve_attempts=${NONE} | count=${NONE} | vrf=${fib_table_2} | | Add IP Neighbor | ${dut_node} | ${memif_if1} | ${net2_ip2} | | ... | ${memif_if2_mac} | | Add IP Neighbor | ${dut_node} | ${dut_to_tg_if2} | ${net3_ip2} diff --git a/tests/vpp/device/container_memif/eth2p-ethip6-ip6base-eth-2memif-1dcr-dev.robot b/tests/vpp/device/container_memif/eth2p-ethip6-ip6base-eth-2memif-1dcr-dev.robot index f2de31900e..6cdffd407e 100644 --- a/tests/vpp/device/container_memif/eth2p-ethip6-ip6base-eth-2memif-1dcr-dev.robot +++ b/tests/vpp/device/container_memif/eth2p-ethip6-ip6base-eth-2memif-1dcr-dev.robot @@ -99,11 +99,12 @@ | | ${memif_if2_key}= | Get interface by sw index | ${nodes['DUT1']} | | ... | ${memif_if2} | | ${memif_if2_mac}= | Get interface MAC | ${nodes['DUT1']} | ${memif_if2_key} -| | And Vpp Route Add | ${dut_node} | ${net3} | ${prefix_length} | ${net2_ip2} -| | ... | ${memif_if1} | resolve_attempts=${NONE} | count=${NONE} -| | And Vpp Route Add | ${dut_node} | ${net1} | ${prefix_length} | ${net2_ip1} -| | ... | ${memif_if2} | resolve_attempts=${NONE} | count=${NONE} -| | ... | vrf=${fib_table_2} +| | And Vpp Route Add | ${dut_node} | ${net3} | ${prefix_length} +| | ... | gateway=${net2_ip2} | interface=${memif_if1} +| | ... | resolve_attempts=${NONE} | count=${NONE} +| | And Vpp Route Add | ${dut_node} | ${net1} | ${prefix_length} +| | ... | gateway=${net2_ip1} | interface=${memif_if2} +| | ... | resolve_attempts=${NONE} | count=${NONE} | vrf=${fib_table_2} | | Add IP Neighbor | ${dut_node} | ${memif_if1} | ${net2_ip2} | | ... | ${memif_if2_mac} | | Add IP Neighbor | ${dut_node} | ${dut_to_tg_if2} | ${net3_ip2} diff --git a/tests/vpp/device/vm_vhost/ip4/eth2p-ethip4-ip4base-eth-2vhost-1vm-dev.robot b/tests/vpp/device/vm_vhost/ip4/eth2p-ethip4-ip4base-eth-2vhost-1vm-dev.robot index f421f59b26..8c6a7fc8a8 100644 --- a/tests/vpp/device/vm_vhost/ip4/eth2p-ethip4-ip4base-eth-2vhost-1vm-dev.robot +++ b/tests/vpp/device/vm_vhost/ip4/eth2p-ethip4-ip4base-eth-2vhost-1vm-dev.robot @@ -92,11 +92,12 @@ | | ... | ${dut_node} | ${dut_to_tg_if2} | ${net3_ip1} | ${prefix_length} | | ${vhost2_mac}= | And Get Vhost User Mac By SW Index | | ... | ${dut_node} | ${vhost2} -| | And Vpp Route Add | ${dut_node} | ${net3} | ${prefix_length} | ${net2_ip2} -| | ... | ${vhost1} | resolve_attempts=${NONE} | count=${NONE} -| | And Vpp Route Add | ${dut_node} | ${net1} | ${prefix_length} | ${net2_ip1} -| | ... | ${vhost2} | resolve_attempts=${NONE} | count=${NONE} -| | ... | vrf=${fib_table_2} +| | And Vpp Route Add | ${dut_node} | ${net3} | ${prefix_length} +| | ... | gateway=${net2_ip2} | interface=${vhost1} | resolve_attempts=${NONE} +| | ... | count=${NONE} +| | And Vpp Route Add | ${dut_node} | ${net1} | ${prefix_length} +| | ... | gateway=${net2_ip1} | interface=${vhost2} | resolve_attempts=${NONE} +| | ... | count=${NONE} | vrf=${fib_table_2} | | Add IP Neighbor | ${dut_node} | ${vhost1} | ${net2_ip2} | ${vhost2_mac} | | Add IP Neighbor | ${dut_node} | ${dut_to_tg_if2} | ${net3_ip2} | | ... | ${tg_to_dut_if2_mac} diff --git a/tests/vpp/device/vm_vhost/ip6/eth2p-ethip6-ip6base-eth-2vhost-1vm-dev.robot b/tests/vpp/device/vm_vhost/ip6/eth2p-ethip6-ip6base-eth-2vhost-1vm-dev.robot index b1dd99858b..303d830b2d 100644 --- a/tests/vpp/device/vm_vhost/ip6/eth2p-ethip6-ip6base-eth-2vhost-1vm-dev.robot +++ b/tests/vpp/device/vm_vhost/ip6/eth2p-ethip6-ip6base-eth-2vhost-1vm-dev.robot @@ -96,11 +96,12 @@ | | And Suppress ICMPv6 router advertisement message | ${nodes} | | ${vhost2_mac}= | And Get Vhost User Mac By SW Index | | ... | ${dut_node} | ${vhost2} -| | And Vpp Route Add | ${dut_node} | ${net3} | ${prefix_length} | ${net2_ip2} -| | ... | ${vhost1} | resolve_attempts=${NONE} | count=${NONE} -| | And Vpp Route Add | ${dut_node} | ${net1} | ${prefix_length} | ${net2_ip1} -| | ... | ${vhost2} | resolve_attempts=${NONE} | count=${NONE} -| | ... | vrf=${fib_table_2} +| | And Vpp Route Add | ${dut_node} | ${net3} | ${prefix_length} +| | ... | gateway=${net2_ip2} | interface=${vhost1} | resolve_attempts=${NONE} +| | ... | count=${NONE} +| | And Vpp Route Add | ${dut_node} | ${net1} | ${prefix_length} +| | ... | gateway=${net2_ip1} | interface=${vhost2} | resolve_attempts=${NONE} +| | ... | count=${NONE} | vrf=${fib_table_2} | | Add IP Neighbor | ${dut_node} | ${vhost1} | ${net2_ip2} | ${vhost2_mac} | | Add IP Neighbor | ${dut_node} | ${dut_to_tg_if2} | ${net3_ip2} | | ... | ${tg_to_dut_if2_mac} diff --git a/tests/vpp/func/ip4/eth2p-ethip4-ip4base-copblklistbase-func.robot b/tests/vpp/func/ip4/eth2p-ethip4-ip4base-copblklistbase-func.robot index 2da3802480..6db16411f8 100644 --- a/tests/vpp/func/ip4/eth2p-ethip4-ip4base-copblklistbase-func.robot +++ b/tests/vpp/func/ip4/eth2p-ethip4-ip4base-copblklistbase-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: @@ -80,7 +80,8 @@ | | And Add Arp On Dut | | ... | ${dut1_node} | ${dut1_to_dut2} | ${dut1_if2_ip_GW} | ${tg_to_dut2_mac} | | And Vpp Route Add | ${dut1_node} -| | ... | ${test_dst_ip} | ${ip_prefix} | ${dut1_if2_ip_GW} | ${dut1_to_dut2} +| | ... | ${test_dst_ip} | ${ip_prefix} | gateway=${dut1_if2_ip_GW} +| | ... | interface=${dut1_to_dut2} | | And Add fib table | ${dut1_node} | ${fib_table_number} | | When COP Add whitelist Entry | | ... | ${dut1_node} | ${dut1_to_tg} | ip4 | ${fib_table_number} diff --git a/tests/vpp/func/ip4/eth2p-ethip4-ip4base-copwhlistbase-func.robot b/tests/vpp/func/ip4/eth2p-ethip4-ip4base-copwhlistbase-func.robot index df37b7b609..31ef0faf6f 100644 --- a/tests/vpp/func/ip4/eth2p-ethip4-ip4base-copwhlistbase-func.robot +++ b/tests/vpp/func/ip4/eth2p-ethip4-ip4base-copwhlistbase-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: @@ -80,7 +80,8 @@ | | And Add Arp On Dut | | ... | ${dut1_node} | ${dut1_to_dut2} | ${dut1_if2_ip_GW} | ${tg_to_dut2_mac} | | And Vpp Route Add | ${dut1_node} -| | ... | ${test_dst_ip} | ${ip_prefix} | ${dut1_if2_ip_GW} | ${dut1_to_dut2} +| | ... | ${test_dst_ip} | ${ip_prefix} | gateway=${dut1_if2_ip_GW} +| | ... | interface=${dut1_to_dut2} | | And Add fib table | ${dut1_node} | ${fib_table_number} | | And Vpp Route Add | ${dut1_node} | | ... | ${cop_dut_ip} | ${ip_prefix} | vrf=${fib_table_number} | local=${TRUE} 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} diff --git a/tests/vpp/func/ip4/eth2p-ethip4-ip4base-ip4arp-func.robot b/tests/vpp/func/ip4/eth2p-ethip4-ip4base-ip4arp-func.robot index 310e50dc3a..01b3f13806 100644 --- a/tests/vpp/func/ip4/eth2p-ethip4-ip4base-ip4arp-func.robot +++ b/tests/vpp/func/ip4/eth2p-ethip4-ip4base-ip4arp-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: @@ -75,7 +75,8 @@ | | ... | ${dut1_to_dut2} | ${dut1_to_dut2_ip} | ${prefix_length} | | And Vpp Route Add | | ... | ${dut1_node} | ${test_dst_ip} | ${prefix_length} -| | ... | ${dut1_to_dut2_ip_GW} | ${dut1_to_dut2} | resolve_attempts=${NONE} +| | ... | gateway=${dut1_to_dut2_ip_GW} | interface=${dut1_to_dut2} +| | ... | resolve_attempts=${NONE} | | Then Send packet and verify ARP request | ${tg_node} | | ... | ${test_src_ip} | ${test_dst_ip} | ${tg_to_dut1} | | ... | ${dut1_to_tg_mac} | ${tg_to_dut2} | ${dut1_to_dut2_mac} diff --git a/tests/vpp/func/ip4/eth2p-ethip4-ip4base-ip4dhcpclient-func.robot b/tests/vpp/func/ip4/eth2p-ethip4-ip4base-ip4dhcpclient-func.robot index 73efbdb6cf..db32c07ab1 100644 --- a/tests/vpp/func/ip4/eth2p-ethip4-ip4base-ip4dhcpclient-func.robot +++ b/tests/vpp/func/ip4/eth2p-ethip4-ip4base-ip4dhcpclient-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: @@ -63,8 +63,8 @@ | | Given Configure path in 2-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']} | | And Set interfaces in 2-node circular topology up -| | And VPP Route Add | ${dut_node} | 255.255.255.255 | 32 | ${NONE} | local -| | ... | ${FALSE} | ${NONE} +| | And VPP Route Add | ${dut_node} | 255.255.255.255 | 32 | gateway=${NONE} +| | ... | interface=local | use_sw_index=${FALSE} | resolve_attempts=${NONE} | | When Set DHCP client on Interface | ${dut_node} | ${dut_to_tg_if1} | | Then Verify DHCP REQUEST after OFFER | ${tg_node} | ${tg_to_dut_if1} | | ... | ${tg_to_dut_if1_mac} | ${server_ip} @@ -79,8 +79,8 @@ | | Given Configure path in 2-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']} | | And Set interfaces in 2-node circular topology up -| | And VPP Route Add | ${dut_node} | 255.255.255.255 | 32 | ${NONE} | local -| | ... | ${FALSE} | ${NONE} +| | And VPP Route Add | ${dut_node} | 255.255.255.255 | 32 | gateway=${NONE} +| | ... | interface=local | use_sw_index=${FALSE} | resolve_attempts=${NONE} | | When Set DHCP client on Interface | ${dut_node} | ${dut_to_tg_if1} | | Then Run Keyword And Expect Error | DHCP REQUEST Rx timeout | | ... | Verify DHCP REQUEST after OFFER | ${tg_node} | ${tg_to_dut_if1} @@ -96,8 +96,8 @@ | | Given Configure path in 2-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']} | | And Set interfaces in 2-node circular topology up -| | And VPP Route Add | ${dut_node} | 255.255.255.255 | 32 | ${NONE} | local -| | ... | ${FALSE} | ${NONE} +| | And VPP Route Add | ${dut_node} | 255.255.255.255 | 32 | gateway=${NONE} +| | ... | interface=local | use_sw_index=${FALSE} | resolve_attempts=${NONE} | | When Set DHCP client on Interface | ${dut_node} | ${dut_to_tg_if1} | | And Configure IP on client via DHCP | | ... | ${tg_node} | ${tg_to_dut_if1} diff --git a/tests/vpp/func/ip4/eth2p-ethip4-ip4base-ip4dhcpproxy-func.robot b/tests/vpp/func/ip4/eth2p-ethip4-ip4base-ip4dhcpproxy-func.robot index 9df4174ba9..e655cf6fd9 100644 --- a/tests/vpp/func/ip4/eth2p-ethip4-ip4base-ip4dhcpproxy-func.robot +++ b/tests/vpp/func/ip4/eth2p-ethip4-ip4base-ip4dhcpproxy-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: @@ -53,8 +53,8 @@ | | Given Configure path in 2-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']} | | And Set interfaces in 2-node circular topology up -| | And VPP Route Add | ${dut_node} | 255.255.255.255 | 32 | ${NONE} | local -| | ... | ${FALSE} | ${NONE} +| | And VPP Route Add | ${dut_node} | 255.255.255.255 | 32 | gateway=${NONE} +| | ... | interface=local | use_sw_index=${FALSE} | resolve_attempts=${NONE} | | And Set Interface Address | ${dut_node} | | ... | ${dut_to_tg_if1} | ${dut_to_tg_if1_ip} | ${prefix_length} | | And Set Interface Address | ${dut_node} @@ -77,8 +77,8 @@ | | Given Configure path in 2-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']} | | And Set interfaces in 2-node circular topology up -| | And VPP Route Add | ${dut_node} | 255.255.255.255 | 32 | ${NONE} | local -| | ... | ${FALSE} | ${NONE} +| | And VPP Route Add | ${dut_node} | 255.255.255.255 | 32 | gateway=${NONE} +| | ... | interface=local | use_sw_index=${FALSE} | resolve_attempts=${NONE} | | And Set Interface Address | ${dut_node} | | ... | ${dut_to_tg_if1} | ${dut_to_tg_if1_ip} | ${prefix_length} | | And Set Interface Address | ${dut_node} diff --git a/tests/vpp/func/ip4/eth2p-ethip4-ip4base-ip4ecmp-func.robot b/tests/vpp/func/ip4/eth2p-ethip4-ip4base-ip4ecmp-func.robot index 2a2b55b1a3..fcdfe98b2a 100644 --- a/tests/vpp/func/ip4/eth2p-ethip4-ip4base-ip4ecmp-func.robot +++ b/tests/vpp/func/ip4/eth2p-ethip4-ip4base-ip4ecmp-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: @@ -63,11 +63,13 @@ | | And Add Arp On Dut | | ... | ${dut_node} | ${dut_to_tg_if1} | ${neighbor_2_ip} | ${neighbor_2_mac} | | When Vpp Route Add -| | ... | ${dut_node} | ${test_dst_ip} | ${prefix_length} | ${neighbor_1_ip} -| | ... | ${dut_to_tg_if1} | resolve_attempts=${NONE} | multipath=${TRUE} +| | ... | ${dut_node} | ${test_dst_ip} | ${prefix_length} +| | ... | gateway=${neighbor_1_ip} | interface=${dut_to_tg_if1} +| | ... | resolve_attempts=${NONE} | multipath=${TRUE} | | And Vpp Route Add -| | ... | ${dut_node} | ${test_dst_ip} | ${prefix_length} | ${neighbor_2_ip} -| | ... | ${dut_to_tg_if1} | resolve_attempts=${NONE} | multipath=${TRUE} +| | ... | ${dut_node} | ${test_dst_ip} | ${prefix_length} +| | ... | gateway=${neighbor_2_ip} | interface=${dut_to_tg_if1} +| | ... | resolve_attempts=${NONE} | multipath=${TRUE} | | Then Send packets and verify multipath routing | ${tg_node} | | ... | ${tg_to_dut_if2} | ${tg_to_dut_if1} | ${test_src_ip} | ${test_dst_ip} | | ... | ${tg_to_dut_if2_mac} | ${dut_to_tg_if2_mac} | ${dut_to_tg_if1_mac} diff --git a/tests/vpp/func/ip4/eth2p-ethip4-ip4base-rpf-func.robot b/tests/vpp/func/ip4/eth2p-ethip4-ip4base-rpf-func.robot index 71246c2c57..63db07e49d 100644 --- a/tests/vpp/func/ip4/eth2p-ethip4-ip4base-rpf-func.robot +++ b/tests/vpp/func/ip4/eth2p-ethip4-ip4base-rpf-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: @@ -63,13 +63,15 @@ | | ... | ${tg_to_dut2_mac} | | And Vpp Route Add | | ... | ${dut1_node} | ${test_dst_ip} | ${prefix_length} -| | ... | ${dut1_to_dut2_ip_GW} | ${dut1_to_dut2} | resolve_attempts=${NONE} +| | ... | gateway=${dut1_to_dut2_ip_GW} | interface=${dut1_to_dut2} +| | ... | resolve_attempts=${NONE} | | And Add Arp On Dut | | ... | ${dut1_node} | ${dut1_to_tg} | ${dut1_to_tg_ip_GW} | | ... | ${tg_to_dut1_mac} | | And Vpp Route Add | | ... | ${dut1_node} | ${pass_test_src_ip} | ${prefix_length} -| | ... | ${dut1_to_tg_ip_GW} | ${dut1_to_tg} | resolve_attempts=${NONE} +| | ... | gateway=${dut1_to_tg_ip_GW} | interface=${dut1_to_tg} +| | ... | resolve_attempts=${NONE} | | And Configure L2XC | | ... | ${dut2_node} | ${dut2_to_dut1} | ${dut2_to_tg} | | Then Send packet and verify headers | ${tg_node} @@ -113,13 +115,15 @@ | | ... | ${tg_to_dut2_mac} | | And Vpp Route Add | | ... | ${dut1_node} | ${test_dst_ip} | ${prefix_length} -| | ... | ${dut1_to_dut2_ip_GW} | ${dut1_to_dut2} | resolve_attempts=${NONE} +| | ... | gateway=${dut1_to_dut2_ip_GW} | interface=${dut1_to_dut2} +| | ... | resolve_attempts=${NONE} | | And Add Arp On Dut | | ... | ${dut1_node} | ${dut1_to_tg} | ${dut1_to_tg_ip_GW} | | ... | ${tg_to_dut1_mac} | | And Vpp Route Add | | ... | ${dut1_node} | ${pass_test_src_ip} | ${prefix_length} -| | ... | ${dut1_to_tg_ip_GW} | ${dut1_to_tg} | resolve_attempts=${NONE} +| | ... | gateway=${dut1_to_tg_ip_GW} | interface=${dut1_to_tg} +| | ... | resolve_attempts=${NONE} | | And Configure L2XC | | ... | ${dut2_node} | ${dut2_to_dut1} | ${dut2_to_tg} | | ${dut1_to_tg_name}= | Get Interface Name | ${dut1_node} | ${dut1_to_tg} diff --git a/tests/vpp/func/ip4/eth2p-ethip4-ip4basevrf-func.robot b/tests/vpp/func/ip4/eth2p-ethip4-ip4basevrf-func.robot index 46bcf757d2..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: @@ -314,17 +314,17 @@ | | 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} | ${fib_table_1} -| | ... | via ${dut2_to_dut1_ip1} sw_if_index ${dut1_if1_idx} multipath -| | And Vpp Route Add | ${dut1_node} -| | ... | ${tg_dut2_ip2} | ${ip_prefix} | ${fib_table_2} -| | ... | via ${dut1_to_dut2_ip2} sw_if_index ${dut1_if2_idx} multipath -| | And Vpp Route Add | ${dut2_node} -| | ... | ${tg_dut1_ip1} | ${ip_prefix} | ${fib_table_1} -| | ... | via ${dut2_to_dut1_ip1} sw_if_index ${dut2_if1_idx} multipath -| | And Vpp Route Add | ${dut2_node} -| | ... | ${tg_dut1_ip2} | ${ip_prefix} | ${fib_table_2} -| | ... | via ${dut2_to_dut1_ip2} sw_if_index ${dut2_if2_idx} multipath +| | ... | ${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} @@ -385,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} diff --git a/tests/vpp/func/ip4_tunnels/gre/eth2p-ethip4gre-ip4base-func.robot b/tests/vpp/func/ip4_tunnels/gre/eth2p-ethip4gre-ip4base-func.robot index a4e7dbbbb0..bdafd34843 100644 --- a/tests/vpp/func/ip4_tunnels/gre/eth2p-ethip4gre-ip4base-func.robot +++ b/tests/vpp/func/ip4_tunnels/gre/eth2p-ethip4gre-ip4base-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: @@ -77,9 +77,9 @@ | | And Set interfaces in 3-node circular topology up | | And Configure IP addresses on interfaces | | ... | ${dut1_node} | ${dut1_to_dut2} | ${dut1_ip_address} | ${prefix} -| | ... | ${dut1_node} | ${dut1_to_tg} | ${net1_gw_address} | ${prefix} +| | ... | ${dut1_node} | ${dut1_to_tg} | ${net1_gw_address} | ${prefix} | | ... | ${dut2_node} | ${dut2_to_dut1} | ${dut2_ip_address} | ${prefix} -| | ... | ${dut2_node} | ${dut2_to_tg} | ${net2_gw_address} | ${prefix} +| | ... | ${dut2_node} | ${dut2_to_tg} | ${net2_gw_address} | ${prefix} | | And VPP IP Probe | ${dut1_node} | ${dut1_to_dut2} | ${dut2_ip_address} | | And VPP IP Probe | ${dut2_node} | ${dut2_to_dut1} | ${dut1_ip_address} | | And Add Arp On Dut | ${dut2_node} | ${dut2_to_tg} | ${net2_host_address} @@ -88,13 +88,13 @@ | | ... | When Create GRE tunnel interface and set it up | | ... | ${dut1_node} | ${dut1_ip_address} | ${dut2_ip_address} | | ${dut2_gre_interface} | ${dut2_gre_index}= -| | ... | And Create GRE tunnel interface and set it up +| | ... | And Create GRE tunnel interface and set it up | | ... | ${dut2_node} | ${dut2_ip_address} | ${dut1_ip_address} | | And Configure IP addresses on interfaces | | ... | ${dut1_node} | ${dut1_gre_index} | ${dut1_gre_ip} | ${prefix} | | ... | ${dut2_node} | ${dut2_gre_index} | ${dut2_gre_ip} | ${prefix} | | And Vpp Route Add | ${dut1_node} | ${net2_address} | ${prefix} -| | ... | ${dut2_gre_ip} | ${dut1_gre_index} +| | ... | gateway=${dut2_gre_ip} | interface=${dut1_gre_index} | | Then Send packet and verify headers | ${tg_node} | | ... | ${net1_host_address} | ${net2_host_address} | | ... | ${tg_to_dut1} | ${tg_to_dut1_mac} | ${dut1_to_tg_mac} @@ -122,7 +122,7 @@ | | And Configure IP addresses on interfaces | | ... | ${dut_node} | ${dut1_gre_index} | ${dut1_gre_ip} | ${prefix} | | And Vpp Route Add | ${dut_node} | ${net2_address} | ${prefix} -| | ... | ${dut2_gre_ip} | ${dut1_gre_index} +| | ... | gateway=${dut2_gre_ip} | interface=${dut1_gre_index} | | Then Send ICMPv4 and check received GRE header | | ... | ${tg_node} | ${tg_to_dut_if1} | ${tg_to_dut_if2} | | ... | ${dut_to_tg_if1_mac} | ${tg_to_dut_if2_mac} @@ -171,7 +171,7 @@ | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']} | | And Set interfaces in 2-node circular topology up | | ${dut1_lo_index}= | And VPP Create loopback | ${dut_node} -| | And Set Interface State | ${dut_node} | ${dut1_lo_index} | up +| | And Set Interface State | ${dut_node} | ${dut1_lo_index} | up | | And Configure IP addresses on interfaces | | ... | ${dut_node} | ${dut_to_tg_if2} | ${dut1_ip_address} | ${prefix} | | ... | ${dut_node} | ${dut_to_tg_if1} | ${net1_gw_address} | ${prefix} @@ -179,9 +179,9 @@ | | And Add Arp On Dut | ${dut_node} | ${dut_to_tg_if2} | ${dut2_ip_address} | | ... | ${tg_to_dut_if2_mac} | | And Vpp Route Add | ${dut_node} | ${tun0_dst} | ${32} -| | ... | ${dut2_ip_address} | ${dut_to_tg_if2} +| | ... | gateway=${dut2_ip_address} | interface=${dut_to_tg_if2} | | And Vpp Route Add | ${dut_node} | ${tun1_dst} | ${32} -| | ... | ${dut2_ip_address} | ${dut_to_tg_if2} +| | ... | gateway=${dut2_ip_address} | interface=${dut_to_tg_if2} | | ${dut1_gre0_interface} | ${dut1_gre0_index}= | | ... | When Create GRE tunnel interface and set it up | | ... | ${dut_node} | ${dut1_lo_address} | ${tun0_dst} @@ -192,9 +192,9 @@ | | ... | ${dut_node} | ${dut1_gre0_index} | ${dut_tun0_ip1} | ${prefix} | | ... | ${dut_node} | ${dut1_gre1_index} | ${dut_tun1_ip1} | ${prefix} | | And Vpp Route Add | ${dut_node} | ${net2_address} | ${prefix} -| | ... | ${dut_tun0_ip2} | ${dut1_gre0_index} +| | ... | gateway=${dut_tun0_ip2} | interface=${dut1_gre0_index} | | And Vpp Route Add | ${dut_node} | ${net3_address} | ${prefix} -| | ... | ${dut_tun1_ip2} | ${dut1_gre1_index} +| | ... | gateway=${dut_tun1_ip2} | interface=${dut1_gre1_index} | | Then Send ICMPv4 and check received GRE header | | ... | ${tg_node} | ${tg_to_dut_if1} | ${tg_to_dut_if2} | | ... | ${dut_to_tg_if1_mac} | ${tg_to_dut_if2_mac} @@ -222,7 +222,7 @@ | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']} | | And Set interfaces in 2-node circular topology up | | ${dut1_lo_index}= | And VPP Create loopback | ${dut_node} -| | And Set Interface State | ${dut_node} | ${dut1_lo_index} | up +| | And Set Interface State | ${dut_node} | ${dut1_lo_index} | up | | And Configure IP addresses on interfaces | | ... | ${dut_node} | ${dut_to_tg_if2} | ${dut1_ip_address} | ${prefix} | | ... | ${dut_node} | ${dut_to_tg_if1} | ${net1_gw_address} | ${prefix} @@ -230,9 +230,9 @@ | | And Add Arp On Dut | ${dut_node} | ${dut_to_tg_if2} | ${dut2_ip_address} | | ... | ${tg_to_dut_if2_mac} | | And Vpp Route Add | ${dut_node} | ${tun0_dst} | ${32} -| | ... | ${dut2_ip_address} | ${dut_to_tg_if2} +| | ... | gateway=${dut2_ip_address} | interface=${dut_to_tg_if2} | | And Vpp Route Add | ${dut_node} | ${tun1_dst} | ${32} -| | ... | ${dut2_ip_address} | ${dut_to_tg_if2} +| | ... | gateway=${dut2_ip_address} | interface=${dut_to_tg_if2} | | ${dut1_gre0_interface} | ${dut1_gre0_index}= | | ... | When Create GRE tunnel interface and set it up | | ... | ${dut_node} | ${dut1_lo_address} | ${tun0_dst} @@ -243,9 +243,9 @@ | | ... | ${dut_node} | ${dut1_gre0_index} | ${dut_tun0_ip1} | ${prefix} | | ... | ${dut_node} | ${dut1_gre1_index} | ${dut_tun1_ip1} | ${prefix} | | And Vpp Route Add | ${dut_node} | ${net2_address} | ${prefix} -| | ... | ${dut_tun0_ip2} | ${dut1_gre0_index} +| | ... | gateway=${dut_tun0_ip2} | interface=${dut1_gre0_index} | | And Vpp Route Add | ${dut_node} | ${net3_address} | ${prefix} -| | ... | ${dut_tun1_ip2} | ${dut1_gre1_index} +| | ... | gateway=${dut_tun1_ip2} | interface=${dut1_gre1_index} | | Then Send GRE and check received GRE header | | ... | ${tg_node} | ${tg_to_dut_if2} | ${tg_to_dut_if2} | | ... | ${dut_to_tg_if2_mac} | ${tg_to_dut_if2_mac} @@ -271,7 +271,7 @@ | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']} | | And Set interfaces in 2-node circular topology up | | ${dut1_lo_index}= | And VPP Create loopback | ${dut_node} -| | And Set Interface State | ${dut_node} | ${dut1_lo_index} | up +| | And Set Interface State | ${dut_node} | ${dut1_lo_index} | up | | And Configure IP addresses on interfaces | | ... | ${dut_node} | ${dut_to_tg_if2} | ${dut1_ip_address} | ${prefix} | | ... | ${dut_node} | ${dut_to_tg_if1} | ${net1_gw_address} | ${prefix} @@ -281,9 +281,9 @@ | | And Add Arp On Dut | ${dut_node} | ${dut_to_tg_if2} | ${dut2_ip_address} | | ... | ${tg_to_dut_if2_mac} | | And Vpp Route Add | ${dut_node} | ${tun0_dst} | ${32} -| | ... | ${dut2_ip_address} | ${dut_to_tg_if2} +| | ... | gateway=${dut2_ip_address} | interface=${dut_to_tg_if2} | | And Vpp Route Add | ${dut_node} | ${tun1_dst} | ${32} -| | ... | ${dut2_ip_address} | ${dut_to_tg_if2} +| | ... | gateway=${dut2_ip_address} | interface=${dut_to_tg_if2} | | ${dut1_gre0_interface} | ${dut1_gre0_index}= | | ... | When Create GRE tunnel interface and set it up | | ... | ${dut_node} | ${dut1_lo_address} | ${tun0_dst} 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} diff --git a/tests/vpp/func/ip6/eth2p-ethip6-ip6base-copblklistbase-func.robot b/tests/vpp/func/ip6/eth2p-ethip6-ip6base-copblklistbase-func.robot index f93c5b7f71..0550a75226 100644 --- a/tests/vpp/func/ip6/eth2p-ethip6-ip6base-copblklistbase-func.robot +++ b/tests/vpp/func/ip6/eth2p-ethip6-ip6base-copblklistbase-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: @@ -88,7 +88,8 @@ | | And Add IP Neighbor | | ... | ${dut1_node} | ${dut1_to_dut2} | ${dut1_if2_ip_GW} | ${tg_to_dut2_mac} | | And Vpp Route Add | ${dut1_node} -| | ... | ${test_dst_ip} | ${ip_prefix} | ${dut1_if2_ip_GW} | ${dut1_to_dut2} +| | ... | ${test_dst_ip} | ${ip_prefix} | gateway=${dut1_if2_ip_GW} +| | ... | interface=${dut1_to_dut2} | | And Vpp All Ra Suppress Link Layer | ${nodes} | | And Add fib table | ${dut1_node} | ${fib_table_number} | ipv6=${TRUE} | | When COP Add whitelist Entry diff --git a/tests/vpp/func/ip6/eth2p-ethip6-ip6base-copwhlistbase-func.robot b/tests/vpp/func/ip6/eth2p-ethip6-ip6base-copwhlistbase-func.robot index 22fc1517ba..933aa0a8a5 100644 --- a/tests/vpp/func/ip6/eth2p-ethip6-ip6base-copwhlistbase-func.robot +++ b/tests/vpp/func/ip6/eth2p-ethip6-ip6base-copwhlistbase-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: @@ -88,7 +88,8 @@ | | And Add IP Neighbor | | ... | ${dut1_node} | ${dut1_to_dut2} | ${dut1_if2_ip_GW} | ${tg_to_dut2_mac} | | And Vpp Route Add | ${dut1_node} -| | ... | ${test_dst_ip} | ${ip_prefix} | ${dut1_if2_ip_GW} | ${dut1_to_dut2} +| | ... | ${test_dst_ip} | ${ip_prefix} | gateway=${dut1_if2_ip_GW} +| | ... | interface=${dut1_to_dut2} | | And Vpp All Ra Suppress Link Layer | ${nodes} | | And Add fib table | ${dut1_node} | ${fib_table_number} | ipv6=${TRUE} | | And Vpp Route Add | ${dut1_node} diff --git a/tests/vpp/func/ip6/eth2p-ethip6-ip6base-iaclbase-func.robot b/tests/vpp/func/ip6/eth2p-ethip6-ip6base-iaclbase-func.robot index bd2d5fb64f..f877649d1f 100644 --- a/tests/vpp/func/ip6/eth2p-ethip6-ip6base-iaclbase-func.robot +++ b/tests/vpp/func/ip6/eth2p-ethip6-ip6base-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: @@ -67,7 +67,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} | | And Vpp All Ra Suppress Link Layer | ${nodes} @@ -112,10 +112,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} | | And Vpp All Ra Suppress Link Layer | ${nodes} @@ -160,10 +160,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} | | And Vpp All Ra Suppress Link Layer | ${nodes} @@ -215,7 +215,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} | | And Vpp All Ra Suppress Link Layer | ${nodes} @@ -256,7 +256,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} | | And Vpp All Ra Suppress Link Layer | ${nodes} @@ -297,7 +297,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} | | And Vpp All Ra Suppress Link Layer | ${nodes} @@ -339,7 +339,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} | | And Vpp All Ra Suppress Link Layer | ${nodes} @@ -381,7 +381,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} | | And Vpp All Ra Suppress Link Layer | ${nodes} @@ -392,7 +392,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} @@ -424,7 +424,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} | | And Vpp All Ra Suppress Link Layer | ${nodes} @@ -466,7 +466,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} | | And Vpp All Ra Suppress Link Layer | ${nodes} @@ -508,7 +508,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} | | And Vpp All Ra Suppress Link Layer | ${nodes} @@ -519,7 +519,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} @@ -560,7 +560,7 @@ | | ... | ${dut1_node} | deny | ${table_index} | ${skip_n} | ${match_n} | | ... | src | ${tg_to_dut1_mac} | | ${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} diff --git a/tests/vpp/func/ip6/eth2p-ethip6-ip6base-ip6dhcpproxy-func.robot b/tests/vpp/func/ip6/eth2p-ethip6-ip6base-ip6dhcpproxy-func.robot index 2858f3743e..12bcfefd47 100644 --- a/tests/vpp/func/ip6/eth2p-ethip6-ip6base-ip6dhcpproxy-func.robot +++ b/tests/vpp/func/ip6/eth2p-ethip6-ip6base-ip6dhcpproxy-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: @@ -54,8 +54,8 @@ | | ... | ${dut_to_tg_if1} | ${dut_to_tg_if1_ip} | ${prefix_length} | | And Vpp Set If Ipv6 Addr | ${dut_node} | | ... | ${dut_to_tg_if2} | ${dut_to_tg_if2_ip} | ${prefix_length} -| | And VPP Route Add | ${dut_node} | ff02::1:2 | 128 | ${NONE} | local -| | ... | ${FALSE} | ${NONE} +| | And VPP Route Add | ${dut_node} | ff02::1:2 | 128 | gateway=${NONE} +| | ... | interface=local | use_sw_index=${FALSE} | resolve_attempts=${NONE} | | And Add IP Neighbor | ${dut_node} | ${dut_to_tg_if2} | ${dhcp_server_ip} | | ... | ${tg_to_dut_if2_mac} | | And Vpp All Ra Suppress Link Layer | ${nodes} diff --git a/tests/vpp/func/ip6/eth2p-ethip6-ip6base-ip6ecmp-func.robot b/tests/vpp/func/ip6/eth2p-ethip6-ip6base-ip6ecmp-func.robot index 3d6dae853b..bf2a902cd3 100644 --- a/tests/vpp/func/ip6/eth2p-ethip6-ip6base-ip6ecmp-func.robot +++ b/tests/vpp/func/ip6/eth2p-ethip6-ip6base-ip6ecmp-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: @@ -63,11 +63,13 @@ | | ... | ${dut_node} | ${dut_to_tg_if1} | ${neighbor_2_ip} | ${neighbor_2_mac} | | And Suppress ICMPv6 router advertisement message | ${nodes} | | When Vpp Route Add -| | ... | ${dut_node} | ${test_dst_ip} | ${prefix_length} | ${neighbor_1_ip} -| | ... | ${dut_to_tg_if1} | resolve_attempts=${NONE} | multipath=${TRUE} +| | ... | ${dut_node} | ${test_dst_ip} | ${prefix_length} +| | ... | gateway=${neighbor_1_ip} | interface=${dut_to_tg_if1} +| | ... | resolve_attempts=${NONE} | multipath=${TRUE} | | And Vpp Route Add -| | ... | ${dut_node} | ${test_dst_ip} | ${prefix_length} | ${neighbor_2_ip} -| | ... | ${dut_to_tg_if1} | resolve_attempts=${NONE} | multipath=${TRUE} +| | ... | ${dut_node} | ${test_dst_ip} | ${prefix_length} +| | ... | gateway=${neighbor_2_ip} | interface=${dut_to_tg_if1} +| | ... | resolve_attempts=${NONE} | multipath=${TRUE} | | Then Send packets and verify multipath routing | ${tg_node} | | ... | ${tg_to_dut_if2} | ${tg_to_dut_if1} | ${test_src_ip} | ${test_dst_ip} | | ... | ${tg_to_dut_if2_mac} | ${dut_to_tg_if2_mac} | ${dut_to_tg_if1_mac} diff --git a/tests/vpp/func/ip6/eth2p-ethip6-ip6basevrf-func.robot b/tests/vpp/func/ip6/eth2p-ethip6-ip6basevrf-func.robot index 2fbfd88a7c..4b97715740 100644 --- a/tests/vpp/func/ip6/eth2p-ethip6-ip6basevrf-func.robot +++ b/tests/vpp/func/ip6/eth2p-ethip6-ip6basevrf-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: @@ -401,13 +401,17 @@ | | ... | ${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} | | Vpp All RA Suppress Link Layer | ${nodes} diff --git a/tests/vpp/func/telemetry/eth2p-ethip6-ip6base-spanrx-func.robot b/tests/vpp/func/telemetry/eth2p-ethip6-ip6base-spanrx-func.robot index 48bb7cf173..6985ea88b1 100644 --- a/tests/vpp/func/telemetry/eth2p-ethip6-ip6base-spanrx-func.robot +++ b/tests/vpp/func/telemetry/eth2p-ethip6-ip6base-spanrx-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: @@ -56,7 +56,7 @@ | | And Add Ip Neighbor | ${dut_node} | ${dut_to_tg_if1} | ${tg_to_dut_if1_ip6} | | ... | ${tg_to_dut_if1_mac} | | And Vpp Route Add | ${dut_node} | ${tg_to_dut_if1_ip6} | ${prefix} -| | ... | ${dut_to_tg_if1_ip6} | ${dut_to_tg_if1} +| | ... | gateway=${dut_to_tg_if1_ip6} | interface=${dut_to_tg_if1} | | And Set SPAN Mirroring | ${dut_node} | ${dut_to_tg_if1} | ${dut_to_tg_if2} | | Then Send Packet And Check Received Copies | ${tg_node} | | ... | ${tg_to_dut_if1} | ${tg_to_dut_if1_mac} diff --git a/tests/vpp/func/vm_vhost/ip4/eth2p-ethip4-ip4base-eth-2vhost-1vm.robot b/tests/vpp/func/vm_vhost/ip4/eth2p-ethip4-ip4base-eth-2vhost-1vm.robot index fe61568ba9..7887b19503 100644 --- a/tests/vpp/func/vm_vhost/ip4/eth2p-ethip4-ip4base-eth-2vhost-1vm.robot +++ b/tests/vpp/func/vm_vhost/ip4/eth2p-ethip4-ip4base-eth-2vhost-1vm.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: @@ -82,10 +82,10 @@ | | ... | ${dut_node} | ${dut_to_tg_if2} | ${net3_ip1} | ${prefix_length} | | ${vhost2_mac}= | And Get Vhost User Mac By SW Index | | ... | ${dut_node} | ${vhost2} -| | And Vpp Route Add | ${dut_node} | ${net3} | 24 | ${net2_ip2} -| | ... | ${vhost1} | resolve_attempts=${NONE} | count=${NONE} -| | And Vpp Route Add | ${dut_node} | ${net1} | 24 | ${net2_ip1} -| | ... | ${vhost2} | resolve_attempts=${NONE} | count=${NONE} +| | And Vpp Route Add | ${dut_node} | ${net3} | 24 | gateway=${net2_ip2} +| | ... | interface=${vhost1} | resolve_attempts=${NONE} | count=${NONE} +| | And Vpp Route Add | ${dut_node} | ${net1} | 24 | gateway=${net2_ip1} +| | ... | interface=${vhost2} | resolve_attempts=${NONE} | count=${NONE} | | ... | vrf=${fib_table_2} | | Add IP Neighbor | ${dut_node} | ${vhost1} | ${net2_ip2} | ${vhost2_mac} | | Add IP Neighbor | ${dut_node} | ${dut_to_tg_if2} | ${net3_ip2} diff --git a/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecbasetnl-ip4base-tnl-aes-gcm-mrr.robot b/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecbasetnl-ip4base-tnl-aes-gcm-mrr.robot index 584d73f9e5..19acc82533 100644 --- a/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecbasetnl-ip4base-tnl-aes-gcm-mrr.robot +++ b/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecbasetnl-ip4base-tnl-aes-gcm-mrr.robot @@ -1,4 +1,4 @@ -# Copyright (c) 2018 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: @@ -99,10 +99,10 @@ | | And Apply startup configuration on all VPP DUTs | | When Generate keys for IPSec | ${encr_alg} | ${auth_alg} | | And Initialize IPSec in 3-node circular topology -| | And Vpp Route Add | ${dut1} | ${raddr_ip4} | 8 | ${dut2_if1_ip4} -| | ... | ${dut1_if2} -| | And Vpp Route Add | ${dut2} | ${laddr_ip4} | 8 | ${dut1_if2_ip4} -| | ... | ${dut2_if1} +| | And Vpp Route Add | ${dut1} | ${raddr_ip4} | 8 | gateway=${dut2_if1_ip4} +| | ... | interface=${dut1_if2} +| | And Vpp Route Add | ${dut2} | ${laddr_ip4} | 8 | gateway=${dut1_if2_ip4} +| | ... | interface=${dut2_if1} | | And VPP IPsec Add Multiple Tunnels | | ... | ${dut1} | ${dut2} | ${dut1_if2} | ${dut2_if1} | ${n_tunnels} | | ... | ${encr_alg} | ${encr_key} | ${auth_alg} | ${auth_key} diff --git a/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecbasetnl-ip4base-tnl-aes-gcm-ndrpdr.robot b/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecbasetnl-ip4base-tnl-aes-gcm-ndrpdr.robot index 966c16c4bf..0ddbd9c160 100644 --- a/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecbasetnl-ip4base-tnl-aes-gcm-ndrpdr.robot +++ b/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecbasetnl-ip4base-tnl-aes-gcm-ndrpdr.robot @@ -1,4 +1,4 @@ -# Copyright (c) 2018 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: @@ -104,10 +104,10 @@ | | And Apply startup configuration on all VPP DUTs | | When Generate keys for IPSec | ${encr_alg} | ${auth_alg} | | And Initialize IPSec in 3-node circular topology -| | And Vpp Route Add | ${dut1} | ${raddr_ip4} | 8 | ${dut2_if1_ip4} -| | ... | ${dut1_if2} -| | And Vpp Route Add | ${dut2} | ${laddr_ip4} | 8 | ${dut1_if2_ip4} -| | ... | ${dut2_if1} +| | And Vpp Route Add | ${dut1} | ${raddr_ip4} | 8 | gateway=${dut2_if1_ip4} +| | ... | interface=${dut1_if2} +| | And Vpp Route Add | ${dut2} | ${laddr_ip4} | 8 | gateway=${dut1_if2_ip4} +| | ... | interface=${dut2_if1} | | And VPP IPsec Add Multiple Tunnels | | ... | ${dut1} | ${dut2} | ${dut1_if2} | ${dut2_if1} | ${n_tunnels} | | ... | ${encr_alg} | ${encr_key} | ${auth_alg} | ${auth_key} diff --git a/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecbasetnl-ip4base-tnl-cbc-sha1-mrr.robot b/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecbasetnl-ip4base-tnl-cbc-sha1-mrr.robot index 693454ac31..f5e3c252c8 100644 --- a/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecbasetnl-ip4base-tnl-cbc-sha1-mrr.robot +++ b/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecbasetnl-ip4base-tnl-cbc-sha1-mrr.robot @@ -1,4 +1,4 @@ -# Copyright (c) 2018 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: @@ -98,10 +98,10 @@ | | And Apply startup configuration on all VPP DUTs | | When Generate keys for IPSec | ${encr_alg} | ${auth_alg} | | And Initialize IPSec in 3-node circular topology -| | And Vpp Route Add | ${dut1} | ${raddr_ip4} | 8 | ${dut2_if1_ip4} -| | ... | ${dut1_if2} -| | And Vpp Route Add | ${dut2} | ${laddr_ip4} | 8 | ${dut1_if2_ip4} -| | ... | ${dut2_if1} +| | And Vpp Route Add | ${dut1} | ${raddr_ip4} | 8 | gateway=${dut2_if1_ip4} +| | ... | interface=${dut1_if2} +| | And Vpp Route Add | ${dut2} | ${laddr_ip4} | 8 | gateway=${dut1_if2_ip4} +| | ... | interface=${dut2_if1} | | And VPP IPsec Add Multiple Tunnels | | ... | ${dut1} | ${dut2} | ${dut1_if2} | ${dut2_if1} | ${n_tunnels} | | ... | ${encr_alg} | ${encr_key} | ${auth_alg} | ${auth_key} diff --git a/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecbasetnl-ip4base-tnl-cbc-sha1-ndrpdr.robot b/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecbasetnl-ip4base-tnl-cbc-sha1-ndrpdr.robot index b2a3fe573b..e737738869 100644 --- a/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecbasetnl-ip4base-tnl-cbc-sha1-ndrpdr.robot +++ b/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecbasetnl-ip4base-tnl-cbc-sha1-ndrpdr.robot @@ -1,4 +1,4 @@ -# Copyright (c) 2018 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: @@ -103,10 +103,10 @@ | | And Apply startup configuration on all VPP DUTs | | When Generate keys for IPSec | ${encr_alg} | ${auth_alg} | | And Initialize IPSec in 3-node circular topology -| | And Vpp Route Add | ${dut1} | ${raddr_ip4} | 8 | ${dut2_if1_ip4} -| | ... | ${dut1_if2} -| | And Vpp Route Add | ${dut2} | ${laddr_ip4} | 8 | ${dut1_if2_ip4} -| | ... | ${dut2_if1} +| | And Vpp Route Add | ${dut1} | ${raddr_ip4} | 8 | gateway=${dut2_if1_ip4} +| | ... | interface=${dut1_if2} +| | And Vpp Route Add | ${dut2} | ${laddr_ip4} | 8 | gateway=${dut1_if2_ip4} +| | ... | interface=${dut2_if1} | | And VPP IPsec Add Multiple Tunnels | | ... | ${dut1} | ${dut2} | ${dut1_if2} | ${dut2_if1} | ${n_tunnels} | | ... | ${encr_alg} | ${encr_key} | ${auth_alg} | ${auth_key} diff --git a/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecbasetnlsw-ip4base-tnl-aes-gcm-mrr.robot b/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecbasetnlsw-ip4base-tnl-aes-gcm-mrr.robot index f0cd0ae44c..3c7107411e 100644 --- a/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecbasetnlsw-ip4base-tnl-aes-gcm-mrr.robot +++ b/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecbasetnlsw-ip4base-tnl-aes-gcm-mrr.robot @@ -1,4 +1,4 @@ -# Copyright (c) 2018 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: @@ -104,10 +104,10 @@ | | And Apply startup configuration on all VPP DUTs | | When Generate keys for IPSec | ${encr_alg} | ${auth_alg} | | And Initialize IPSec in 3-node circular topology -| | And Vpp Route Add | ${dut1} | ${raddr_ip4} | 8 | ${dut2_if1_ip4} -| | ... | ${dut1_if2} -| | And Vpp Route Add | ${dut2} | ${laddr_ip4} | 8 | ${dut1_if2_ip4} -| | ... | ${dut2_if1} +| | And Vpp Route Add | ${dut1} | ${raddr_ip4} | 8 | gateway=${dut2_if1_ip4} +| | ... | interface=${dut1_if2} +| | And Vpp Route Add | ${dut2} | ${laddr_ip4} | 8 | gateway=${dut1_if2_ip4} +| | ... | interface=${dut2_if1} | | And VPP IPsec Add Multiple Tunnels | | ... | ${dut1} | ${dut2} | ${dut1_if2} | ${dut2_if1} | ${n_tunnels} | | ... | ${encr_alg} | ${encr_key} | ${auth_alg} | ${auth_key} diff --git a/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecbasetnlsw-ip4base-tnl-aes-gcm-ndrpdr.robot b/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecbasetnlsw-ip4base-tnl-aes-gcm-ndrpdr.robot index 57034182f8..d700145740 100644 --- a/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecbasetnlsw-ip4base-tnl-aes-gcm-ndrpdr.robot +++ b/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecbasetnlsw-ip4base-tnl-aes-gcm-ndrpdr.robot @@ -1,4 +1,4 @@ -# Copyright (c) 2018 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: @@ -109,10 +109,10 @@ | | And Apply startup configuration on all VPP DUTs | | When Generate keys for IPSec | ${encr_alg} | ${auth_alg} | | And Initialize IPSec in 3-node circular topology -| | And Vpp Route Add | ${dut1} | ${raddr_ip4} | 8 | ${dut2_if1_ip4} -| | ... | ${dut1_if2} -| | And Vpp Route Add | ${dut2} | ${laddr_ip4} | 8 | ${dut1_if2_ip4} -| | ... | ${dut2_if1} +| | And Vpp Route Add | ${dut1} | ${raddr_ip4} | 8 | gateway=${dut2_if1_ip4} +| | ... | interface=${dut1_if2} +| | And Vpp Route Add | ${dut2} | ${laddr_ip4} | 8 | gateway=${dut1_if2_ip4} +| | ... | interface=${dut2_if1} | | And VPP IPsec Add Multiple Tunnels | | ... | ${dut1} | ${dut2} | ${dut1_if2} | ${dut2_if1} | ${n_tunnels} | | ... | ${encr_alg} | ${encr_key} | ${auth_alg} | ${auth_key} diff --git a/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecbasetnlsw-ip4base-tnl-cbc-sha1-mrr.robot b/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecbasetnlsw-ip4base-tnl-cbc-sha1-mrr.robot index 80b20cf928..57e19831de 100644 --- a/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecbasetnlsw-ip4base-tnl-cbc-sha1-mrr.robot +++ b/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecbasetnlsw-ip4base-tnl-cbc-sha1-mrr.robot @@ -1,4 +1,4 @@ -# Copyright (c) 2018 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: @@ -104,10 +104,10 @@ | | And Apply startup configuration on all VPP DUTs | | When Generate keys for IPSec | ${encr_alg} | ${auth_alg} | | And Initialize IPSec in 3-node circular topology -| | And Vpp Route Add | ${dut1} | ${raddr_ip4} | 8 | ${dut2_if1_ip4} -| | ... | ${dut1_if2} -| | And Vpp Route Add | ${dut2} | ${laddr_ip4} | 8 | ${dut1_if2_ip4} -| | ... | ${dut2_if1} +| | And Vpp Route Add | ${dut1} | ${raddr_ip4} | 8 | gateway=${dut2_if1_ip4} +| | ... | interface=${dut1_if2} +| | And Vpp Route Add | ${dut2} | ${laddr_ip4} | 8 | gateway=${dut1_if2_ip4} +| | ... | interface=${dut2_if1} | | And VPP IPsec Add Multiple Tunnels | | ... | ${dut1} | ${dut2} | ${dut1_if2} | ${dut2_if1} | ${n_tunnels} | | ... | ${encr_alg} | ${encr_key} | ${auth_alg} | ${auth_key} diff --git a/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecbasetnlsw-ip4base-tnl-cbc-sha1-ndrpdr.robot b/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecbasetnlsw-ip4base-tnl-cbc-sha1-ndrpdr.robot index c39f54ee67..c2ec7ef9fa 100644 --- a/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecbasetnlsw-ip4base-tnl-cbc-sha1-ndrpdr.robot +++ b/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecbasetnlsw-ip4base-tnl-cbc-sha1-ndrpdr.robot @@ -1,4 +1,4 @@ -# Copyright (c) 2018 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: @@ -109,10 +109,10 @@ | | And Apply startup configuration on all VPP DUTs | | When Generate keys for IPSec | ${encr_alg} | ${auth_alg} | | And Initialize IPSec in 3-node circular topology -| | And Vpp Route Add | ${dut1} | ${raddr_ip4} | 8 | ${dut2_if1_ip4} -| | ... | ${dut1_if2} -| | And Vpp Route Add | ${dut2} | ${laddr_ip4} | 8 | ${dut1_if2_ip4} -| | ... | ${dut2_if1} +| | And Vpp Route Add | ${dut1} | ${raddr_ip4} | 8 | gateway=${dut2_if1_ip4} +| | ... | interface=${dut1_if2} +| | And Vpp Route Add | ${dut2} | ${laddr_ip4} | 8 | gateway=${dut1_if2_ip4} +| | ... | interface=${dut2_if1} | | And VPP IPsec Add Multiple Tunnels | | ... | ${dut1} | ${dut2} | ${dut1_if2} | ${dut2_if1} | ${n_tunnels} | | ... | ${encr_alg} | ${encr_key} | ${auth_alg} | ${auth_key} diff --git a/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecscale1000tnl-ip4base-tnl-aes-gcm-mrr.robot b/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecscale1000tnl-ip4base-tnl-aes-gcm-mrr.robot index f6e1add216..caa13e87f8 100644 --- a/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecscale1000tnl-ip4base-tnl-aes-gcm-mrr.robot +++ b/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecscale1000tnl-ip4base-tnl-aes-gcm-mrr.robot @@ -1,4 +1,4 @@ -# Copyright (c) 2018 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: @@ -99,10 +99,10 @@ | | And Apply startup configuration on all VPP DUTs | | When Generate keys for IPSec | ${encr_alg} | ${auth_alg} | | And Initialize IPSec in 3-node circular topology -| | And Vpp Route Add | ${dut1} | ${raddr_ip4} | 8 | ${dut2_if1_ip4} -| | ... | ${dut1_if2} -| | And Vpp Route Add | ${dut2} | ${laddr_ip4} | 8 | ${dut1_if2_ip4} -| | ... | ${dut2_if1} +| | And Vpp Route Add | ${dut1} | ${raddr_ip4} | 8 | gateway=${dut2_if1_ip4} +| | ... | interface=${dut1_if2} +| | And Vpp Route Add | ${dut2} | ${laddr_ip4} | 8 | gateway=${dut1_if2_ip4} +| | ... | interface=${dut2_if1} | | And VPP IPsec Add Multiple Tunnels | | ... | ${dut1} | ${dut2} | ${dut1_if2} | ${dut2_if1} | ${n_tunnels} | | ... | ${encr_alg} | ${encr_key} | ${auth_alg} | ${auth_key} diff --git a/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecscale1000tnl-ip4base-tnl-aes-gcm-ndrpdr.robot b/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecscale1000tnl-ip4base-tnl-aes-gcm-ndrpdr.robot index d9b9b3a35a..5845315b1a 100644 --- a/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecscale1000tnl-ip4base-tnl-aes-gcm-ndrpdr.robot +++ b/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecscale1000tnl-ip4base-tnl-aes-gcm-ndrpdr.robot @@ -1,4 +1,4 @@ -# Copyright (c) 2018 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: @@ -104,10 +104,10 @@ | | And Apply startup configuration on all VPP DUTs | | When Generate keys for IPSec | ${encr_alg} | ${auth_alg} | | And Initialize IPSec in 3-node circular topology -| | And Vpp Route Add | ${dut1} | ${raddr_ip4} | 8 | ${dut2_if1_ip4} -| | ... | ${dut1_if2} -| | And Vpp Route Add | ${dut2} | ${laddr_ip4} | 8 | ${dut1_if2_ip4} -| | ... | ${dut2_if1} +| | And Vpp Route Add | ${dut1} | ${raddr_ip4} | 8 | gateway=${dut2_if1_ip4} +| | ... | interface=${dut1_if2} +| | And Vpp Route Add | ${dut2} | ${laddr_ip4} | 8 | gateway=${dut1_if2_ip4} +| | ... | interface=${dut2_if1} | | And VPP IPsec Add Multiple Tunnels | | ... | ${dut1} | ${dut2} | ${dut1_if2} | ${dut2_if1} | ${n_tunnels} | | ... | ${encr_alg} | ${encr_key} | ${auth_alg} | ${auth_key} diff --git a/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecscale1000tnl-ip4base-tnl-cbc-sha1-mrr.robot b/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecscale1000tnl-ip4base-tnl-cbc-sha1-mrr.robot index 95a9fa0fc7..f8202408e5 100644 --- a/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecscale1000tnl-ip4base-tnl-cbc-sha1-mrr.robot +++ b/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecscale1000tnl-ip4base-tnl-cbc-sha1-mrr.robot @@ -1,4 +1,4 @@ -# Copyright (c) 2018 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: @@ -99,10 +99,10 @@ | | And Apply startup configuration on all VPP DUTs | | When Generate keys for IPSec | ${encr_alg} | ${auth_alg} | | And Initialize IPSec in 3-node circular topology -| | And Vpp Route Add | ${dut1} | ${raddr_ip4} | 8 | ${dut2_if1_ip4} -| | ... | ${dut1_if2} -| | And Vpp Route Add | ${dut2} | ${laddr_ip4} | 8 | ${dut1_if2_ip4} -| | ... | ${dut2_if1} +| | And Vpp Route Add | ${dut1} | ${raddr_ip4} | 8 | gateway=${dut2_if1_ip4} +| | ... | interface=${dut1_if2} +| | And Vpp Route Add | ${dut2} | ${laddr_ip4} | 8 | gateway=${dut1_if2_ip4} +| | ... | interface=${dut2_if1} | | And VPP IPsec Add Multiple Tunnels | | ... | ${dut1} | ${dut2} | ${dut1_if2} | ${dut2_if1} | ${n_tunnels} | | ... | ${encr_alg} | ${encr_key} | ${auth_alg} | ${auth_key} diff --git a/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecscale1000tnl-ip4base-tnl-cbc-sha1-ndrpdr.robot b/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecscale1000tnl-ip4base-tnl-cbc-sha1-ndrpdr.robot index f7d2b229ee..63518a1c72 100644 --- a/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecscale1000tnl-ip4base-tnl-cbc-sha1-ndrpdr.robot +++ b/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecscale1000tnl-ip4base-tnl-cbc-sha1-ndrpdr.robot @@ -1,4 +1,4 @@ -# Copyright (c) 2018 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: @@ -104,10 +104,10 @@ | | And Apply startup configuration on all VPP DUTs | | When Generate keys for IPSec | ${encr_alg} | ${auth_alg} | | And Initialize IPSec in 3-node circular topology -| | And Vpp Route Add | ${dut1} | ${raddr_ip4} | 8 | ${dut2_if1_ip4} -| | ... | ${dut1_if2} -| | And Vpp Route Add | ${dut2} | ${laddr_ip4} | 8 | ${dut1_if2_ip4} -| | ... | ${dut2_if1} +| | And Vpp Route Add | ${dut1} | ${raddr_ip4} | 8 | gateway=${dut2_if1_ip4} +| | ... | interface=${dut1_if2} +| | And Vpp Route Add | ${dut2} | ${laddr_ip4} | 8 | gateway=${dut1_if2_ip4} +| | ... | interface=${dut2_if1} | | And VPP IPsec Add Multiple Tunnels | | ... | ${dut1} | ${dut2} | ${dut1_if2} | ${dut2_if1} | ${n_tunnels} | | ... | ${encr_alg} | ${encr_key} | ${auth_alg} | ${auth_key} |