X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=resources%2Flibraries%2Frobot%2Fbridge_domain.robot;h=5707a82ade058363e6ea130877f8945498ce8ff9;hp=ac0fea8bd4807a554a5d22d7d80e4500bd7efd55;hb=083f612d7c38df32acb0266f2ca2ed7a6ec5f7f3;hpb=2d7b6c3e4a8d62fb77134292e8b583aaea86dbd1

diff --git a/resources/libraries/robot/bridge_domain.robot b/resources/libraries/robot/bridge_domain.robot
index ac0fea8bd4..5707a82ade 100644
--- a/resources/libraries/robot/bridge_domain.robot
+++ b/resources/libraries/robot/bridge_domain.robot
@@ -16,7 +16,6 @@
 | Library | resources.libraries.python.InterfaceUtil
 | Library | resources.libraries.python.NodePath
 | Library | resources.libraries.python.VhostUser
-| Library | resources.libraries.python.QemuUtils
 | Resource | resources/libraries/robot/interfaces.robot
 | Resource | resources/libraries/robot/l2_traffic.robot
 
@@ -206,23 +205,38 @@
 | | [Documentation] | Setup QEMU and start VM with two vhost interfaces.
 | | ...
 | | ... | *Arguments:*
-| | ... | - ${node} - DUT node to start VM on. Type: dictionary
+| | ... | - ${dut_node} - DUT node to start VM on. Type: dictionary
 | | ... | - ${sock1} - Socket path for first Vhost-User interface. Type: string
 | | ... | - ${sock2} - Socket path for second Vhost-User interface. Type: string
+| | ... | - ${qemu_name} - Qemu instance name by which the object will be
+| | ... | accessed (Optional). Type: string
 | | ...
 | | ... | _NOTE:_ This KW sets following test case variable:
-| | ... | -${vm_node} - VM node info. Type: dictionary
+| | ... | - ${${qemu_name}} - VM node info. Type: dictionary
 | | ...
 | | ... | *Example:*
 | | ...
 | | ... | \| VM for Vhost L2BD forwarding is setup \| ${nodes['DUT1']} \
 | | ... | \| /tmp/sock1 \| /tmp/sock2 \|
-| | [Arguments] | ${node} | ${sock1} | ${sock2}
-| | Set Test Variable | ${vm_node} | ${None}
-| | Qemu Set Node | ${node}
-| | Qemu Add Vhost User If | ${sock1}
-| | Qemu Add Vhost User If | ${sock2}
-| | ${vm}= | Qemu Start
+| | ... | \| VM for Vhost L2BD forwarding is setup \| ${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}
+| | 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}
 | | ${br}= | Set Variable | br0
 | | ${vhost1}= | Get Vhost User If Name By Sock | ${vm} | ${sock1}
 | | ${vhost2}= | Get Vhost User If Name By Sock | ${vm} | ${sock2}
@@ -230,26 +244,36 @@
 | | Set Interface State | ${vm} | ${vhost1} | up | if_type=name
 | | Set Interface State | ${vm} | ${vhost2} | up | if_type=name
 | | Set Interface State | ${vm} | ${br} | up | if_type=name
-| | Set Test Variable | ${vm_node} | ${vm}
+| | Set Test Variable | ${${qemu_name}} | ${vm}
 
 | VPP Vhost interfaces for L2BD forwarding are setup
 | | [Documentation] | Create two Vhost-User interfaces on defined VPP node.
 | | ...
 | | ... | *Arguments:*
-| | ... | - ${node} - DUT node. Type: dictionary
+| | ... | - ${dut_node} - DUT node. Type: dictionary
 | | ... | - ${sock1} - Socket path for first Vhost-User interface. Type: string
 | | ... | - ${sock2} - Socket path for second Vhost-User interface. Type: string
+| | ... | - ${vhost_if1} - Name of the first Vhost-User interface (Optional).
+| | ... | Type: string
+| | ... | - ${vhost_if2} - Name of the second Vhost-User interface (Optional).
+| | ... | Type: string
 | | ...
 | | ... | _NOTE:_ This KW sets following test case variable:
-| | ... | - ${vhost_if1} - First Vhost-User interface.
-| | ... | - ${vhost_if2} - Second Vhost-User interface.
+| | ... | - ${${vhost_if1}} - First Vhost-User interface.
+| | ... | - ${${vhost_if2}} - Second Vhost-User interface.
 | | ...
 | | ... | *Example:*
 | | ...
 | | ... | \| VPP Vhost interfaces for L2BD forwarding are setup \
 | | ... | \| ${nodes['DUT1']} \| /tmp/sock1 \| /tmp/sock2 \|
-| | [Arguments] | ${node} | ${sock1} | ${sock2}
-| | ${vhost_if1}= | Vpp Create Vhost User Interface | ${node} | ${sock1}
-| | ${vhost_if2}= | Vpp Create Vhost User Interface | ${node} | ${sock2}
-| | Set Test Variable | ${vhost_if1}
-| | Set Test Variable | ${vhost_if2}
+| | ... | \| VPP Vhost interfaces for L2BD forwarding are setup \
+| | ... | \| ${nodes['DUT2']} \| /tmp/sock1 \| /tmp/sock2 \| dut2_vhost_if1 \
+| | ... | \| dut2_vhost_if2 \|
+| | [Arguments] | ${dut_node} | ${sock1} | ${sock2} | ${vhost_if1}=vhost_if1
+| | ... | ${vhost_if2}=vhost_if2
+| | ${vhost_1}= | Vpp Create Vhost User Interface | ${dut_node} | ${sock1}
+| | ${vhost_2}= | Vpp Create Vhost User Interface | ${dut_node} | ${sock2}
+| | Set Interface State | ${dut_node} | ${vhost_1} | up
+| | Set Interface State | ${dut_node} | ${vhost_2} | up
+| | Set Test Variable | ${${vhost_if1}} | ${vhost_1}
+| | Set Test Variable | ${${vhost_if2}} | ${vhost_2}