diff options
| author |   Peter Mikus <pmikus@cisco.com> | 2019-03-20 13:21:26 +0000 |
|---|---|---|
| committer | Peter Mikus <pmikus@cisco.com> | 2019-03-21 10:58:14 +0000 |
| commit | c8b5a89276f6c10a2d8ca9858f426a6089ac08e3 (patch) | |
| tree | 1c22c7c6976d7e6a36bb4d31f53c80e64140dda4 /tests/vpp/func/vm_vhost/l2bd | |
| parent | 42b6f3b341d23f43fd0459a755c4650a574cb3b6 (diff) | |
Convert functional tests to statefull QemuUtils
Change-Id: Ia1b9120c45733db64dc2dc8b03cff5ef5f167548
Signed-off-by: Peter Mikus <pmikus@cisco.com>
Diffstat (limited to 'tests/vpp/func/vm_vhost/l2bd')
6 files changed, 14 insertions, 17 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 7895fa13a8..071aa7902c 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 @@ -21,7 +21,7 @@ | Force Tags | 3_NODE_DOUBLE_LINK_TOPO | HW_ENV | VM_ENV | VPP_VM_ENV | Test Setup | Set up functional test | Test Teardown | Run Keywords | Tear down functional test -| ... | AND | Stop and clear QEMU | ${dut_node} +| ... | AND | Tear down QEMU | 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 38195c35f1..b1626ae93b 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,7 @@ | Force Tags | 3_NODE_DOUBLE_LINK_TOPO | HW_ENV | VM_ENV | VPP_VM_ENV | Test Setup | Set up functional test | Test Teardown | Run Keywords | Tear down functional test -| ... | AND | Stop and clear QEMU | ${dut_node} +| ... | AND | Tear down QEMU | Documentation | *L2 bridge-domain test cases* | ... | ... | *[Top] Network Topologies:* TG=DUT=VM 3-node topology with VM 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 5242938848..5b6b73aba3 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,7 @@ | Force Tags | 3_NODE_DOUBLE_LINK_TOPO | HW_ENV | VM_ENV | VPP_VM_ENV | Test Setup | Set up functional test | Test Teardown | Run Keywords | Tear down functional test -| ... | AND | Stop and clear QEMU | ${dut_node} +| ... | AND | Tear down QEMU | Documentation | *L2 bridge-domain test cases* | ... | ... | *[Top] Network Topologies:* TG=DUT=VM 3-node topology with VM diff --git a/tests/vpp/func/vm_vhost/l2bd/eth2p-ethip4-l2bdbase-vhost-client-reconnect-2vm-func.robot b/tests/vpp/func/vm_vhost/l2bd/eth2p-ethip4-l2bdbase-vhost-client-reconnect-2vm-func.robot index 6a65d04d0d..ec2a82b358 100644 --- a/tests/vpp/func/vm_vhost/l2bd/eth2p-ethip4-l2bdbase-vhost-client-reconnect-2vm-func.robot +++ b/tests/vpp/func/vm_vhost/l2bd/eth2p-ethip4-l2bdbase-vhost-client-reconnect-2vm-func.robot @@ -20,7 +20,8 @@ | Force Tags | HW_ENV | VM_ENV | 3_NODE_DOUBLE_LINK_TOPO | VPP_VM_ENV | Test Setup | Set up functional test | Test Teardown | Run Keywords -| ... | resources.libraries.python.QemuUtils.Qemu Kill All | ${dut_node} | AND +| ... | qemu-1.Qemu Kill | AND +| ... | qemu-2.Qemu Kill | AND | ... | Tear down functional test | Documentation | *Vhost-User Interface Traffic Tests* | ... | *[Top] Network Topologies:* TG=DUT1 2-node topology with two links @@ -200,15 +201,11 @@ *** Keywords *** | Configure QEMU vhost and run it VM | | [Arguments] | ${dut_node} | ${sock1} | ${sock2} | ${qemu_id} -| | Import Library | resources.libraries.python.QemuUtils | qemu_id=${qemu_id} -| | ... | WITH NAME | qemu-${qemu_id} -| | ${q_add_vhost}= | Replace Variables | qemu-${qemu_id}.Qemu Add Vhost User If -| | ${q_set_node}= | Replace Variables | qemu-${qemu_id}.Qemu Set Node -| | ${q_start}= | Replace Variables | qemu-${qemu_id}.Qemu Start -| | Run keyword | ${q_set_node} | ${dut_node} -| | Run keyword | ${q_add_vhost} | ${sock1} -| | Run keyword | ${q_add_vhost} | ${sock2} -| | ${vm}= | Run keyword | ${q_start} +| | Import Library | resources.libraries.python.QemuUtils | node=${dut_node} | +| | ... | qemu_id=${qemu_id} | WITH NAME | qemu-${qemu_id} +| | Run keyword | qemu-${qemu_id}.Qemu Add Vhost User If | ${sock1} +| | Run keyword | qemu-${qemu_id}.Qemu Add Vhost User If | ${sock2} +| | ${vm}= | Run keyword | qemu-${qemu_id}.Qemu Start | | ${vhost1}= | Get Vhost User If Name By Sock | ${vm} | ${sock1} | | ${vhost2}= | Get Vhost User If Name By Sock | ${vm} | ${sock2} | | Linux Add Bridge | ${vm} | br0 | ${vhost1} | ${vhost2} diff --git a/tests/vpp/func/vm_vhost/l2bd/eth2p-ethip4vxlan-l2bdbasemaclrn-eth-2vhost-1vm-func.robot b/tests/vpp/func/vm_vhost/l2bd/eth2p-ethip4vxlan-l2bdbasemaclrn-eth-2vhost-1vm-func.robot index 27691fe80c..73b6e4156a 100644 --- a/tests/vpp/func/vm_vhost/l2bd/eth2p-ethip4vxlan-l2bdbasemaclrn-eth-2vhost-1vm-func.robot +++ b/tests/vpp/func/vm_vhost/l2bd/eth2p-ethip4vxlan-l2bdbasemaclrn-eth-2vhost-1vm-func.robot @@ -20,8 +20,8 @@ | Force Tags | 3_NODE_SINGLE_LINK_TOPO | VM_ENV | HW_ENV | VPP_VM_ENV | Test Setup | Set up functional test | Test Teardown | Run Keywords | Tear down functional test -| ... | AND | Run keyword | Tear down QEMU | ${dut1_node} | ${qemu1} -| ... | AND | Run keyword | Tear down QEMU | ${dut2_node} | ${qemu2} +| ... | AND | Run keyword | Tear down QEMU | ${qemu1} +| ... | AND | Run keyword | Tear down QEMU | ${qemu2} | Documentation | *L2BD with VM combined with VXLAN test cases - IPv4* | ... | ... | *[Top] Network topologies:* TG-DUT1-DUT2-TG 3-node circular topology diff --git a/tests/vpp/func/vm_vhost/l2bd/eth2p-ethip6vxlan-l2bdbasemaclrn-eth-2vhost-1vm-func.robot b/tests/vpp/func/vm_vhost/l2bd/eth2p-ethip6vxlan-l2bdbasemaclrn-eth-2vhost-1vm-func.robot index c7b905d668..f99994a78b 100644 --- a/tests/vpp/func/vm_vhost/l2bd/eth2p-ethip6vxlan-l2bdbasemaclrn-eth-2vhost-1vm-func.robot +++ b/tests/vpp/func/vm_vhost/l2bd/eth2p-ethip6vxlan-l2bdbasemaclrn-eth-2vhost-1vm-func.robot @@ -21,8 +21,8 @@ | Force Tags | 3_NODE_SINGLE_LINK_TOPO | VM_ENV | HW_ENV | Test Setup | Set up functional test | Test Teardown | Run Keywords | Tear down functional test -| ... | AND | Run keyword | Tear down QEMU | ${dut1_node} | ${qemu1} -| ... | AND | Run keyword | Tear down QEMU | ${dut2_node} | ${qemu2} +| ... | AND | Run keyword | Tear down QEMU | ${qemu1} +| ... | AND | Run keyword | Tear down QEMU | ${qemu2} | Documentation | *L2BD with VM combined with VXLAN test cases - IPv6* | ... | ... | *[Top] Network topologies:* TG-DUT1-DUT2-TG 3-node circular topology |