From 22417d56aa83eaced43c4ef4473e38a34fdb4dfa Mon Sep 17 00:00:00 2001 From: Peter Mikus Date: Fri, 8 Mar 2019 15:23:48 +0000 Subject: CSIT-1386 KernelVM - Part I - Refactor QemuUtils Full refactor of QemuUtils to prepare for thinner VMs. Change-Id: I171ba11a9e6e9faec582bd58df6819598b0ed0b5 Signed-off-by: Peter Mikus --- tests/vpp/func/vm_vhost/ip4/eth2p-ethip4-ip4base-eth-2vhost-1vm.robot | 3 +-- .../ip4/eth2p-ethip4ipsectptlispgpe-ip4base-eth-2vhost-1vm-func.robot | 4 +--- .../ip4/eth2p-ethip4ipsectptlispgpe-ip6base-eth-2vhost-1vm-func.robot | 4 +--- .../ip4/eth2p-ethip4lispgpe-ip4base-eth-2vhost-1vm-func.robot | 3 +-- .../ip4/eth2p-ethip4lispgpe-ip4basevrf-eth-2vhost-1vm-func.robot | 3 +-- .../ip4/eth2p-ethip4lispgpe-ip6base-eth-2vhost-1vm-func.robot | 3 +-- 6 files changed, 6 insertions(+), 14 deletions(-) (limited to 'tests/vpp/func/vm_vhost/ip4') 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* | ... -- cgit 1.2.3-korg