diff options
| author |   Peter Mikus <pmikus@cisco.com> | 2019-03-20 13:21:26 +0000 |
|---|---|---|
| committer | Peter Mikus <pmikus@cisco.com> | 2019-03-21 10:58:14 +0000 |
| commit | c8b5a89276f6c10a2d8ca9858f426a6089ac08e3 (patch) | |
| tree | 1c22c7c6976d7e6a36bb4d31f53c80e64140dda4 /resources/libraries/robot/l2 | |
| parent | 42b6f3b341d23f43fd0459a755c4650a574cb3b6 (diff) | |
Convert functional tests to statefull QemuUtils
Change-Id: Ia1b9120c45733db64dc2dc8b03cff5ef5f167548
Signed-off-by: Peter Mikus <pmikus@cisco.com>
Diffstat (limited to 'resources/libraries/robot/l2')
| -rw-r--r-- | resources/libraries/robot/l2/l2_bridge_domain.robot | 20 |
1 files changed, 5 insertions, 15 deletions
diff --git a/resources/libraries/robot/l2/l2_bridge_domain.robot b/resources/libraries/robot/l2/l2_bridge_domain.robot index 3d6f48328b..b69d449a10 100644 --- a/resources/libraries/robot/l2/l2_bridge_domain.robot +++ b/resources/libraries/robot/l2/l2_bridge_domain.robot @@ -222,22 +222,12 @@ | | ... | \| Configure VM for vhost L2BD forwarding \| ${nodes['DUT2']} \ | | ... | \| /tmp/sock1 \| /tmp/sock2 \| qemu_instance_2 \| | | [Arguments] | ${dut_node} | ${sock1} | ${sock2} | ${qemu_name}=vm_node -| | Run Keyword Unless | "${qemu_name}" == "vm_node" | Import Library -| | ... | resources.libraries.python.QemuUtils | WITH NAME | ${qemu_name} +| | Import Library | resources.libraries.python.QemuUtils | node=${dut_node} | +| | ... | WITH NAME | ${qemu_name} | | Set Test Variable | ${${qemu_name}} | ${None} -| | ${qemu_set_node}= | Run Keyword If | "${qemu_name}" == "vm_node" -| | | ... | Set Variable | Qemu Set Node -| | ... | ELSE | Replace Variables | ${qemu_name}.Qemu Set Node -| | Run keyword | ${qemu_set_node} | ${dut_node} -| | ${qemu_add_vhost}= | Run Keyword If | "${qemu_name}" == "vm_node" -| | | ... | Set Variable | Qemu Add Vhost User If -| | ... | ELSE | Replace Variables | ${qemu_name}.Qemu Add Vhost User If -| | Run keyword | ${qemu_add_vhost} | ${sock1} -| | Run keyword | ${qemu_add_vhost} | ${sock2} -| | ${qemu_start}= | Run Keyword If | "${qemu_name}" == "vm_node" -| | | ... | Set Variable | Qemu Start -| | ... | ELSE | Replace Variables | ${qemu_name}.Qemu Start -| | ${vm}= | Run keyword | ${qemu_start} +| | Run Keyword | ${qemu_name}.Qemu Add Vhost User If | ${sock1} +| | Run Keyword | ${qemu_name}.Qemu Add Vhost User If | ${sock2} +| | ${vm}= | Run keyword | ${qemu_name}.Qemu Start | | ${br}= | Set Variable | br0 | | ${vhost1}= | Get Vhost User If Name By Sock | ${vm} | ${sock1} | | ${vhost2}= | Get Vhost User If Name By Sock | ${vm} | ${sock2} |