diff options
| author |   Peter Mikus <pmikus@cisco.com> | 2019-03-08 15:23:48 +0000 |
|---|---|---|
| committer | Peter Mikus <pmikus@cisco.com> | 2019-03-18 20:14:02 +0000 |
| commit | 22417d56aa83eaced43c4ef4473e38a34fdb4dfa (patch) | |
| tree | e6942f12138e8bf1478b64d7bd2fed9c7adf0169 /tests/vpp/func | |
| parent | 6aaecf9f7fe3f0ad0d9bbad20e4853472d3e72df (diff) | |
CSIT-1386 KernelVM - Part I
- Refactor QemuUtils
Full refactor of QemuUtils to prepare for thinner VMs.
Change-Id: I171ba11a9e6e9faec582bd58df6819598b0ed0b5
Signed-off-by: Peter Mikus <pmikus@cisco.com>
Diffstat (limited to 'tests/vpp/func')
23 files changed, 21 insertions, 59 deletions
diff --git a/tests/vpp/func/ip4_tunnels/vxlan/eth2p-ethip4vxlan-l2bdbasemaclrn-func.robot b/tests/vpp/func/ip4_tunnels/vxlan/eth2p-ethip4vxlan-l2bdbasemaclrn-func.robot index 9f1a40bfea..ba6de6b0a6 100644 --- a/tests/vpp/func/ip4_tunnels/vxlan/eth2p-ethip4vxlan-l2bdbasemaclrn-func.robot +++ b/tests/vpp/func/ip4_tunnels/vxlan/eth2p-ethip4vxlan-l2bdbasemaclrn-func.robot @@ -17,7 +17,6 @@ | Resource | resources/libraries/robot/overlay/vxlan.robot | Resource | resources/libraries/robot/l2/l2_traffic.robot | Resource | resources/libraries/robot/vm/qemu.robot -| Resource | resources/libraries/robot/vm/double_qemu_setup.robot | Library | resources.libraries.python.Trace | Force Tags | 3_NODE_SINGLE_LINK_TOPO | VM_ENV | HW_ENV | SKIP_VPP_PATCH | Test Setup | Set up functional test diff --git a/tests/vpp/func/ip4_tunnels/vxlan/eth4p-ethip4vxlan-l2bdbasemaclrn-l2shg-func.robot b/tests/vpp/func/ip4_tunnels/vxlan/eth4p-ethip4vxlan-l2bdbasemaclrn-l2shg-func.robot index 8fd608eada..e1ec8ffc37 100644 --- a/tests/vpp/func/ip4_tunnels/vxlan/eth4p-ethip4vxlan-l2bdbasemaclrn-l2shg-func.robot +++ b/tests/vpp/func/ip4_tunnels/vxlan/eth4p-ethip4vxlan-l2bdbasemaclrn-l2shg-func.robot @@ -17,7 +17,6 @@ | Resource | resources/libraries/robot/overlay/vxlan.robot | Resource | resources/libraries/robot/l2/l2_traffic.robot | Resource | resources/libraries/robot/vm/qemu.robot -| Resource | resources/libraries/robot/vm/double_qemu_setup.robot | Library | resources.libraries.python.Trace | Force Tags | 3_NODE_SINGLE_LINK_TOPO | VM_ENV | HW_ENV | Test Setup | Set up functional test diff --git a/tests/vpp/func/ip6_tunnels/vxlan/eth2p-ethip6vxlan-l2bdbasemaclrn-func.robot b/tests/vpp/func/ip6_tunnels/vxlan/eth2p-ethip6vxlan-l2bdbasemaclrn-func.robot index 165da28bd2..74463c22c5 100644 --- a/tests/vpp/func/ip6_tunnels/vxlan/eth2p-ethip6vxlan-l2bdbasemaclrn-func.robot +++ b/tests/vpp/func/ip6_tunnels/vxlan/eth2p-ethip6vxlan-l2bdbasemaclrn-func.robot @@ -17,7 +17,6 @@ | Resource | resources/libraries/robot/overlay/vxlan.robot | Resource | resources/libraries/robot/l2/l2_traffic.robot | Resource | resources/libraries/robot/vm/qemu.robot -| Resource | resources/libraries/robot/vm/double_qemu_setup.robot | Library | resources.libraries.python.Trace | Library | resources.libraries.python.IPv6Setup | Force Tags | 3_NODE_SINGLE_LINK_TOPO | VM_ENV | HW_ENV diff --git a/tests/vpp/func/ip6_tunnels/vxlan/eth4p-ethip6vxlan-l2bdbasemaclrn-l2shg-func.robot b/tests/vpp/func/ip6_tunnels/vxlan/eth4p-ethip6vxlan-l2bdbasemaclrn-l2shg-func.robot index 115883f1b1..49df42a63e 100644 --- a/tests/vpp/func/ip6_tunnels/vxlan/eth4p-ethip6vxlan-l2bdbasemaclrn-l2shg-func.robot +++ b/tests/vpp/func/ip6_tunnels/vxlan/eth4p-ethip6vxlan-l2bdbasemaclrn-l2shg-func.robot @@ -17,7 +17,6 @@ | Resource | resources/libraries/robot/overlay/vxlan.robot | Resource | resources/libraries/robot/l2/l2_traffic.robot | Resource | resources/libraries/robot/vm/qemu.robot -| Resource | resources/libraries/robot/vm/double_qemu_setup.robot | Library | resources.libraries.python.Trace | Library | resources.libraries.python.IPv6Setup | Force Tags | 3_NODE_SINGLE_LINK_TOPO | VM_ENV | HW_ENV diff --git a/tests/vpp/func/vm_vhost/ip4/eth2p-ethip4-ip4base-eth-2vhost-1vm.robot b/tests/vpp/func/vm_vhost/ip4/eth2p-ethip4-ip4base-eth-2vhost-1vm.robot index 7887b19503..a30d7cd600 100644 --- a/tests/vpp/func/vm_vhost/ip4/eth2p-ethip4-ip4base-eth-2vhost-1vm.robot +++ b/tests/vpp/func/vm_vhost/ip4/eth2p-ethip4-ip4base-eth-2vhost-1vm.robot @@ -24,7 +24,6 @@ | Resource | resources/libraries/robot/shared/interfaces.robot | Resource | resources/libraries/robot/shared/testing_path.robot | Resource | resources/libraries/robot/ip/ip4.robot -| Resource | resources/libraries/robot/vm/qemu.robot | Resource | resources/libraries/robot/l2/l2_bridge_domain.robot | Force Tags | VM_ENV | HW_ENV | 3_NODE_DOUBLE_LINK_TOPO | Test Setup | Set up functional test @@ -60,7 +59,7 @@ | | ... | Both have IP addresses from same network. On VM is set bridge to pass | | ... | packet from a one vhost user interface to another one. | | [Teardown] | Run Keywords -| | ... | Stop and clear QEMU | ${dut_node} | ${vm_node} | AND +| | ... | Stop and clear QEMU | ${dut_node} | AND | | ... | Tear down functional test | | | | Given Configure path in 2-node circular topology diff --git a/tests/vpp/func/vm_vhost/ip4/eth2p-ethip4ipsectptlispgpe-ip4base-eth-2vhost-1vm-func.robot b/tests/vpp/func/vm_vhost/ip4/eth2p-ethip4ipsectptlispgpe-ip4base-eth-2vhost-1vm-func.robot index 464d4a5768..203c25d018 100644 --- a/tests/vpp/func/vm_vhost/ip4/eth2p-ethip4ipsectptlispgpe-ip4base-eth-2vhost-1vm-func.robot +++ b/tests/vpp/func/vm_vhost/ip4/eth2p-ethip4ipsectptlispgpe-ip4base-eth-2vhost-1vm-func.robot @@ -17,7 +17,6 @@ | Library | resources.libraries.python.Trace | Library | resources.libraries.python.LispUtil | Library | resources.libraries.python.VhostUser -| Library | resources.libraries.python.QemuUtils | Library | resources.libraries.python.VPPUtil | Library | resources.libraries.python.IPsecUtil | Resource | resources/libraries/robot/shared/traffic.robot @@ -25,7 +24,6 @@ | Resource | resources/libraries/robot/shared/interfaces.robot | Resource | resources/libraries/robot/shared/testing_path.robot | Resource | resources/libraries/robot/crypto/ipsec.robot -| Resource | resources/libraries/robot/vm/qemu.robot | Resource | resources/libraries/robot/overlay/lispgpe.robot | Resource | resources/libraries/robot/l2/l2_bridge_domain.robot | Resource | resources/libraries/robot/overlay/l2lisp.robot @@ -37,7 +35,7 @@ | ... | Test Setup | Set up functional test | ... -| Test Teardown | Tear down LISP functional test with QEMU | ${vm_node} +| Test Teardown | Tear down LISP functional test with QEMU | ... | Documentation | *IPv4-ip4-ipsec-lispgpe-ip4 - main fib, vrf (gpe_vni-to-vrf)* | ... diff --git a/tests/vpp/func/vm_vhost/ip4/eth2p-ethip4ipsectptlispgpe-ip6base-eth-2vhost-1vm-func.robot b/tests/vpp/func/vm_vhost/ip4/eth2p-ethip4ipsectptlispgpe-ip6base-eth-2vhost-1vm-func.robot index 144ac0ac59..e4964ea7eb 100644 --- a/tests/vpp/func/vm_vhost/ip4/eth2p-ethip4ipsectptlispgpe-ip6base-eth-2vhost-1vm-func.robot +++ b/tests/vpp/func/vm_vhost/ip4/eth2p-ethip4ipsectptlispgpe-ip6base-eth-2vhost-1vm-func.robot @@ -22,7 +22,6 @@ | Library | resources.libraries.python.VatJsonUtil | Library | resources.libraries.python.IPv6Setup | Library | resources.libraries.python.VhostUser -| Library | resources.libraries.python.QemuUtils | Library | resources.libraries.python.VPPUtil | Library | String | Resource | resources/libraries/robot/shared/traffic.robot @@ -31,7 +30,6 @@ | Resource | resources/libraries/robot/shared/testing_path.robot | Resource | resources/libraries/robot/ip/ip6.robot | Resource | resources/libraries/robot/crypto/ipsec.robot -| Resource | resources/libraries/robot/vm/qemu.robot | Resource | resources/libraries/robot/overlay/lispgpe.robot | Resource | resources/libraries/robot/l2/l2_bridge_domain.robot # Import configuration and test data: @@ -41,7 +39,7 @@ | ... | Test Setup | Set up functional test | ... -| Test Teardown | Tear down LISP functional test with QEMU | ${vm_node} +| Test Teardown | Tear down LISP functional test with QEMU | ... | Documentation | *IPv6 - ip4-ipsec-lispgpe-ip6 - main fib, vrf, virt2lisp,\ | ... | phy2lisp* diff --git a/tests/vpp/func/vm_vhost/ip4/eth2p-ethip4lispgpe-ip4base-eth-2vhost-1vm-func.robot b/tests/vpp/func/vm_vhost/ip4/eth2p-ethip4lispgpe-ip4base-eth-2vhost-1vm-func.robot index c4c0c4a1d7..edd0d1e70e 100644 --- a/tests/vpp/func/vm_vhost/ip4/eth2p-ethip4lispgpe-ip4base-eth-2vhost-1vm-func.robot +++ b/tests/vpp/func/vm_vhost/ip4/eth2p-ethip4lispgpe-ip4base-eth-2vhost-1vm-func.robot @@ -24,7 +24,6 @@ | Resource | resources/libraries/robot/shared/interfaces.robot | Resource | resources/libraries/robot/shared/testing_path.robot | Resource | resources/libraries/robot/ip/ip4.robot -| Resource | resources/libraries/robot/vm/qemu.robot | Resource | resources/libraries/robot/l2/l2_bridge_domain.robot | Resource | resources/libraries/robot/overlay/lispgpe.robot # Import configuration and test data: @@ -34,7 +33,7 @@ | ... | Test Setup | Set up functional test | ... -| Test Teardown | Tear down LISP functional test with QEMU | ${vm_node} +| Test Teardown | Tear down LISP functional test with QEMU | ... | Documentation | *ip4-lispgpe-ip4 encapsulation test cases* | ... diff --git a/tests/vpp/func/vm_vhost/ip4/eth2p-ethip4lispgpe-ip4basevrf-eth-2vhost-1vm-func.robot b/tests/vpp/func/vm_vhost/ip4/eth2p-ethip4lispgpe-ip4basevrf-eth-2vhost-1vm-func.robot index 09bed1aea7..bc75a6893b 100644 --- a/tests/vpp/func/vm_vhost/ip4/eth2p-ethip4lispgpe-ip4basevrf-eth-2vhost-1vm-func.robot +++ b/tests/vpp/func/vm_vhost/ip4/eth2p-ethip4lispgpe-ip4basevrf-eth-2vhost-1vm-func.robot @@ -24,7 +24,6 @@ | Resource | resources/libraries/robot/shared/interfaces.robot | Resource | resources/libraries/robot/shared/testing_path.robot | Resource | resources/libraries/robot/ip/ip4.robot -| Resource | resources/libraries/robot/vm/qemu.robot | Resource | resources/libraries/robot/l2/l2_bridge_domain.robot | Resource | resources/libraries/robot/overlay/lispgpe.robot # Import configuration and test data: @@ -34,7 +33,7 @@ | ... | Test Setup | Set up functional test | ... -| Test Teardown | Tear down LISP functional test with QEMU | ${vm_node} +| Test Teardown | Tear down LISP functional test with QEMU | ... | Documentation | *ip4-lispgpe-ip4 encapsulation test cases* | ... diff --git a/tests/vpp/func/vm_vhost/ip4/eth2p-ethip4lispgpe-ip6base-eth-2vhost-1vm-func.robot b/tests/vpp/func/vm_vhost/ip4/eth2p-ethip4lispgpe-ip6base-eth-2vhost-1vm-func.robot index fb7960bd58..2034ad4cf4 100644 --- a/tests/vpp/func/vm_vhost/ip4/eth2p-ethip4lispgpe-ip6base-eth-2vhost-1vm-func.robot +++ b/tests/vpp/func/vm_vhost/ip4/eth2p-ethip4lispgpe-ip6base-eth-2vhost-1vm-func.robot @@ -20,7 +20,6 @@ | Resource | resources/libraries/robot/l2/l2_traffic.robot | Resource | resources/libraries/robot/overlay/lispgpe.robot | Resource | resources/libraries/robot/l2/l2_bridge_domain.robot -| Resource | resources/libraries/robot/vm/qemu.robot | Library | resources.libraries.python.IPUtil | Library | resources.libraries.python.VhostUser | Library | resources.libraries.python.Trace @@ -33,7 +32,7 @@ | ... | Test Setup | Set up functional test | ... -| Test Teardown | Tear down LISP functional test with QEMU | ${vm_node} +| Test Teardown | Tear down LISP functional test with QEMU | ... | Documentation | *LISP static adjacency test cases* | ... diff --git a/tests/vpp/func/vm_vhost/ip6/eth2p-ethip6ipsectptlispgpe-ip4base-eth-2vhost-1vm-func.robot b/tests/vpp/func/vm_vhost/ip6/eth2p-ethip6ipsectptlispgpe-ip4base-eth-2vhost-1vm-func.robot index 6b5639537e..d2083612d0 100644 --- a/tests/vpp/func/vm_vhost/ip6/eth2p-ethip6ipsectptlispgpe-ip4base-eth-2vhost-1vm-func.robot +++ b/tests/vpp/func/vm_vhost/ip6/eth2p-ethip6ipsectptlispgpe-ip4base-eth-2vhost-1vm-func.robot @@ -22,7 +22,6 @@ | Library | resources.libraries.python.VatJsonUtil | Library | resources.libraries.python.IPv6Setup | Library | resources.libraries.python.VhostUser -| Library | resources.libraries.python.QemuUtils | Library | resources.libraries.python.VPPUtil | Library | String | Resource | resources/libraries/robot/shared/traffic.robot @@ -31,7 +30,6 @@ | Resource | resources/libraries/robot/shared/testing_path.robot | Resource | resources/libraries/robot/ip/ip6.robot | Resource | resources/libraries/robot/crypto/ipsec.robot -| Resource | resources/libraries/robot/vm/qemu.robot | Resource | resources/libraries/robot/overlay/lispgpe.robot | Resource | resources/libraries/robot/l2/l2_bridge_domain.robot # Import configuration and test data: @@ -41,7 +39,7 @@ | ... | Test Setup | Set up functional test | ... -| Test Teardown | Tear down LISP functional test with QEMU | ${vm_node} +| Test Teardown | Tear down LISP functional test with QEMU | ... | Documentation | *IPv6 - ip4-ipsec-lispgpe-ip6 - main fib, virt2lisp, phy2lisp* | ... diff --git a/tests/vpp/func/vm_vhost/ip6/eth2p-ethip6ipsectptlispgpe-ip6base-eth-2vhost-1vm-func.robot b/tests/vpp/func/vm_vhost/ip6/eth2p-ethip6ipsectptlispgpe-ip6base-eth-2vhost-1vm-func.robot index d7f2f3da7f..69a5b71c57 100644 --- a/tests/vpp/func/vm_vhost/ip6/eth2p-ethip6ipsectptlispgpe-ip6base-eth-2vhost-1vm-func.robot +++ b/tests/vpp/func/vm_vhost/ip6/eth2p-ethip6ipsectptlispgpe-ip6base-eth-2vhost-1vm-func.robot @@ -23,7 +23,6 @@ | Library | resources.libraries.python.VatJsonUtil | Library | resources.libraries.python.IPv6Setup | Library | resources.libraries.python.VhostUser -| Library | resources.libraries.python.QemuUtils | Library | String | Resource | resources/libraries/robot/shared/traffic.robot | Resource | resources/libraries/robot/shared/default.robot @@ -31,7 +30,6 @@ | Resource | resources/libraries/robot/shared/testing_path.robot | Resource | resources/libraries/robot/ip/ip6.robot | Resource | resources/libraries/robot/crypto/ipsec.robot -| Resource | resources/libraries/robot/vm/qemu.robot | Resource | resources/libraries/robot/overlay/lispgpe.robot | Resource | resources/libraries/robot/l2/l2_bridge_domain.robot # Import configuration and test data: @@ -43,7 +41,7 @@ | Test Setup | Run Keywords | Set up functional test | ... | AND | Vpp All Ra Suppress Link Layer | ${nodes} | ... -| Test Teardown | Tear down LISP functional test with QEMU | ${vm_node} +| Test Teardown | Tear down LISP functional test with QEMU | ... | Documentation | *IPv6 - ip6-ipsec-lispgpe-ip6 - main fib, | ... | vrf (gpe_vni-to-vrf), phy2lisp, virt2lisp* diff --git a/tests/vpp/func/vm_vhost/ip6/eth2p-ethip6lispgpe-ip6base-eth-2vhost-1vm-func.robot b/tests/vpp/func/vm_vhost/ip6/eth2p-ethip6lispgpe-ip6base-eth-2vhost-1vm-func.robot index 45b81d4f56..c19a2b042b 100644 --- a/tests/vpp/func/vm_vhost/ip6/eth2p-ethip6lispgpe-ip6base-eth-2vhost-1vm-func.robot +++ b/tests/vpp/func/vm_vhost/ip6/eth2p-ethip6lispgpe-ip6base-eth-2vhost-1vm-func.robot @@ -22,7 +22,6 @@ | 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/vm/qemu.robot | Resource | resources/libraries/robot/l2/l2_bridge_domain.robot | Resource | resources/libraries/robot/overlay/lispgpe.robot # Import configuration and test data: @@ -33,7 +32,7 @@ | Test Setup | Run Keywords | Set up functional test | ... | AND | Vpp All Ra Suppress Link Layer | ${nodes} | ... -| Test Teardown | Tear down LISP functional test with QEMU | ${vm_node} +| Test Teardown | Tear down LISP functional test with QEMU | ... | Documentation | *ip6-lispgpe-ip6 encapsulation test cases* | ... diff --git a/tests/vpp/func/vm_vhost/ip6/eth2p-ethip6lispgpe-ip6basevrf-eth-2vhost-1vm-func.robot b/tests/vpp/func/vm_vhost/ip6/eth2p-ethip6lispgpe-ip6basevrf-eth-2vhost-1vm-func.robot index 16cded0f24..5b0dc9c0d5 100644 --- a/tests/vpp/func/vm_vhost/ip6/eth2p-ethip6lispgpe-ip6basevrf-eth-2vhost-1vm-func.robot +++ b/tests/vpp/func/vm_vhost/ip6/eth2p-ethip6lispgpe-ip6basevrf-eth-2vhost-1vm-func.robot @@ -22,7 +22,6 @@ | 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/vm/qemu.robot | Resource | resources/libraries/robot/l2/l2_bridge_domain.robot | Resource | resources/libraries/robot/overlay/lispgpe.robot # Import configuration and test data: @@ -33,7 +32,7 @@ | Test Setup | Run Keywords | Set up functional test | ... | AND | Vpp All Ra Suppress Link Layer | ${nodes} | ... -| Test Teardown | Tear down LISP functional test with QEMU | ${vm_node} +| Test Teardown | Tear down LISP functional test with QEMU | ... | Documentation | *ip6-lispgpe-ip6 encapsulation test cases* | ... 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 4eaaefd4fa..7895fa13a8 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 @@ -17,13 +17,11 @@ | Resource | resources/libraries/robot/shared/testing_path.robot | Resource | resources/libraries/robot/l2/tagging.robot | Resource | resources/libraries/robot/l2/l2_traffic.robot -| Resource | resources/libraries/robot/vm/qemu.robot -| Resource | resources/libraries/robot/vm/double_qemu_setup.robot | 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 | Tear down functional test -| ... | AND | Stop and clear QEMU | ${dut_node} | ${vm_node} +| ... | AND | Stop and clear QEMU | ${dut_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-dot1q-l2bdbasemaclrn-eth-4vhost-2vm-fds-provider-nets-func.robot b/tests/vpp/func/vm_vhost/l2bd/eth2p-dot1q-l2bdbasemaclrn-eth-4vhost-2vm-fds-provider-nets-func.robot index e652ac44d0..f86fd75849 100644 --- a/tests/vpp/func/vm_vhost/l2bd/eth2p-dot1q-l2bdbasemaclrn-eth-4vhost-2vm-fds-provider-nets-func.robot +++ b/tests/vpp/func/vm_vhost/l2bd/eth2p-dot1q-l2bdbasemaclrn-eth-4vhost-2vm-fds-provider-nets-func.robot @@ -16,16 +16,13 @@ | Resource | resources/libraries/robot/ip/ip4.robot | Resource | resources/libraries/robot/l2/l2_bridge_domain.robot | Resource | resources/libraries/robot/shared/testing_path.robot -| Resource | resources/libraries/robot/vm/double_qemu_setup.robot -| Resource | resources/libraries/robot/vm/qemu.robot | Library | resources.libraries.python.Trace | ... | Force Tags | HW_ENV | VM_ENV | SKIP_PATCH | ... | Test Setup | Set up functional test | ... -| Test Teardown | Tear down FDS functional test | ${dut1_node} | ${qemu_node1} -| ... | ${dut2_node} | ${qemu_node2} +| Test Teardown | Tear down FDS functional test | ${dut1_node} | ${dut2_node} | ... | Documentation | *Provider network FDS related.* | ... 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 e7af3f0338..38195c35f1 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 @@ -15,12 +15,11 @@ | Resource | resources/libraries/robot/shared/default.robot | Resource | resources/libraries/robot/l2/l2_bridge_domain.robot | Resource | resources/libraries/robot/shared/testing_path.robot -| Resource | resources/libraries/robot/vm/qemu.robot | 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 | Tear down functional test -| ... | AND | Stop and clear QEMU | ${dut_node} | ${vm_node} +| ... | AND | Stop and clear QEMU | ${dut_node} | 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 18ad1b77c3..5242938848 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 @@ -15,12 +15,11 @@ | Resource | resources/libraries/robot/shared/default.robot | Resource | resources/libraries/robot/l2/l2_bridge_domain.robot | Resource | resources/libraries/robot/shared/testing_path.robot -| Resource | resources/libraries/robot/vm/qemu.robot | 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 | Tear down functional test -| ... | AND | Stop and clear QEMU | ${dut_node} | ${vm_node} +| ... | AND | Stop and clear QEMU | ${dut_node} | 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 4609aa10d2..6a65d04d0d 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 @@ -15,7 +15,6 @@ | Resource | resources/libraries/robot/shared/default.robot | Resource | resources/libraries/robot/l2/l2_bridge_domain.robot | Resource | resources/libraries/robot/shared/testing_path.robot -| Resource | resources/libraries/robot/vm/qemu.robot | Resource | resources/libraries/robot/overlay/vxlan.robot | Library | resources.libraries.python.Trace | Force Tags | HW_ENV | VM_ENV | 3_NODE_DOUBLE_LINK_TOPO | VPP_VM_ENV diff --git a/tests/vpp/func/vm_vhost/l2bd/eth2p-ethip4vxlan-l2bdbasemaclrn--eth-4vhost-2vm-fds-tenant-nets-func.robot b/tests/vpp/func/vm_vhost/l2bd/eth2p-ethip4vxlan-l2bdbasemaclrn--eth-4vhost-2vm-fds-tenant-nets-func.robot index 2d81d3b592..47728d73c7 100644 --- a/tests/vpp/func/vm_vhost/l2bd/eth2p-ethip4vxlan-l2bdbasemaclrn--eth-4vhost-2vm-fds-tenant-nets-func.robot +++ b/tests/vpp/func/vm_vhost/l2bd/eth2p-ethip4vxlan-l2bdbasemaclrn--eth-4vhost-2vm-fds-tenant-nets-func.robot @@ -16,16 +16,13 @@ | Resource | resources/libraries/robot/ip/ip4.robot | Resource | resources/libraries/robot/l2/l2_bridge_domain.robot | Resource | resources/libraries/robot/shared/testing_path.robot -| Resource | resources/libraries/robot/vm/double_qemu_setup.robot -| Resource | resources/libraries/robot/vm/qemu.robot | Library | resources.libraries.python.Trace | ... | Force Tags | HW_ENV | VM_ENV | SKIP_PATCH | ... | Test Setup | Set up functional test | ... -| Test Teardown | Tear down FDS functional test | ${dut1_node} | ${qemu_node1} -| ... | ${dut2_node} | ${qemu_node2} +| Test Teardown | Tear down FDS functional test | ${dut1_node} | ${dut2_node} | ... | Documentation | *Tenant network FDS related.* | ... 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 d6f4e57143..27691fe80c 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 @@ -16,16 +16,12 @@ | Resource | resources/libraries/robot/shared/testing_path.robot | Resource | resources/libraries/robot/overlay/vxlan.robot | Resource | resources/libraries/robot/l2/l2_traffic.robot -| Resource | resources/libraries/robot/vm/qemu.robot -| Resource | resources/libraries/robot/vm/double_qemu_setup.robot | Library | resources.libraries.python.Trace | 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}} | ${qemu1} -| ... | AND | Run keyword | Tear down QEMU | ${dut2_node} -| ... | ${${qemu2}} | ${qemu2} +| ... | AND | Run keyword | Tear down QEMU | ${dut1_node} | ${qemu1} +| ... | AND | Run keyword | Tear down QEMU | ${dut2_node} | ${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 cde7bd8aff..c7b905d668 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 @@ -16,17 +16,13 @@ | Resource | resources/libraries/robot/shared/testing_path.robot | Resource | resources/libraries/robot/overlay/vxlan.robot | Resource | resources/libraries/robot/l2/l2_traffic.robot -| Resource | resources/libraries/robot/vm/qemu.robot -| Resource | resources/libraries/robot/vm/double_qemu_setup.robot | Library | resources.libraries.python.Trace | Library | resources.libraries.python.IPv6Setup | 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}} | ${qemu1} -| ... | AND | Run keyword | Tear down QEMU | ${dut2_node} -| ... | ${${qemu2}} | ${qemu2} +| ... | AND | Run keyword | Tear down QEMU | ${dut1_node} | ${qemu1} +| ... | AND | Run keyword | Tear down QEMU | ${dut2_node} | ${qemu2} | Documentation | *L2BD with VM combined with VXLAN test cases - IPv6* | ... | ... | *[Top] Network topologies:* TG-DUT1-DUT2-TG 3-node circular topology diff --git a/tests/vpp/func/vm_vhost/l2xc/eth2p-eth-l2xcbase-eth-2vhost-1vm-func.robot b/tests/vpp/func/vm_vhost/l2xc/eth2p-eth-l2xcbase-eth-2vhost-1vm-func.robot index 759d7cba23..bebdf711ff 100644 --- a/tests/vpp/func/vm_vhost/l2xc/eth2p-eth-l2xcbase-eth-2vhost-1vm-func.robot +++ b/tests/vpp/func/vm_vhost/l2xc/eth2p-eth-l2xcbase-eth-2vhost-1vm-func.robot @@ -18,7 +18,6 @@ | Resource | resources/libraries/robot/shared/testing_path.robot | Resource | resources/libraries/robot/shared/interfaces.robot | Resource | resources/libraries/robot/l2/l2_bridge_domain.robot -| Resource | resources/libraries/robot/vm/qemu.robot | Library | resources.libraries.python.Trace | Library | resources.libraries.python.NodePath | Force Tags | 3_NODE_DOUBLE_LINK_TOPO | HW_ENV | VM_ENV | VPP_VM_ENV @@ -52,7 +51,7 @@ | | ... | i/fs to be switched by DUT to and from VM; verify all packets | | ... | are received. [Ref] | | ... -| | [Teardown] | Run Keywords | Stop and clear QEMU | ${dut_node} | ${vm_node} +| | [Teardown] | Run Keywords | Stop and clear QEMU | ${dut_node} | | ... | AND | Tear down functional test | | ... | | Given Configure path in 2-node circular topology @@ -76,7 +75,7 @@ | | ... | be switched by DUT to and from VM; verify all packets are | | ... | received. [Ref] | | ... -| | [Teardown] | Run Keywords | Stop and clear QEMU | ${dut_node} | ${vm_node} +| | [Teardown] | Run Keywords | Stop and clear QEMU | ${dut_node} | | ... | AND | Tear down functional test | | ... | | Given Configure path in 2-node circular topology |