aboutsummaryrefslogtreecommitdiffstats
path: root/resources/libraries/robot/vm
diff options
context:
space:
mode:
authorPeter Mikus <pmikus@cisco.com>2019-03-20 13:21:26 +0000
committerPeter Mikus <pmikus@cisco.com>2019-03-21 10:58:14 +0000
commitc8b5a89276f6c10a2d8ca9858f426a6089ac08e3 (patch)
tree1c22c7c6976d7e6a36bb4d31f53c80e64140dda4 /resources/libraries/robot/vm
parent42b6f3b341d23f43fd0459a755c4650a574cb3b6 (diff)
Convert functional tests to statefull QemuUtils
Change-Id: Ia1b9120c45733db64dc2dc8b03cff5ef5f167548 Signed-off-by: Peter Mikus <pmikus@cisco.com>
Diffstat (limited to 'resources/libraries/robot/vm')
-rw-r--r--resources/libraries/robot/vm/qemu.robot27
1 files changed, 4 insertions, 23 deletions
diff --git a/resources/libraries/robot/vm/qemu.robot b/resources/libraries/robot/vm/qemu.robot
index 528b7fbe8c..765a6cf398 100644
--- a/resources/libraries/robot/vm/qemu.robot
+++ b/resources/libraries/robot/vm/qemu.robot
@@ -12,7 +12,6 @@
# limitations under the License.
*** Settings ***
| Library | resources.libraries.python.IPUtil
-| Library | resources.libraries.python.QemuUtils
*** Keywords ***
| Configure QEMU vhost and run it
@@ -44,7 +43,7 @@
| | ...
| | [Arguments] | ${dut_node} | ${sock1} | ${sock2} | ${sock3} | ${sock4}
| | ... | ${ip1} | ${ip2} | ${ip3} | ${ip4} | ${prefix_length}
-| | ... | ${qemu_name} | ${mac_ID}=${None}
+| | ... | ${qemu_name}=vm_node | ${mac_ID}=${None}
| | ...
| | Import Library | resources.libraries.python.QemuUtils \
| | ... | node=${dut_node} | WITH NAME | ${qemu_name}
@@ -73,33 +72,15 @@
| Tear down QEMU
| | [Documentation]
-| | ... | Stop specific qemu instance running on ${dut_node}.
+| | ... | Stop specific qemu instance running on DUT.
| | ...
| | ... | *Arguments:*
-| | ... | - dut_node - Node where to clean qemu. Type: dict
| | ... | - qemu_name - Qemu instance by name. Type: string
| | ...
| | ... | *Example:*
| | ...
-| | ... | \| Tear down QEMU \| ${node['DUT1']} \| qemu_node_1 \|
+| | ... | \| Tear down QEMU \| qemu_node_1 \|
| | ...
-| | [Arguments] | ${dut_node} | ${qemu_name}
+| | [Arguments] | ${qemu_name}=vm_node
| | ...
-| | Run Keyword | ${qemu_name}.Qemu Set Node | ${dut_node}
| | Run Keyword | ${qemu_name}.Qemu Kill
-
-| Stop and clear QEMU
-| | [Documentation]
-| | ... | Stop QEMU, clear used sockets running on ${dut}.
-| | ...
-| | ... | *Arguments:*
-| | ... | - dut_node - Node where to clean qemu. Type: dict
-| | ...
-| | ... | *Example:*
-| | ...
-| | ... | \| Tear down QEMU \| ${node['DUT1']} \|
-| | ...
-| | [Arguments] | ${dut}
-| | ...
-| | Qemu Set Node | ${dut}
-| | Qemu Kill