X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=resources%2Flibraries%2Frobot%2Fbridge_domain.robot;h=22e46a02cbdf71681bc7f130d1b37b4a08affa4b;hb=45aa8056fd26ea55e3e229c4d5b164a272a5b3c2;hp=f1458a0023cb600fe56eb902d55b2850de9ce761;hpb=7dbda72563912b656bde2ee4b4611a0b284b933e;p=csit.git

diff --git a/resources/libraries/robot/bridge_domain.robot b/resources/libraries/robot/bridge_domain.robot
index f1458a0023..22e46a02cb 100644
--- a/resources/libraries/robot/bridge_domain.robot
+++ b/resources/libraries/robot/bridge_domain.robot
@@ -16,12 +16,11 @@
 | 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
 
 *** Keywords ***
-| Vpp l2bd forwarding setup
+| Configure L2BD forwarding
 | | [Documentation] | Setup BD between 2 interfaces on VPP node and if learning
 | | ...             | is off set static L2FIB entry on second interface
 | | [Arguments] | ${node} | ${if1} | ${if2} | ${learn}=${TRUE} | ${mac}=${EMPTY}
@@ -32,7 +31,7 @@
 | | ... | Vpp Add L2fib Entry | ${node} | ${mac} | ${if2} | ${1}
 | | All Vpp Interfaces Ready Wait | ${nodes}
 
-| Path for 3-node BD-SHG testing is set
+| Configure path for 3-node BD-SHG test
 | | [Documentation] | Compute path for bridge domain split-horizon group testing
 | | ...             | on three given nodes with following interconnections
 | | ...             | TG - (2 links) - DUT1 - (1 link) - DUT2 - (2 links) - TG
@@ -63,7 +62,7 @@
 | | ...
 | | ... | *Example:*
 | | ...
-| | ... | \| Given Path for 3-node BD-SHG testing is set \| ${nodes['TG']} \
+| | ... | \| Given Configure path for 3-node BD-SHG test \| ${nodes['TG']} \
 | | ... | \| ${nodes['DUT1']} \| ${nodes['DUT2']} \|
 | | [Arguments] | ${tg_node} | ${dut1_node} | ${dut2_node}
 | | # Compute path TG - DUT1 with two links in between
@@ -102,7 +101,7 @@
 | | Set Test Variable | ${dut1_node}
 | | Set Test Variable | ${dut2_node}
 
-| Interfaces in 3-node BD-SHG testing are up
+| Set interfaces in 3-node BD-SHG test up
 | | [Documentation] | Set UP state on interfaces in 3-node path on nodes and
 | | ...             | wait for all interfaces are ready.
 | | ...
@@ -113,13 +112,13 @@
 | | ... | - No value returned.
 | | ...
 | | ... | _NOTE:_ This KW uses test variables sets in
-| | ... |         "Path for 3-node BD-SHG testing is set" KW.
+| | ... |         "Configure path for 3-node BD-SHG test" KW.
 | | ...
 | | ... | *Example:*
 | | ...
-| | ... | \| Path for 3-node BD-SHG testing is set \| ${nodes['TG']} \
+| | ... | \| Configure path for 3-node BD-SHG test \| ${nodes['TG']} \
 | | ... | \| ${nodes['DUT1']} \| ${nodes['DUT2']} \|
-| | ... | \| Interfaces in 3-node BD-SHG testing are up \|
+| | ... | \| Set interfaces in 3-node BD-SHG test up \|
 | | ...
 | | Set Interface State | ${tg_node} | ${tg_to_dut1_if1} | up
 | | Set Interface State | ${tg_node} | ${tg_to_dut1_if2} | up
@@ -134,7 +133,7 @@
 | | Vpp Node Interfaces Ready Wait | ${dut1_node}
 | | Vpp Node Interfaces Ready Wait | ${dut2_node}
 
-| Bridge domain on DUT node is created
+| Create bridge domain
 | | [Documentation] | Create bridge domain on given VPP node with defined
 | | ...             | learning status.
 | | ...
