CSIT-562 HC Test: Persistence suite rework, part1

[csit.git] / resources / libraries / robot / double_qemu_setup.robot

diff --git a/resources/libraries/robot/double_qemu_setup.robot b/resources/libraries/robot/double_qemu_setup.robot
index 167605e..d8b32bd 100644 (file)
--- a/resources/libraries/robot/double_qemu_setup.robot
+++ b/resources/libraries/robot/double_qemu_setup.robot
@@ -10,6 +10,8 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+*** Settings ***
+| Library | resources.libraries.python.IPUtil
 
 *** Keywords ***
 | Setup QEMU Vhost and Run
@@ -56,10 +58,10 @@
 | | ${vhost2}= | Get Vhost User If Name By Sock | ${vm} | ${sock2}
 | | ${vhost3}= | Get Vhost User If Name By Sock | ${vm} | ${sock3}
 | | ${vhost4}= | Get Vhost User If Name By Sock | ${vm} | ${sock4}
-| | Set Interface State | ${vm} | ${vhost1} | up
-| | Set Interface State | ${vm} | ${vhost2} | up
-| | Set Interface State | ${vm} | ${vhost3} | up
-| | Set Interface State | ${vm} | ${vhost4} | up
+| | Set Interface State | ${vm} | ${vhost1} | up | if_type=name
+| | Set Interface State | ${vm} | ${vhost2} | up | if_type=name
+| | Set Interface State | ${vm} | ${vhost3} | up | if_type=name
+| | Set Interface State | ${vm} | ${vhost4} | up | if_type=name
 | | Setup Network Namespace
 | | ... | ${vm} | nmspace1 | ${vhost1} | ${ip1} | ${prefix_length}
 | | Setup Network Namespace
@@ -85,15 +87,9 @@
 | | ...
 | | [Arguments] | ${dut_node} | ${vm} | ${qemu_name}
 | | ${set_node}= | Replace Variables | ${qemu_name}.Qemu Set Node
-| | ${sys_status}= | Replace Variables | ${qemu_name}.Qemu System Status
 | | ${kill}= | Replace Variables | ${qemu_name}.Qemu Kill
-| | ${sys_pd}= | Replace Variables | ${qemu_name}.Qemu System Powerdown
-| | ${quit}= | Replace Variables | ${qemu_name}.Qemu Quit
 | | ${clear_socks}= | Replace Variables | ${qemu_name}.Qemu Clear Socks
 | | Run Keyword | ${set_node} | ${dut_node}
-| | ${status} | ${value}= | Run Keyword And Ignore Error | ${sys_status}
-| | Run Keyword If | "${status}" == "FAIL" | ${kill}
-| | ... | ELSE IF | "${value}" == "running" | ${sys_pd}
-| | ... | ELSE | ${quit}
+| | Run Keyword | ${kill}
 | | Run Keyword | ${clear_socks}
 | | Run Keyword If | ${vm} is not None | Disconnect | ${vm}