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 --- .../device/vm_vhost/ip4/eth2p-ethip4-ip4base-eth-2vhost-1vm-dev.robot | 3 +-- .../device/vm_vhost/ip6/eth2p-ethip6-ip6base-eth-2vhost-1vm-dev.robot | 3 +-- .../vm_vhost/l2bd/eth2p-eth-l2bdbasemaclrn-eth-2vhost-1vm-dev.robot | 3 +-- .../device/vm_vhost/l2xc/eth2p-eth-l2xcbase-eth-2vhost-1vm-dev.robot | 3 +-- 4 files changed, 4 insertions(+), 8 deletions(-) (limited to 'tests/vpp/device') 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 8c6a7fc8a8..50aa28215b 100644 --- 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 @@ -25,7 +25,6 @@ | 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 @@ -33,7 +32,7 @@ | Test Setup | Set up VPP device test | ... | Test Teardown | Run Keywords -| ... | Stop and clear QEMU | ${dut_node} | ${vm_node} +| ... | Stop and clear QEMU | ${dut_node} | ... | AND | Tear down VPP device test | ... | Documentation | *IPv4 routing test cases with vhost user interface* diff --git a/tests/vpp/device/vm_vhost/ip6/eth2p-ethip6-ip6base-eth-2vhost-1vm-dev.robot b/tests/vpp/device/vm_vhost/ip6/eth2p-ethip6-ip6base-eth-2vhost-1vm-dev.robot index 303d830b2d..91808fed7e 100644 --- a/tests/vpp/device/vm_vhost/ip6/eth2p-ethip6-ip6base-eth-2vhost-1vm-dev.robot +++ b/tests/vpp/device/vm_vhost/ip6/eth2p-ethip6-ip6base-eth-2vhost-1vm-dev.robot @@ -25,7 +25,6 @@ | 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 | IP6FWD | BASE | ETH | VHOST | 1VM @@ -33,7 +32,7 @@ | Test Setup | Set up VPP device test | ... | Test Teardown | Run Keywords -| ... | Stop and clear QEMU | ${dut_node} | ${vm_node} +| ... | Stop and clear QEMU | ${dut_node} | ... | AND | Tear down VPP device test | ... | Documentation | *IPv4 routing test cases with vhost user interface* diff --git a/tests/vpp/device/vm_vhost/l2bd/eth2p-eth-l2bdbasemaclrn-eth-2vhost-1vm-dev.robot b/tests/vpp/device/vm_vhost/l2bd/eth2p-eth-l2bdbasemaclrn-eth-2vhost-1vm-dev.robot index 7b7d3fbb78..e124675086 100644 --- a/tests/vpp/device/vm_vhost/l2bd/eth2p-eth-l2bdbasemaclrn-eth-2vhost-1vm-dev.robot +++ b/tests/vpp/device/vm_vhost/l2bd/eth2p-eth-l2bdbasemaclrn-eth-2vhost-1vm-dev.robot @@ -16,7 +16,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 | ... | Force Tags | 2_NODE_SINGLE_LINK_TOPO | DEVICETEST | HW_ENV | DCR_ENV | ... | FUNCTEST | L2BDMACLRN | BASE | ETH | VHOST | 1VM @@ -24,7 +23,7 @@ | Test Setup | Set up VPP device test | ... | Test Teardown | Run Keywords -| ... | Stop and clear QEMU | ${dut_node} | ${vm_node} +| ... | Stop and clear QEMU | ${dut_node} | ... | AND | Tear down VPP device test | ... | Documentation | *L2 bridge-domain test cases with vhost user interface* diff --git a/tests/vpp/device/vm_vhost/l2xc/eth2p-eth-l2xcbase-eth-2vhost-1vm-dev.robot b/tests/vpp/device/vm_vhost/l2xc/eth2p-eth-l2xcbase-eth-2vhost-1vm-dev.robot index 3c7113601e..91b8d58e75 100644 --- a/tests/vpp/device/vm_vhost/l2xc/eth2p-eth-l2xcbase-eth-2vhost-1vm-dev.robot +++ b/tests/vpp/device/vm_vhost/l2xc/eth2p-eth-l2xcbase-eth-2vhost-1vm-dev.robot @@ -20,7 +20,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 | ... | Force Tags | 2_NODE_SINGLE_LINK_TOPO | DEVICETEST | HW_ENV | DCR_ENV | ... | FUNCTEST | L2XCFWD | BASE | ETH | VHOST | 1VM @@ -28,7 +27,7 @@ | Test Setup | Set up VPP device test | ... | Test Teardown | Run Keywords -| ... | Stop and clear QEMU | ${dut_node} | ${vm_node} +| ... | Stop and clear QEMU | ${dut_node} | ... | AND | Tear down VPP device test | ... | Documentation | *L2 cross-connect test cases with vhost user interface* -- cgit 1.2.3-korg