diff options
Diffstat (limited to 'tests/vpp/device')
5 files changed, 85 insertions, 85 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} diff --git a/tests/vpp/device/interfaces/eth2p-ethip4-ip4base-eth-1tap-dev.robot b/tests/vpp/device/interfaces/eth2p-ethip4-ip4base-eth-1tap-dev.robot index e97ccaf1fb..47de572b18 100644 --- a/tests/vpp/device/interfaces/eth2p-ethip4-ip4base-eth-1tap-dev.robot +++ b/tests/vpp/device/interfaces/eth2p-ethip4-ip4base-eth-1tap-dev.robot @@ -12,17 +12,18 @@ # limitations under the License. *** Settings *** -| Resource | resources/libraries/robot/shared/default.robot +| Library | resources.libraries.python.IPUtil +| Library | resources.libraries.python.Namespaces +| Library | resources.libraries.python.Tap +| Library | resources.libraries.python.Trace +| ... | Resource | resources/libraries/robot/ip/ip4.robot | Resource | resources/libraries/robot/ip/ip6.robot -| Resource | resources/libraries/robot/shared/interfaces.robot | Resource | resources/libraries/robot/l2/l2_bridge_domain.robot +| Resource | resources/libraries/robot/shared/default.robot +| Resource | resources/libraries/robot/shared/interfaces.robot | Resource | resources/libraries/robot/shared/testing_path.robot | Resource | resources/libraries/robot/shared/traffic.robot -| Library | resources.libraries.python.Trace -| Library | resources.libraries.python.Tap -| Library | resources.libraries.python.Namespaces -| Library | resources.libraries.python.IPUtil | ... | Force Tags | 2_NODE_SINGLE_LINK_TOPO | DEVICETEST | HW_ENV | DCR_ENV | ... | FUNCTEST | IP4FWD | BASE | ETH | IP4BASE | TAP @@ -72,19 +73,19 @@ | | ... | ${nodes['DUT1']} | ${nodes['TG']} | | And Set interfaces in 2-node circular topology up | | ${int1}= | And Add Tap Interface | ${dut_node} | ${tap_int1} | -| | And Set Interface Address +| | And VPP Interface Set IP Address | | ... | ${dut_node} | ${int1} | ${tap1_VPP_ip} | ${prefix} -| | And Set Interface Address +| | And VPP Interface Set IP Address | | ... | ${dut_node} | ${dut_to_tg_if1} | ${dut_ip_address} | ${prefix} | | And Set Interface State | ${dut_node} | ${int1} | up | | And Set Linux Interface MAC | ${dut_node} | ${tap_int1} | ${tap1_NM_mac} | | And Set Linux Interface IP | ${dut_node} | | ... | ${tap_int1} | ${tap1_NM_ip} | ${prefix} -| | And Add Route | ${dut_node} +| | And Add Linux Route | ${dut_node} | | ... | ${tg_ip_address_GW} | ${prefix} | ${tap1_VPP_ip} -| | And Add Arp On Dut | ${dut_node} | ${dut_to_tg_if1} +| | And VPP Add IP Neighbor | ${dut_node} | ${dut_to_tg_if1} | | ... | ${tg_ip_address} | ${tg_to_dut_if1_mac} -| | And Add Arp On Dut | ${dut_node} | ${int1} +| | And VPP Add IP Neighbor | ${dut_node} | ${int1} | | ... | ${tap1_NM_ip} | ${tap1_NM_mac} | | Then Send ICMP echo request and verify answer | ${tg_node} | | ... | ${tg_to_dut_if1} | ${dut_to_tg_if1_mac} | ${tg_to_dut_if1_mac} @@ -102,9 +103,9 @@ | | ... | ${nodes['DUT1']} | ${nodes['TG']} | | And Set interfaces in 2-node circular topology up | | ${int1}= | And Add Tap Interface | ${dut_node} | ${tap_int1} | -| | And Set Interface Address +| | And VPP Interface Set IP Address | | ... | ${dut_node} | ${int1} | ${tap1_VPP_ip} | ${prefix} -| | And Set Interface Address +| | And VPP Interface Set IP Address | | ... | ${dut_node} | ${dut_to_tg_if1} | ${dut_ip_address} | ${prefix} | | And Set Interface State | ${dut_node} | ${int1} | up | | When Create Namespace | ${dut_node} | ${namespace1} @@ -114,11 +115,11 @@ | | ... | ${tap_int1} | ${tap1_NM_mac} | ${namespace1} | | And Set Linux Interface IP | ${dut_node} | | ... | ${tap_int1} | ${tap1_NM_ip} | ${prefix} | ${namespace1} -| | And Add Arp On Dut | ${dut_node} | ${dut_to_tg_if1} +| | And VPP Add IP Neighbor | ${dut_node} | ${dut_to_tg_if1} | | ... | ${tg_ip_address} | ${tg_to_dut_if1_mac} -| | And Add Arp On Dut | ${dut_node} | ${int1} +| | And VPP Add IP Neighbor | ${dut_node} | ${int1} | | ... | ${tap1_NM_ip} | ${tap1_NM_mac} -| | And Add Route | ${dut_node} +| | And Add Linux Route | ${dut_node} | | ... | ${tg_ip_address_GW} | ${prefix} | ${tap1_VPP_ip} | ${namespace1} | | Then Send ICMP echo request and verify answer | ${tg_node} | | ... | ${tg_to_dut_if1} | ${dut_to_tg_if1_mac} | ${tg_to_dut_if1_mac} 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 e97e7919b1..3a24c6dce9 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 @@ -19,6 +19,7 @@ | Library | resources.libraries.python.Trace | Library | resources.libraries.python.VhostUser | Library | resources.libraries.python.VPPUtil +| ... | Resource | resources/libraries/robot/ip/ip4.robot | Resource | resources/libraries/robot/l2/l2_bridge_domain.robot | Resource | resources/libraries/robot/shared/default.robot @@ -92,14 +93,13 @@ | | ${vhost2_mac}= | And Get Vhost User Mac By SW Index | | ... | ${dut_node} | ${vhost2} | | And Vpp Route Add | ${dut_node} | ${net3} | ${prefix_length} -| | ... | gateway=${net2_ip2} | interface=${vhost1} | resolve_attempts=${NONE} -| | ... | count=${NONE} +| | ... | gateway=${net2_ip2} | interface=${vhost1} | | 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} +| | ... | gateway=${net2_ip1} | interface=${vhost2} +| | ... | vrf=${fib_table_2} +| | VPP Add IP Neighbor | ${dut_node} | ${vhost1} | ${net2_ip2} | ${vhost2_mac} +| | VPP Add IP Neighbor +| | ... | ${dut_node} | ${dut_to_tg_if2} | ${net3_ip2} | ${tg_to_dut_if2_mac} | | When Configure VM for vhost L2BD forwarding | | ... | ${dut_node} | ${sock1} | ${sock2} | | Then Send packet and verify headers 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 48070e933b..508e628729 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 @@ -19,6 +19,7 @@ | Library | resources.libraries.python.Trace | Library | resources.libraries.python.VhostUser | Library | resources.libraries.python.VPPUtil +| ... | Resource | resources/libraries/robot/ip/ip6.robot | Resource | resources/libraries/robot/l2/l2_bridge_domain.robot | Resource | resources/libraries/robot/shared/default.robot @@ -79,31 +80,32 @@ | | ${vhost2}= | And Vpp Create Vhost User Interface | ${dut_node} | ${sock2} | | And Set Interface State | ${dut_node} | ${vhost1} | up | | And Set Interface State | ${dut_node} | ${vhost2} | up -| | And Add Fib Table | ${dut_node} | ${fib_table_2} -| | And Assign Interface To Fib Table | ${dut_node} -| | ... | ${vhost2} | ${fib_table_2} -| | And Assign Interface To Fib Table | ${dut_node} -| | ... | ${dut_to_tg_if2} | ${fib_table_2} -| | And Vpp Set If IPv6 Addr +| | And Add Fib Table | ${dut_node} | ${fib_table_2} | ipv6=${True} +| | And Assign Interface To Fib Table +| | ... | ${dut_node} | ${vhost2} | ${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 Set If IPv6 Addr +| | And VPP Interface Set IP Address | | ... | ${dut_node} | ${vhost1} | ${net2_ip1} | ${prefix_length} -| | And Vpp Set If IPv6 Addr +| | And VPP Interface Set IP Address | | ... | ${dut_node} | ${vhost2} | ${net2_ip2} | ${prefix_length} -| | And Vpp Set If IPv6 Addr +| | And VPP Interface Set IP Address | | ... | ${dut_node} | ${dut_to_tg_if2} | ${net3_ip1} | ${prefix_length} | | 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} -| | ... | 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} +| | And Vpp Route Add +| | ... | ${dut_node} | ${net3} | ${prefix_length} +| | ... | gateway=${net2_ip2} | interface=${vhost1} +| | And Vpp Route Add +| | ... | ${dut_node} | ${net1} | ${prefix_length} +| | ... | gateway=${net2_ip1} | interface=${vhost2} | vrf=${fib_table_2} +| | VPP Add IP Neighbor +| | ... | ${dut_node} | ${vhost1} | ${net2_ip2} | ${vhost2_mac} +| | VPP Add IP Neighbor +| | ... | ${dut_node} | ${dut_to_tg_if2} | ${net3_ip2} | ${tg_to_dut_if2_mac} | | When Configure VM for vhost L2BD forwarding | | ... | ${dut_node} | ${sock1} | ${sock2} | | Then Send packet and verify headers |