X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=resources%2Flibraries%2Frobot%2Fbridge_domain.robot;h=ac0fea8bd4807a554a5d22d7d80e4500bd7efd55;hp=e31a3bff055dfa552e099086b1e74cb039a147ca;hb=cbd47fbe97945e9dc6584d08cd2266e3a7536a68;hpb=9cd535ec0701d5ba87a781d361b08eb0a0446789 diff --git a/resources/libraries/robot/bridge_domain.robot b/resources/libraries/robot/bridge_domain.robot index e31a3bff05..ac0fea8bd4 100644 --- a/resources/libraries/robot/bridge_domain.robot +++ b/resources/libraries/robot/bridge_domain.robot @@ -21,43 +21,6 @@ | Resource | resources/libraries/robot/l2_traffic.robot *** Keywords *** -| Path for 2-node BD testing is set -| | [Documentation] | Compute path for bridge domain testing on two given nodes -| | ... | and set corresponding test case variables. -| | ... -| | ... | *Arguments:* -| | ... | - ${tg_node} - TG node. Type: dictionary -| | ... | - ${dut_node} - DUT node. Type: dictionary -| | ... -| | ... | *Return:* -| | ... | - No value returned -| | ... -| | ... | _NOTE:_ This KW sets following test case variables: -| | ... | - ${tg_node} - TG node. -| | ... | - ${tg_to_dut_if1} - 1st TG interface towards DUT. -| | ... | - ${tg_to_dut_if2} - 2nd TG interface towards DUT. -| | ... | - ${dut_node} - DUT node. -| | ... | - ${dut_to_tg_if1} - 1st DUT interface towards TG. -| | ... | - ${dut_to_tg_if2} - 2nd DUT interface towards TG. -| | ... -| | ... | *Example:* -| | ... -| | ... | \| Given Path for 2-node BD testing is set \| ${nodes['TG']} \ -| | ... | \| ${nodes['DUT1']} \| -| | [Arguments] | ${tg_node} | ${dut_node} -| | Append Nodes | ${tg_node} | ${dut_node} | ${tg_node} -| | Compute Path | always_same_link=${FALSE} -| | ${tg_to_dut_if1} | ${tmp}= | First Interface -| | ${tg_to_dut_if2} | ${tmp}= | Last Interface -| | ${dut_to_tg_if1} | ${tmp}= | First Ingress Interface -| | ${dut_to_tg_if2} | ${tmp}= | Last Egress Interface -| | Set Test Variable | ${tg_to_dut_if1} -| | Set Test Variable | ${tg_to_dut_if2} -| | Set Test Variable | ${dut_to_tg_if1} -| | Set Test Variable | ${dut_to_tg_if2} -| | Set Test Variable | ${tg_node} -| | Set Test Variable | ${dut_node} - | Vpp l2bd forwarding setup | | [Documentation] | Setup BD between 2 interfaces on VPP node and if learning | | ... | is off set static L2FIB entry on second interface @@ -69,9 +32,11 @@ | | ... | Vpp Add L2fib Entry | ${node} | ${mac} | ${if2} | ${1} | | All Vpp Interfaces Ready Wait | ${nodes} -| Path for 3-node BD testing is set -| | [Documentation] | Compute path for bridge domain testing on three given -| | ... | nodes and set corresponding test case variables. +| Path for 3-node BD-SHG testing is set +| | [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 +| | ... | and set corresponding test case variables. | | ... | | ... | *Arguments:* | | ... | - ${tg_node} - TG node. Type: dictionary @@ -80,41 +45,95 @@ | | ... | | ... | *Return:* | | ... | - No value returned -| | ... | +| | ... | | ... | _NOTE:_ This KW sets following test case variables: | | ... | - ${tg_node} - TG node. -| | ... | - ${tg_to_dut1} - TG interface towards DUT1. -| | ... | - ${tg_to_dut2} - TG interface towards DUT2. +| | ... | - ${tg_to_dut1_if1} - TG interface 1 towards DUT1. +| | ... | - ${tg_to_dut1_if2} - TG interface 2 towards DUT1. +| | ... | - ${tg_to_dut2_if1} - TG interface 1 towards DUT2. +| | ... | - ${tg_to_dut2_if2} - TG interface 2 towards DUT2. | | ... | - ${dut1_node} - DUT1 node. -| | ... | - ${dut1_to_tg} - DUT1 interface towards TG. +| | ... | - ${dut1_to_tg_if1} - DUT1 interface 1 towards TG. +| | ... | - ${dut1_to_tg_if2} - DUT1 interface 2 towards TG. | | ... | - ${dut1_to_dut2} - DUT1 interface towards DUT2. | | ... | - ${dut2_node} - DUT2 node. -| | ... | - ${dut2_to_tg} - DUT2 interface towards TG. +| | ... | - ${dut2_to_tg_if1} - DUT2 interface 1 towards TG. +| | ... | - ${dut2_to_tg_if2} - DUT2 interface 2 towards TG. | | ... | - ${dut2_to_dut1} - DUT2 interface towards DUT1. | | ... | | ... | *Example:* | | ... -| | ... | \| Given Path for 3-node BD testing is set \| ${nodes['TG']} \ +| | ... | \| Given Path for 3-node BD-SHG testing is set \| ${nodes['TG']} \ | | ... | \| ${nodes['DUT1']} \| ${nodes['DUT2']} \| | | [Arguments] | ${tg_node} | ${dut1_node} | ${dut2_node} -| | Append Nodes | ${tg_node} | ${dut1_node} | ${dut2_node} | ${tg_node} +| | # Compute path TG - DUT1 with two links in between +| | Append Nodes | ${tg_node} | ${dut1_node} | ${tg_node} +| | Compute Path | always_same_link=${FALSE} +| | ${tg_to_dut1_if1} | ${tmp}= | First Interface +| | ${tg_to_dut1_if2} | ${tmp}= | Last Interface +| | ${dut1_to_tg_if1} | ${tmp}= | First Ingress Interface +| | ${dut1_to_tg_if2} | ${tmp}= | Last Egress Interface +| | # Compute path TG - DUT2 with two links in between +| | Clear Path +| | Append Nodes | ${tg_node} | ${dut2_node} | ${tg_node} +| | Compute Path | always_same_link=${FALSE} +| | ${tg_to_dut2_if1} | ${tmp}= | First Interface +| | ${tg_to_dut2_if2} | ${tmp}= | Last Interface +| | ${dut2_to_tg_if1} | ${tmp}= | First Ingress Interface +| | ${dut2_to_tg_if2} | ${tmp}= | Last Egress Interface +| | # Compute path DUT1 - DUT2 with one link in between +| | Clear Path +| | Append Nodes | ${dut1_node} | ${dut2_node} | | Compute Path -| | ${tg_to_dut1} | ${tmp}= | Next Interface -| | ${dut1_to_tg} | ${tmp}= | Next Interface | | ${dut1_to_dut2} | ${tmp}= | Next Interface | | ${dut2_to_dut1} | ${tmp}= | Next Interface -| | ${dut2_to_tg} | ${tmp}= | Next Interface -| | ${tg_to_dut2} | ${tmp}= | Next Interface -| | Set Test Variable | ${tg_to_dut1} -| | Set Test Variable | ${dut1_to_tg} -| | Set Test Variable | ${tg_to_dut2} -| | Set Test Variable | ${dut2_to_tg} +| | # Set test variables +| | Set Test Variable | ${tg_to_dut1_if1} +| | Set Test Variable | ${tg_to_dut1_if2} +| | Set Test Variable | ${tg_to_dut2_if1} +| | Set Test Variable | ${tg_to_dut2_if2} +| | Set Test Variable | ${dut1_to_tg_if1} +| | Set Test Variable | ${dut1_to_tg_if2} +| | Set Test Variable | ${dut2_to_tg_if1} +| | Set Test Variable | ${dut2_to_tg_if2} | | Set Test Variable | ${dut1_to_dut2} | | Set Test Variable | ${dut2_to_dut1} | | Set Test Variable | ${tg_node} | | Set Test Variable | ${dut1_node} | | Set Test Variable | ${dut2_node} +| Interfaces in 3-node BD-SHG testing are up +| | [Documentation] | Set UP state on interfaces in 3-node path on nodes and +| | ... | wait for all interfaces are ready. +| | ... +| | ... | *Arguments:* +| | ... | - No arguments. +| | ... +| | ... | *Return:* +| | ... | - No value returned. +| | ... +| | ... | _NOTE:_ This KW uses test variables sets in +| | ... | "Path for 3-node BD-SHG testing is set" KW. +| | ... +| | ... | *Example:* +| | ... +| | ... | \| Path for 3-node BD-SHG testing is set \| ${nodes['TG']} \ +| | ... | \| ${nodes['DUT1']} \| ${nodes['DUT2']} \| +| | ... | \| Interfaces in 3-node BD-SHG testing are up \| +| | ... +| | Set Interface State | ${tg_node} | ${tg_to_dut1_if1} | up +| | Set Interface State | ${tg_node} | ${tg_to_dut1_if2} | up +| | Set Interface State | ${tg_node} | ${tg_to_dut2_if1} | up +| | Set Interface State | ${tg_node} | ${tg_to_dut2_if2} | up +| | Set Interface State | ${dut1_node} | ${dut1_to_tg_if1} | up +| | Set Interface State | ${dut1_node} | ${dut1_to_tg_if2} | up +| | Set Interface State | ${dut2_node} | ${dut2_to_tg_if1} | up +| | Set Interface State | ${dut2_node} | ${dut2_to_tg_if2} | up +| | Set Interface State | ${dut1_node} | ${dut1_to_dut2} | up +| | Set Interface State | ${dut2_node} | ${dut2_to_dut1} | up +| | Vpp Node Interfaces Ready Wait | ${dut1_node} +| | Vpp Node Interfaces Ready Wait | ${dut2_node} + | Bridge domain on DUT node is created | | [Documentation] | Create bridge domain on given VPP node with defined | | ... | learning status. @@ -146,6 +165,7 @@ | | ... | - ${dut_node} - DUT node. Type: dictionary | | ... | - ${dut_if} - DUT node interface name. Type: string | | ... | - ${bd_id} - Bridge domain ID. Type: integer +| | ... | - ${shg} - Split-horizon group ID. Type: integer, default value: 0 | | ... | | ... | *Return:* | | ... | - No value returned @@ -154,9 +174,9 @@ | | ... | | ... | \| Interface is added to bridge domain \| ${nodes['DUT2']} \ | | ... | \| GigabitEthernet0/8/0 \| 3 \| -| | [Arguments] | ${dut_node} | ${dut_if} | ${bd_id} +| | [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} +| | Add Interface To L2 BD | ${dut_node} | ${dut_if} | ${bd_id} | ${shg} | Destination port is added to L2FIB on DUT node | | [Documentation] | Create a static L2FIB entry for required destination port @@ -196,7 +216,7 @@ | | ... | *Example:* | | ... | | ... | \| VM for Vhost L2BD forwarding is setup \| ${nodes['DUT1']} \ -| | ... | \| /tmp/sock1 \| /tmp/sock2 +| | ... | \| /tmp/sock1 \| /tmp/sock2 \| | | [Arguments] | ${node} | ${sock1} | ${sock2} | | Set Test Variable | ${vm_node} | ${None} | | Qemu Set Node | ${node} @@ -207,9 +227,9 @@ | | ${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 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} | VPP Vhost interfaces for L2BD forwarding are setup @@ -227,7 +247,7 @@ | | ... | *Example:* | | ... | | ... | \| VPP Vhost interfaces for L2BD forwarding are setup \ -| | ... | \| ${nodes['DUT1']} \| /tmp/sock1 \| /tmp/sock2 +| | ... | \| ${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}