X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=tests%2Fvpp%2Fdevice%2Fcontainer_memif%2Feth2p-ethip6-ip6base-eth-2memif-1dcr-dev.robot;h=122e83068fdf5dd8e55489c931242dd4f6e27f57;hp=f2de31900ee07f0eadd7d2ec57c1c8e7bfb3cf0b;hb=1577123a3c27541181097cb4186aa8855f20b1cc;hpb=5a53823d8a6e99072152654ac632bb06a6b467ac

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..122e83068f 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,24 +13,18 @@
 
 *** 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
 | Resource | resources/libraries/robot/shared/testing_path.robot
 | Resource | resources/libraries/robot/shared/traffic.robot
 | ...
 | Force Tags | 2_NODE_SINGLE_LINK_TOPO | DEVICETEST | HW_ENV | DCR_ENV
 | ... | FUNCTEST | IP6FWD | BASE | ETH | MEMIF | DOCKER
 | ...
-| Test Setup | Set up VPP device test
-| ...
-| Test Teardown | Run Keywords
-| ... | Tear down functional test with container
-| ... | AND | Tear down VPP device test
-| ... | AND | Show Memif on all DUTs | ${nodes}
+| Suite Setup | Setup suite single link
+| Test Setup | Setup test
+| Test Teardown | Tear down test | packet_trace | container
 | ...
 | Documentation | *IPv4 routing test cases with memif interface*
 | ...
@@ -49,6 +43,8 @@
 | ... | *[Ref] Applicable standard specifications:* RFC791, RFC826, RFC792
 
 *** Variables ***
+| @{plugins_to_enable}= | dpdk_plugin.so | memif_plugin.so
+| ${nic_name}= | virtual
 # IP
 | ${net1}= | 2001:1::0
 | ${net3}= | 2001:3::0
@@ -61,12 +57,11 @@
 | ${prefix_length}= | 64
 | ${fib_table_2}= | 20
 # Memif
-| ${sock_base}= | memif-DUT1_CNF1
+| ${sock_base}= | memif-DUT1_CNF
 # Container
 | ${container_engine}= | Docker
 | ${container_chain_topology}= | chain_functional
 
-# TODO: Add update of VPP PIDs after container creation
 *** Test Cases ***
 | tc01-eth2p-ethip6-ip6base-eth-2memif-1dcr-device
 | | [Documentation]
@@ -76,38 +71,42 @@
 | | ... | send ICMPv6 Echo Reqest form one TG interface to another one to be \
 | | ... | switched by DUT1; verify header of received packet.
 | | ...
-| | Given Configure path in 2-node circular topology
+| | Given Add PCI devices to all DUTs
+| | And Apply startup configuration on all VPP DUTs
+| | And VPP Enable Traces On All Duts | ${nodes}
+| | When Configure path in 2-node circular topology
 | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']}
-| | And Set up functional test with containers
+| | And Start containers for device test
 | | 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} | ${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}
-| | 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} | ${net3} | ${prefix_length}
+| | ... | gateway=${net2_ip2} | interface=${memif_if1}
+| | 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}