diff options
Diffstat (limited to 'tests/vpp/func')
3 files changed, 6 insertions, 18 deletions
diff --git a/tests/vpp/func/vm_vhost/l2bd/eth2p-dot1q-l2bdbasemaclrn-eth-2vhost-1vm-func.robot b/tests/vpp/func/vm_vhost/l2bd/eth2p-dot1q-l2bdbasemaclrn-eth-2vhost-1vm-func.robot index 7eb7d3e857..4eaaefd4fa 100644 --- a/tests/vpp/func/vm_vhost/l2bd/eth2p-dot1q-l2bdbasemaclrn-eth-2vhost-1vm-func.robot +++ b/tests/vpp/func/vm_vhost/l2bd/eth2p-dot1q-l2bdbasemaclrn-eth-2vhost-1vm-func.robot @@ -22,10 +22,8 @@ | Library | resources.libraries.python.Trace | Force Tags | 3_NODE_DOUBLE_LINK_TOPO | HW_ENV | VM_ENV | VPP_VM_ENV | Test Setup | Set up functional test -| Test Teardown | Run Keywords | Show Packet Trace on All DUTs | ${nodes} -| ... | AND | Show vpp trace dump on all DUTs -| ... | AND | Stop and clear QEMU | ${dut_node} | ${vm_node} -| ... | AND | Verify VPP PID in Teardown +| Test Teardown | Run Keywords | Tear down functional test +| ... | AND | Stop and clear QEMU | ${dut_node} | ${vm_node} | Documentation | *L2 bridge domain with VLAN tag over VM test cases* | ... | ... | *[Top] Network Topologies:* TG=DUT 2-node circular topology diff --git a/tests/vpp/func/vm_vhost/l2bd/eth2p-eth-l2bdbasemaclrn-eth-2vhost-1vm-func.robot b/tests/vpp/func/vm_vhost/l2bd/eth2p-eth-l2bdbasemaclrn-eth-2vhost-1vm-func.robot index 678e268235..e7af3f0338 100644 --- a/tests/vpp/func/vm_vhost/l2bd/eth2p-eth-l2bdbasemaclrn-eth-2vhost-1vm-func.robot +++ b/tests/vpp/func/vm_vhost/l2bd/eth2p-eth-l2bdbasemaclrn-eth-2vhost-1vm-func.robot @@ -19,7 +19,8 @@ | Library | resources.libraries.python.Trace | Force Tags | 3_NODE_DOUBLE_LINK_TOPO | HW_ENV | VM_ENV | VPP_VM_ENV | Test Setup | Set up functional test -| Test Teardown | Tear down functional test +| Test Teardown | Run Keywords | Tear down functional test +| ... | AND | Stop and clear QEMU | ${dut_node} | ${vm_node} | Documentation | *L2 bridge-domain test cases* | ... | ... | *[Top] Network Topologies:* TG=DUT=VM 3-node topology with VM @@ -52,9 +53,6 @@ | | ... | switched thru DUT1 and VM in both directions and are correct on | | ... | receive. [Ref] | | ... -| | [Teardown] | Run Keywords | Stop and clear QEMU | ${dut_node} | ${vm_node} -| | ... | AND | Tear down functional test -| | ... | | Given Configure path in 2-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']} | | And Set interfaces in 2-node circular topology up @@ -85,9 +83,6 @@ | | ... | switched thru DUT1 and VM in both directions and are correct on | | ... | receive. [Ref] | | ... -| | [Teardown] | Run Keywords | Stop and clear QEMU | ${dut_node} | ${vm_node} -| | ... | AND | Tear down functional test -| | ... | | Given Configure path in 2-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']} | | And Set interfaces in 2-node circular topology up diff --git a/tests/vpp/func/vm_vhost/l2bd/eth2p-eth-l2bdbasemacstc-eth-2vhost-1vm-func.robot b/tests/vpp/func/vm_vhost/l2bd/eth2p-eth-l2bdbasemacstc-eth-2vhost-1vm-func.robot index 22ec61d395..18ad1b77c3 100644 --- a/tests/vpp/func/vm_vhost/l2bd/eth2p-eth-l2bdbasemacstc-eth-2vhost-1vm-func.robot +++ b/tests/vpp/func/vm_vhost/l2bd/eth2p-eth-l2bdbasemacstc-eth-2vhost-1vm-func.robot @@ -19,7 +19,8 @@ | Library | resources.libraries.python.Trace | Force Tags | 3_NODE_DOUBLE_LINK_TOPO | HW_ENV | VM_ENV | VPP_VM_ENV | Test Setup | Set up functional test -| Test Teardown | Tear down functional test +| Test Teardown | Run Keywords | Tear down functional test +| ... | AND | Stop and clear QEMU | ${dut_node} | ${vm_node} | Documentation | *L2 bridge-domain test cases* | ... | ... | *[Top] Network Topologies:* TG=DUT=VM 3-node topology with VM @@ -52,9 +53,6 @@ | | ... | switched thru DUT1 and VM in both directions and are correct on | | ... | receive. [Ref] | | ... -| | [Teardown] | Run Keywords | Stop and clear QEMU | ${dut_node} | ${vm_node} -| | ... | AND | Tear down functional test -| | ... | | Given Configure path in 2-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']} | | And Set interfaces in 2-node circular topology up @@ -105,9 +103,6 @@ | | ... | switched thru DUT1 and VM in both directions and are correct on | | ... | receive. [Ref] | | ... -| | [Teardown] | Run Keywords | Stop and clear QEMU | ${dut_node} | ${vm_node} -| | ... | AND | Tear down functional test -| | ... | | Given Configure path in 2-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']} | | And Set interfaces in 2-node circular topology up |