diff options
Diffstat (limited to 'tests/vpp/device/container_memif')
| -rw-r--r-- | tests/vpp/device/container_memif/eth2p-ethip4-ip4base-eth-2memif-1dcr-dev.robot | 33 | ||||
| -rw-r--r-- | tests/vpp/device/container_memif/eth2p-ethip6-ip6base-eth-2memif-1dcr-dev.robot | 52 |
2 files changed, 41 insertions, 44 deletions
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 c6a287281d..7fcf754ee5 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 @@ -13,8 +13,7 @@ *** Settings *** | Library | resources.libraries.python.InterfaceUtil -| Library | resources.libraries.python.IPv6Util -| Library | resources.libraries.python.Routing +| Library | resources.libraries.python.IPUtil | ... | Resource | resources/libraries/robot/ip/ip4.robot | Resource | resources/libraries/robot/shared/default.robot @@ -80,14 +79,14 @@ | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']} | | And Set up functional test with containers | | And Configure interfaces in path up -| | When Set up memif interfaces on DUT node | ${dut_node} | ${sock_base} -| | ... | ${sock_base} | dcr_uuid=${dcr_uuid} +| | When Set up memif interfaces on DUT node +| | ... | ${dut_node} | ${sock_base} | ${sock_base} | dcr_uuid=${dcr_uuid} | | ... | memif_if1=memif_if1 | memif_if2=memif_if2 | rxq=${0} | txq=${0} | | And Add Fib Table | ${dut_node} | ${fib_table_2} -| | And Assign Interface To Fib Table | ${dut_node} -| | ... | ${memif_if2} | ${fib_table_2} -| | And Assign Interface To Fib Table | ${dut_node} -| | ... | ${dut_to_tg_if2} | ${fib_table_2} +| | And Assign Interface To Fib Table +| | ... | ${dut_node} | ${memif_if2} | ${fib_table_2} +| | And Assign Interface To Fib Table +| | ... | ${dut_node} | ${dut_to_tg_if2} | ${fib_table_2} | | And Configure IP addresses on interfaces | | ... | ${dut_node} | ${dut_to_tg_if1} | ${net1_ip1} | ${prefix_length} | | ... | ${dut_node} | ${memif_if1} | ${net2_ip1} | ${prefix_length} @@ -96,16 +95,16 @@ | | ${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} +| | 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} -| | ... | ${tg_to_dut_if2_mac} +| | And Vpp Route Add +| | ... | ${dut_node} | ${net1} | ${prefix_length} +| | ... | gateway=${net2_ip1} | interface=${memif_if2} | vrf=${fib_table_2} +| | VPP Add IP Neighbor +| | ... | ${dut_node} | ${memif_if1} | ${net2_ip2} | ${memif_if2_mac} +| | VPP Add IP Neighbor +| | ... | ${dut_node} | ${dut_to_tg_if2} | ${net3_ip2} | ${tg_to_dut_if2_mac} | | Then Send packet and verify headers | | ... | ${tg_node} | ${net1_ip2} | ${net3_ip2} | | ... | ${tg_to_dut_if1} | ${tg_to_dut_if1_mac} | ${dut_to_tg_if1_mac} 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 60dd9538d4..fcf1ce0658 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 @@ -13,9 +13,7 @@ *** Settings *** | Library | resources.libraries.python.InterfaceUtil -| Library | resources.libraries.python.IPv6Setup -| Library | resources.libraries.python.IPv6Util -| Library | resources.libraries.python.Routing +| Library | resources.libraries.python.IPUtil | ... | Resource | resources/libraries/robot/shared/default.robot | Resource | resources/libraries/robot/shared/memif.robot @@ -80,35 +78,35 @@ | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']} | | And Set up functional test with containers | | And Configure interfaces in path up -| | When Set up memif interfaces on DUT node | ${dut_node} | ${sock_base} -| | ... | ${sock_base} | dcr_uuid=${dcr_uuid} +| | When Set up memif interfaces on DUT node +| | ... | ${dut_node} | ${sock_base} | ${sock_base} | dcr_uuid=${dcr_uuid} | | ... | memif_if1=memif_if1 | memif_if2=memif_if2 | rxq=${0} | txq=${0} -| | And Add Fib Table | ${dut_node} | ${fib_table_2} -| | And Assign Interface To Fib Table | ${dut_node} -| | ... | ${memif_if2} | ${fib_table_2} -| | And Assign Interface To Fib Table | ${dut_node} -| | ... | ${dut_to_tg_if2} | ${fib_table_2} -| | And Vpp Set If IPv6 Addr | ${dut_node} | ${dut_to_tg_if1} | ${net1_ip1} -| | ... | ${prefix_length} -| | And Vpp Set If IPv6 Addr | ${dut_node} | ${memif_if1} | ${net2_ip1} -| | ... | ${prefix_length} -| | And Vpp Set If IPv6 Addr | ${dut_node} | ${memif_if2} | ${net2_ip2} -| | ... | ${prefix_length} -| | And Vpp Set If IPv6 Addr | ${dut_node} | ${dut_to_tg_if2} | ${net3_ip1} -| | ... | ${prefix_length} +| | And Add Fib Table | ${dut_node} | ${fib_table_2} | ipv6=${True} +| | And Assign Interface To Fib Table +| | ... | ${dut_node} | ${memif_if2} | ${fib_table_2} | ipv6=${True} +| | And Assign Interface To Fib Table +| | ... | ${dut_node} | ${dut_to_tg_if2} | ${fib_table_2} | ipv6=${True} +| | And VPP Interface Set IP Address +| | ... | ${dut_node} | ${dut_to_tg_if1} | ${net1_ip1} | ${prefix_length} +| | And VPP Interface Set IP Address +| | ... | ${dut_node} | ${memif_if1} | ${net2_ip1} | ${prefix_length} +| | And VPP Interface Set IP Address +| | ... | ${dut_node} | ${memif_if2} | ${net2_ip2} | ${prefix_length} +| | And VPP Interface Set IP Address +| | ... | ${dut_node} | ${dut_to_tg_if2} | ${net3_ip1} | ${prefix_length} | | ${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} +| | 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} -| | ... | ${tg_to_dut_if2_mac} +| | And Vpp Route Add +| | ... | ${dut_node} | ${net1} | ${prefix_length} +| | ... | gateway=${net2_ip1} | interface=${memif_if2} | vrf=${fib_table_2} +| | VPP Add IP Neighbor +| | ... | ${dut_node} | ${memif_if1} | ${net2_ip2} | ${memif_if2_mac} +| | VPP Add IP Neighbor +| | ... | ${dut_node} | ${dut_to_tg_if2} | ${net3_ip2} | ${tg_to_dut_if2_mac} | | Then Send packet and verify headers | | ... | ${tg_node} | ${net1_ip2} | ${net3_ip2} | | ... | ${tg_to_dut_if1} | ${tg_to_dut_if1_mac} | ${dut_to_tg_if1_mac} |