diff options
Diffstat (limited to 'tests/vpp/func/ip6')
6 files changed, 42 insertions, 34 deletions
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} |