Align suite/test teardown/setup

[csit.git] / tests / vpp / device / l2xc / eth2p-ethicmp-l2xcbase-dev.robot

diff --git a/tests/vpp/device/l2xc/eth2p-ethicmp-l2xcbase-dev.robot b/tests/vpp/device/l2xc/eth2p-ethicmp-l2xcbase-dev.robot
index ff1ef41..7053f7a 100644 (file)
--- a/tests/vpp/device/l2xc/eth2p-ethicmp-l2xcbase-dev.robot
+++ b/tests/vpp/device/l2xc/eth2p-ethicmp-l2xcbase-dev.robot
@@ -20,8 +20,8 @@
 | Force Tags | 2_NODE_SINGLE_LINK_TOPO | DEVICETEST | HW_ENV | DCR_ENV
 | ... | FUNCTEST | L2XCFWD | BASE | ETH | ICMP
 | ...
-| Test Setup | Set up VPP device test
-| ...
+| Suite Setup | Setup suite single link
+| Test Setup | Setup test
 | Test Teardown | Tear down test
 | ...
 | Documentation | *L2 cross-connect test cases*
@@ -39,6 +39,10 @@
 | ... | dst-addr and MAC addresses.
 | ... | *[Ref] Applicable standard specifications:* RFC792
 
+*** Variables ***
+| @{plugins_to_enable}= | dpdk_plugin.so
+| ${nic_name}= | virtual
+
 *** Test Cases ***
 | tc01-eth2p-ethicmpv4-l2xcbase-device
 | | [Documentation]
@@ -49,11 +53,14 @@
 | | ... | its interfaces to be switched by DUT1; verify all packets are \
 | | ... | received.
 | | ...
-| | 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 Configure interfaces in path up
 | | And Configure L2XC | ${dut_node} | ${dut_to_tg_if1} | ${dut_to_tg_if2}
-| | When All Vpp Interfaces Ready Wait | ${nodes}
+| | And All Vpp Interfaces Ready Wait | ${nodes}
 | | Then Send ICMPv4 bidirectionally and verify received packets
 | | ... | ${tg_node} | ${tg_to_dut_if1} | ${tg_to_dut_if2}
 
@@ -66,10 +73,13 @@
 | | ... | its interfaces to be switched by DUT1; verify all packets are \
 | | ... | received.
 | | ...
-| | 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 Configure interfaces in path up
 | | And Configure L2XC | ${dut_node} | ${dut_to_tg_if1} | ${dut_to_tg_if2}
-| | When All Vpp Interfaces Ready Wait | ${nodes}
+| | And All Vpp Interfaces Ready Wait | ${nodes}
 | | Then Send ICMPv6 bidirectionally and verify received packets
 | | ... | ${tg_node} | ${tg_to_dut_if1} | ${tg_to_dut_if2}