@@ -149,14 +148,14 @@
 | | ...
 | | ... | *Example:*
 | | ...
-| | ... | \| Bridge domain on DUT node is created \| ${nodes['DUT1']} \| 2 \|
-| | ... | \| Bridge domain on DUT node is created \| ${nodes['DUT1']} \| 5 \
+| | ... | \| Create bridge domain \| ${nodes['DUT1']} \| 2 \|
+| | ... | \| Create bridge domain \| ${nodes['DUT1']} \| 5 \
 | | ... | \| learn=${FALSE} \|
 | | [Arguments] | ${dut_node} | ${bd_id} | ${learn}=${TRUE}
 | | ${learn} = | Set Variable If | ${learn} == ${TRUE} | ${1} | ${0}
 | | Create L2 BD | ${dut_node} | ${bd_id} | learn=${learn}
 
-| Interface is added to bridge domain
+| Add interface to bridge domain
 | | [Documentation] | Set given interface admin state to up and add this
 | | ...             | interface to required L2 bridge domain on defined
 | | ...             | VPP node.
@@ -172,13 +171,13 @@
 | | ...
 | | ... | *Example:*
 | | ...
-| | ... | \| Interface is added to bridge domain \| ${nodes['DUT2']} \
+| | ... | \| Add interface to bridge domain \| ${nodes['DUT2']} \
 | | ... | \| GigabitEthernet0/8/0 \| 3 \|
 | | [Arguments] | ${dut_node} | ${dut_if} | ${bd_id} | ${shg}=0
 | | Set Interface State | ${dut_node} | ${dut_if} | up
 | | Add Interface To L2 BD | ${dut_node} | ${dut_if} | ${bd_id} | ${shg}
 
-| Destination port is added to L2FIB on DUT node
+| Add destination port to L2FIB
 | | [Documentation] | Create a static L2FIB entry for required destination port
 | | ...             | on defined interface and bridge domain ID
 | | ...             | of the given VPP node.
@@ -195,61 +194,86 @@
 | | ...
 | | ... | *Example:*
 | | ...
-| | ... | \| Destination port is added to L2FIB on DUT node \| ${nodes['TG']} \
+| | ... | \| Add destination port to L2FIB \| ${nodes['TG']} \
 | | ... | \| eth1 \| ${nodes['DUT2']} \| GigabitEthernet0/8/0 \| 3 \|
 | | [Arguments] | ${dest_node} | ${dest_node_if} | ${vpp_node}
 | | ...         | ${vpp_node_if} | ${bd_id}
 | | ${mac}= | Get Interface Mac | ${dest_node} | ${dest_node_if}
 | | Vpp Add L2fib Entry | ${vpp_node} | ${mac} | ${vpp_node_if} | ${bd_id}
 
-| VM for Vhost L2BD forwarding is setup
+| Configure VM for vhost L2BD forwarding
 | | [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
+| | ... | \| Configure VM for vhost L2BD forwarding \| ${nodes['DUT1']} \
+| | ... | \| /tmp/sock1 \| /tmp/sock2 \|
+| | ... | \| 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}
+| | 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}
 | | Linux Add Bridge | ${vm} | ${br} | ${vhost1} | ${vhost2}
-| | Set Interface State | ${vm} | ${vhost1} | up
-| | Set Interface State | ${vm} | ${vhost2} | up
-| | Set Interface State | ${vm} | ${br} | up
-| | Set Test Variable | ${vm_node} | ${vm}
+| | 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 | ${${qemu_name}} | ${vm}
 
-| VPP Vhost interfaces for L2BD forwarding are setup
+| Configure vhost interfaces for L2BD forwarding
 | | [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}
+| | ... | \| Configure vhost interfaces for L2BD forwarding \
+| | ... | \| ${nodes['DUT1']} \| /tmp/sock1 \| /tmp/sock2 \|
+| | ... | \| Configure vhost interfaces for L2BD forwarding \
+| | ... | \| ${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}