From 1577123a3c27541181097cb4186aa8855f20b1cc Mon Sep 17 00:00:00 2001 From: Peter Mikus Date: Fri, 21 Jun 2019 12:15:56 +0000 Subject: Align suite/test teardown/setup + Phase II - aligning FUNC/PERF setup. + 2n/3n compatibility of suite setup. + Same structure of testcase for DEV/PERF. + DEVICE tests are now running VPP startup config in same way as PERF. + DEVICE is using COREKEEPER! - DEVICE tests are running topology compute twice for backward compatibility. TODO to remove. - Still phase III needed to align TAGS, LIBRARIES and remove OLD setup phase. Change-Id: Ib6e1b0ebf4abebf3cbe73b4fda5cac953c2a7270 Signed-off-by: Peter Mikus --- .../eth2p-ethip4-ip4base-eth-2memif-1dcr-dev.robot | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) (limited to 'tests/vpp/device/container_memif/eth2p-ethip4-ip4base-eth-2memif-1dcr-dev.robot') 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 2db7a79030..a91810bed8 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 @@ -15,17 +15,16 @@ | Library | resources.libraries.python.InterfaceUtil | Library | resources.libraries.python.IPUtil | ... -| Resource | resources/libraries/robot/ip/ip4.robot | Resource | resources/libraries/robot/shared/default.robot -| Resource | resources/libraries/robot/shared/memif.robot +| Resource | resources/libraries/robot/ip/ip4.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 | IP4FWD | BASE | ETH | MEMIF | DOCKER | ... -| Test Setup | Set up VPP device test -| ... +| 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* @@ -45,6 +44,8 @@ | ... | *[Ref] Applicable standard specifications:* RFC791, RFC826, RFC792 *** Variables *** +| @{plugins_to_enable}= | dpdk_plugin.so | memif_plugin.so +| ${nic_name}= | virtual # IP | ${net1}= | 10.0.1.0 | ${net3}= | 10.0.3.0 @@ -62,7 +63,6 @@ | ${container_engine}= | Docker | ${container_chain_topology}= | chain_functional -# TODO: Add update of VPP PIDs after container creation *** Test Cases *** | tc01-eth2p-ethip4-ip4base-eth-2memif-1dcr-device | | [Documentation] @@ -72,9 +72,12 @@ | | ... | send ICMPv4 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} -- cgit 1.2.3-korg