FIX: Move per-patch building mechanics

[csit.git] / tests / vpp / device / vm_vhost / l2xc / eth2p-eth-l2xcbase-eth-2vhost-1vm-dev.robot

diff --git a/tests/vpp/device/vm_vhost/l2xc/eth2p-eth-l2xcbase-eth-2vhost-1vm-dev.robot b/tests/vpp/device/vm_vhost/l2xc/eth2p-eth-l2xcbase-eth-2vhost-1vm-dev.robot
index 91b8d58..a820bd2 100644 (file)
--- a/tests/vpp/device/vm_vhost/l2xc/eth2p-eth-l2xcbase-eth-2vhost-1vm-dev.robot
+++ b/tests/vpp/device/vm_vhost/l2xc/eth2p-eth-l2xcbase-eth-2vhost-1vm-dev.robot
@@ -24,11 +24,9 @@
 | Force Tags | 2_NODE_SINGLE_LINK_TOPO | DEVICETEST | HW_ENV | DCR_ENV
 | ... | FUNCTEST | L2XCFWD | BASE | ETH | VHOST | 1VM
 | ...
-| Test Setup | Set up VPP device test
-| ...
-| Test Teardown | Run Keywords
-| ... | Stop and clear QEMU | ${dut_node}
-| ... | AND | Tear down VPP device test
+| Suite Setup | Setup suite single link
+| Test Setup | Setup test
+| Test Teardown | Tear down test | packet_trace | vhost
 | ...
 | Documentation | *L2 cross-connect test cases with vhost user interface*
 | ...
@@ -47,6 +45,8 @@
 | ... | *[Ref] Applicable standard specifications:* RFC792
 
 *** Variables ***
+| @{plugins_to_enable}= | dpdk_plugin.so
+| ${nic_name}= | virtual
 | ${sock1}= | /tmp/sock1
 | ${sock2}= | /tmp/sock2
 
@@ -60,10 +60,13 @@
 | | ... | i/fs to be switched by DUT to and from VM; verify all packets \
 | | ... | are received. [Ref]
 | | ...
-| | 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
-| | When Configure vhost interfaces for L2BD forwarding | ${dut_node}
+| | And Configure vhost interfaces for L2BD forwarding | ${dut_node}
 | | ... | ${sock1} | ${sock2}
 | | And Configure L2XC | ${dut_node} | ${dut_to_tg_if1} | ${vhost_if1}
 | | And Configure L2XC | ${dut_node} | ${dut_to_tg_if2} | ${vhost_if2}
@@ -71,6 +74,7 @@
 | | ... | ${sock2}
 | | Then Send ICMPv4 bidirectionally and verify received packets | ${tg_node}
 | | ... | ${tg_to_dut_if1} | ${tg_to_dut_if2}
+| | And Get Vhost dump | ${dut_node}
 
 | tc02-eth2p-ethip6-l2xcbase-eth-2vhost-1vm-device
 | | [Documentation]
@@ -81,10 +85,13 @@
 | | ... | be switched by DUT to and from VM; verify all packets are \
 | | ... | received. [Ref]
 | | ...
-| | 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
-| | When Configure vhost interfaces for L2BD forwarding | ${dut_node}
+| | And Configure vhost interfaces for L2BD forwarding | ${dut_node}
 | | ... | ${sock1} | ${sock2}
 | | And Configure L2XC | ${dut_node} | ${dut_to_tg_if1} | ${vhost_if1}
 | | And Configure L2XC | ${dut_node} | ${dut_to_tg_if2} | ${vhost_if2}