Align suite/test teardown/setup

[csit.git] / tests / vpp / device / vm_vhost / ip4 / eth2p-ethip4-ip4base-eth-2vhost-1vm-dev.robot

diff --git a/tests/vpp/device/vm_vhost/ip4/eth2p-ethip4-ip4base-eth-2vhost-1vm-dev.robot b/tests/vpp/device/vm_vhost/ip4/eth2p-ethip4-ip4base-eth-2vhost-1vm-dev.robot
index f421f59..a1a1947 100644 (file)
--- a/tests/vpp/device/vm_vhost/ip4/eth2p-ethip4-ip4base-eth-2vhost-1vm-dev.robot
+++ b/tests/vpp/device/vm_vhost/ip4/eth2p-ethip4-ip4base-eth-2vhost-1vm-dev.robot
@@ -19,22 +19,20 @@
 | Library | resources.libraries.python.Trace
 | Library | resources.libraries.python.VhostUser
 | Library | resources.libraries.python.VPPUtil
+| ...
+| Resource | resources/libraries/robot/shared/default.robot
 | Resource | resources/libraries/robot/ip/ip4.robot
 | Resource | resources/libraries/robot/l2/l2_bridge_domain.robot
-| Resource | resources/libraries/robot/shared/default.robot
 | Resource | resources/libraries/robot/shared/interfaces.robot
 | Resource | resources/libraries/robot/shared/testing_path.robot
 | Resource | resources/libraries/robot/shared/traffic.robot
-| Resource | resources/libraries/robot/vm/qemu.robot
 | ...
 | Force Tags | 2_NODE_SINGLE_LINK_TOPO | DEVICETEST | HW_ENV | DCR_ENV
 | ... | FUNCTEST | IP4FWD | BASE | ETH | VHOST | 1VM
 | ...
-| Test Setup | Set up VPP device test
-| ...
-| Test Teardown | Run Keywords
-| ... | Stop and clear QEMU | ${dut_node} | ${vm_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 | *IPv4 routing test cases with vhost user interface*
 | ...
@@ -52,6 +50,8 @@
 | ... | *[Ref] Applicable standard specifications:* RFC791, RFC826, RFC792
 
 *** Variables ***
+| @{plugins_to_enable}= | dpdk_plugin.so
+| ${nic_name}= | virtual
 | ${net1}= | 10.0.1.0
 | ${net3}= | 10.0.3.0
 | ${net1_ip1}= | 10.0.1.1
@@ -73,7 +73,10 @@
 | | ... | the same network. There is created linux bridge on VM to pass packet \
 | | ... | from one vhost-user interface to another one.
 | | ...
-| | 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
 | | ${vhost1}= | And Vpp Create Vhost User Interface | ${dut_node} | ${sock1}
@@ -92,15 +95,15 @@
 | | ... | ${dut_node} | ${dut_to_tg_if2} | ${net3_ip1} | ${prefix_length}
 | | ${vhost2_mac}= | And Get Vhost User Mac By SW Index
 | | ... | ${dut_node} | ${vhost2}
-| | And Vpp Route Add | ${dut_node} | ${net3} | ${prefix_length} | ${net2_ip2}
-| | ... | ${vhost1} | resolve_attempts=${NONE} | count=${NONE}
-| | And Vpp Route Add | ${dut_node} | ${net1} | ${prefix_length} | ${net2_ip1}
-| | ... | ${vhost2} | resolve_attempts=${NONE} | count=${NONE}
+| | And Vpp Route Add | ${dut_node} | ${net3} | ${prefix_length}
+| | ... | gateway=${net2_ip2} | interface=${vhost1}
+| | And Vpp Route Add | ${dut_node} | ${net1} | ${prefix_length}
+| | ... | gateway=${net2_ip1} | interface=${vhost2}
 | | ... | vrf=${fib_table_2}
-| | Add IP Neighbor | ${dut_node} | ${vhost1} | ${net2_ip2} | ${vhost2_mac}
-| | Add IP Neighbor | ${dut_node} | ${dut_to_tg_if2} | ${net3_ip2}
-| | ... | ${tg_to_dut_if2_mac}
-| | When Configure VM for vhost L2BD forwarding
+| | VPP Add IP Neighbor | ${dut_node} | ${vhost1} | ${net2_ip2} | ${vhost2_mac}
+| | VPP Add IP Neighbor
+| | ... | ${dut_node} | ${dut_to_tg_if2} | ${net3_ip2} | ${tg_to_dut_if2_mac}
+| | And Configure VM for vhost L2BD forwarding
 | | ... | ${dut_node} | ${sock1} | ${sock2}
 | | Then Send packet and verify headers
 | | ... | ${tg_node} | ${net1_ip2} | ${net3_ip2}