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 /resources/libraries/robot/shared | |
| 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 'resources/libraries/robot/shared')
| -rw-r--r-- | resources/libraries/robot/shared/default.robot | 24 |
1 files changed, 5 insertions, 19 deletions
diff --git a/resources/libraries/robot/shared/default.robot b/resources/libraries/robot/shared/default.robot index 91fde22038..6d99b959d3 100644 --- a/resources/libraries/robot/shared/default.robot +++ b/resources/libraries/robot/shared/default.robot @@ -33,7 +33,6 @@ | Library | resources.libraries.python.topology.Topology | ... | Resource | resources/libraries/robot/shared/container.robot -| Resource | resources/libraries/robot/vm/double_qemu_setup.robot | Resource | resources/libraries/robot/vm/qemu.robot *** Keywords *** @@ -518,22 +517,13 @@ | | [Documentation] | Common test teardown for functional tests with LISP and\ | | ... | QEMU. | | ... -| | ... | *Arguments:* -| | ... | - vm_node - VM to stop. Type: string -| | ... -| | ... | *Example:* -| | ... -| | ... | \| Tear down LISP functional test with QEMU \| ${vm_node} \| -| | ... -| | [Arguments] | ${vm_node} -| | ... | | Remove All Added Ports On All DUTs From Topology | ${nodes} | | Show Packet Trace on All DUTs | ${nodes} | | Show PAPI History On All DUTs | ${nodes} | | Show Vpp Settings | ${nodes['DUT1']} | | Show Vpp Settings | ${nodes['DUT2']} | | Vpp Show Errors On All DUTs | ${nodes} -| | Stop and clear QEMU | ${nodes['DUT1']} | ${vm_node} +| | Stop and clear QEMU | ${nodes['DUT1']} | | Verify VPP PID in Teardown | Set up TAP functional test @@ -609,21 +599,17 @@ | | ... | | ... | *Arguments:* | | ... | - dut1_node - Node Nr.1 where to clean qemu. Type: dictionary -| | ... | - qemu_node1 - VM Nr.1 node info dictionary. Type: string | | ... | - dut2_node - Node Nr.2 where to clean qemu. Type: dictionary -| | ... | - qemu_node2 - VM Nr.2 node info dictionary. Type: string | | ... | | ... | *Example:* | | ... -| | ... | \| Tear down FDS functional test \| ${dut1_node} \| ${qemu_node1}\ -| | ... | \| ${dut2_node} \| ${qemu_node2} \| +| | ... | \| Tear down FDS functional test \| ${dut1_node} \| ${dut2_node} \| | | ... -| | [Arguments] | ${dut1_node} | ${qemu_node1} | ${dut2_node} -| | ... | ${qemu_node2} +| | [Arguments] | ${dut1_node} | ${dut2_node} | | ... | | Tear down functional test -| | Tear down QEMU | ${dut1_node} | ${qemu_node1} | qemu_node1 -| | Tear down QEMU | ${dut2_node} | ${qemu_node2} | qemu_node2 +| | Tear down QEMU | ${dut1_node} | qemu_node1 +| | Tear down QEMU | ${dut2_node} | qemu_node2 | Tear down functional test with container | | [Documentation] |