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 --- .../interfaces/eth2p-eth-l2bdbasemaclrn-eth-2tap-dev.robot | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'tests/vpp/device/interfaces/eth2p-eth-l2bdbasemaclrn-eth-2tap-dev.robot') diff --git a/tests/vpp/device/interfaces/eth2p-eth-l2bdbasemaclrn-eth-2tap-dev.robot b/tests/vpp/device/interfaces/eth2p-eth-l2bdbasemaclrn-eth-2tap-dev.robot index 0cd3dc82ec..6cf2b324d4 100644 --- a/tests/vpp/device/interfaces/eth2p-eth-l2bdbasemaclrn-eth-2tap-dev.robot +++ b/tests/vpp/device/interfaces/eth2p-eth-l2bdbasemaclrn-eth-2tap-dev.robot @@ -27,9 +27,8 @@ | Force Tags | 2_NODE_SINGLE_LINK_TOPO | DEVICETEST | HW_ENV | DCR_ENV | ... | FUNCTEST | L2BD | BASE | ETH | TAP | ... -| Test Setup | Run Keywords | Set up VPP device test -| ... | AND | Clean Up Namespaces | ${nodes['DUT1']} -| ... +| Suite Setup | Setup suite single link +| Test Setup | Setup test | namespace | Test Teardown | Tear down test | packet_trace | namespace | linux_bridge | ... | Documentation | *Tap Interface Traffic Tests* @@ -47,10 +46,11 @@ | ... | *[Ref] Applicable standard specifications:* *** Variables *** +| @{plugins_to_enable}= | dpdk_plugin.so +| ${nic_name}= | virtual | ${bid_from_TG}= | 19 | ${bid_to_TG}= | 20 | ${bid_TAP}= | tapBr - | ${tap_int1}= | tap0 | ${tap_int2}= | tap1 @@ -63,7 +63,10 @@ | | ... | [Ver] Packet sent from TG is passed through all L2BD and received\ | | ... | back on TG. Then src_ip, dst_ip and MAC are checked. | | ... -| | Given Configure path in 2-node circular topology | ${nodes['TG']} +| | 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 interfaces in 2-node circular topology up | | ${int1}= | And Add Tap Interface | ${dut_node} | ${tap_int1} -- cgit 1.2.3-korg