From 552491e8bcff9745b04fbdd92609351ec9597cdc Mon Sep 17 00:00:00 2001 From: Jan Gelety Date: Thu, 24 Jan 2019 12:31:25 +0100 Subject: FIX: correct call of vpp_add_route Change-Id: I63a2b5f484ac627c020e30c9f01a868c57aacf42 Signed-off-by: Jan Gelety --- .../eth2p-ethip4-ip4base-copblklistbase-func.robot | 5 +-- .../eth2p-ethip4-ip4base-copwhlistbase-func.robot | 5 +-- .../ip4/eth2p-ethip4-ip4base-iaclbase-func.robot | 32 +++++++++---------- .../ip4/eth2p-ethip4-ip4base-ip4arp-func.robot | 5 +-- .../eth2p-ethip4-ip4base-ip4dhcpclient-func.robot | 14 ++++----- .../eth2p-ethip4-ip4base-ip4dhcpproxy-func.robot | 10 +++--- .../ip4/eth2p-ethip4-ip4base-ip4ecmp-func.robot | 12 +++++--- .../func/ip4/eth2p-ethip4-ip4base-rpf-func.robot | 14 ++++++--- .../func/ip4/eth2p-ethip4-ip4basevrf-func.robot | 36 ++++++++++++---------- 9 files changed, 73 insertions(+), 60 deletions(-) (limited to 'tests/vpp/func/ip4') 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} -- cgit 1.2.3-korg