diff options
Diffstat (limited to 'resources/libraries/robot/l2')
| -rw-r--r-- | resources/libraries/robot/l2/l2_bridge_domain.robot | 312 | ||||
| -rw-r--r-- | resources/libraries/robot/l2/l2_patch.robot | 2 | ||||
| -rw-r--r-- | resources/libraries/robot/l2/l2_traffic.robot | 86 | ||||
| -rw-r--r-- | resources/libraries/robot/l2/l2_xconnect.robot | 125 | ||||
| -rw-r--r-- | resources/libraries/robot/l2/tagging.robot | 36 |
5 files changed, 273 insertions, 288 deletions
diff --git a/resources/libraries/robot/l2/l2_bridge_domain.robot b/resources/libraries/robot/l2/l2_bridge_domain.robot index 6c16ed447f..a85cb70ab9 100644 --- a/resources/libraries/robot/l2/l2_bridge_domain.robot +++ b/resources/libraries/robot/l2/l2_bridge_domain.robot @@ -21,28 +21,29 @@ *** Keywords *** | Show Bridge Domain Data On All DUTs | | [Documentation] | Show Bridge Domain data on all DUTs. -| | ... -| | :FOR | ${dut} | IN | @{duts} +| | +| | FOR | ${dut} | IN | @{duts} | | | VPP Get Bridge Domain Data | ${nodes['${dut}']} +| | END | Create bridge domain | | [Documentation] | | ... | Create bridge domain on given VPP node with defined learning status. -| | ... +| | | | ... | *Arguments:* | | ... | - ${dut_node} - DUT node. Type: dictionary | | ... | - ${bd_id} - Bridge domain ID. Type: integer | | ... | - ${learn} - Enable/disable MAC learn. Type: boolean, \ | | ... | default value: ${TRUE} -| | ... +| | | | ... | *Example:* -| | ... +| | | | ... | \| 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} @@ -50,20 +51,20 @@ | | [Documentation] | | ... | Set given interface admin state to up and add this | | ... | interface to required L2 bridge domain on defined VPP node. -| | ... +| | | | ... | *Arguments:* | | ... | - ${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 -| | ... +| | | | ... | *Example:* -| | ... +| | | | ... | \| 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} @@ -72,41 +73,43 @@ | | ... | Setup L2 bridge domain topology by adding two interfaces on DUT into | | ... | separate bridge domains that are created automatically starting with | | ... | index 1. Learning is enabled. Interfaces are brought up. -| | ... +| | | | ... | *Arguments:* | | ... | - dut - DUT node. Type: string | | ... | - count - Number of bridge domains interfaces. Type: integer -| | ... +| | | | ... | *Example:* -| | ... +| | | | ... | \| Initialize L2 bridge domain on node \| DUT1 \| 1 \| -| | ... +| | | | [Arguments] | ${dut} | ${count}=${1} -| | ... -| | :FOR | ${id} | IN RANGE | 1 | ${count} + 1 +| | +| | FOR | ${id} | IN RANGE | 1 | ${count} + 1 | | | ${dut_str}= | Convert To Lowercase | ${dut} | | | Add Interface To L2 BD | | | ... | ${nodes['${dut}']} | ${${dut_str}_${prev_layer}_${id}_1} | ${id} | | | Add Interface To L2 BD | | | ... | ${nodes['${dut}']} | ${${dut_str}_${prev_layer}_${id}_2} | ${id} +| | END | Initialize L2 bridge domain | | [Documentation] | | ... | Setup L2 bridge domain topology by adding two interfaces on each DUT | | ... | into separate bridge domains that are created automatically starting | | ... | with index 1. Learning is enabled. Interfaces are brought up. -| | ... +| | | | ... | *Arguments:* | | ... | - count - Number of bridge domains. Type: integer -| | ... +| | | | ... | *Example:* -| | ... +| | | | ... | \| Initialize L2 bridge domain \| 1 \| -| | ... +| | | | [Arguments] | ${count}=${1} -| | ... -| | :FOR | ${dut} | IN | @{duts} +| | +| | FOR | ${dut} | IN | @{duts} | | | Initialize L2 bridge domain on node | ${dut} | count=${count} +| | END | Initialize L2 bridge domains with Vhost-User on node | | [Documentation] @@ -114,24 +117,24 @@ | | ... | defined VPP node. Add each Vhost-User interface into L2 bridge | | ... | domains with learning enabled with physical inteface or Vhost-User | | ... | interface of another VM. -| | ... +| | | | ... | *Arguments:* | | ... | - dut - DUT node. Type: string | | ... | - nf_chain - NF chain. Type: integer | | ... | - nf_nodes - Number of NFs nodes per chain. Type: integer -| | ... +| | | | ... | *Note:* | | ... | Socket paths for VM are defined in following format: | | ... | - /var/run/vpp/sock-\${VM_ID}-1 | | ... | - /var/run/vpp/sock-\${VM_ID}-2 -| | ... +| | | | ... | *Example:* -| | ... +| | | | ... | \| Initialize L2 bridge domains with Vhost-User on node \| DUT1 \ | | ... | \| 1 \| 1 \| -| | ... +| | | | [Arguments] | ${dut} | ${nf_chain}=${1} | ${nf_nodes}=${1} -| | ... +| | | | ${bd_id1}= | Evaluate | ${nf_nodes} * (${nf_chain} - 1) + ${nf_chain} | | ${bd_id2}= | Evaluate | ${nf_nodes} * ${nf_chain} + ${nf_chain} | | ${dut_str}= | Convert To Lowercase | ${dut} @@ -141,7 +144,7 @@ | | Add interface to bridge domain | | ... | ${nodes['${dut}']} | ${${dut_str}_${prev_layer}_${nf_chain}_2} | | ... | ${bd_id2} -| | :FOR | ${nf_node} | IN RANGE | 1 | ${nf_nodes} + 1 +| | FOR | ${nf_node} | IN RANGE | 1 | ${nf_nodes} + 1 | | | ${qemu_id}= | Evaluate | (${nf_chain} - ${1}) * ${nf_nodes} + ${nf_node} | | | Configure vhost interfaces | | | ... | ${nodes['${dut}']} @@ -153,6 +156,7 @@ | | | ... | ${nodes['${dut}']} | ${${dut}-vhost-${qemu_id}-if1} | ${bd_id1} | | | Add interface to bridge domain | | | ... | ${nodes['${dut}']} | ${${dut}-vhost-${qemu_id}-if2} | ${bd_id2} +| | END | Initialize L2 bridge domains with Vhost-User | | [Documentation] @@ -160,20 +164,21 @@ | | ... | on all defined VPP nodes. Add each Vhost-User interface into L2 bridge | | ... | domains with learning enabled with physical inteface or Vhost-User | | ... | interface of another VM. -| | ... +| | | | ... | *Arguments:* | | ... | - nf_chain - NF chain. Type: integer | | ... | - nf_nodes - Number of NFs nodes per chain. Type: integer -| | ... +| | | | ... | *Example:* -| | ... +| | | | ... | \| Initialize L2 bridge domains with Vhost-User \| 1 \| 1 \| -| | ... +| | | | [Arguments] | ${nf_chain}=${1} | ${nf_nodes}=${1} -| | ... -| | :FOR | ${dut} | IN | @{duts} +| | +| | FOR | ${dut} | IN | @{duts} | | | Initialize L2 bridge domains with Vhost-User on node | | | ... | ${dut} | nf_chain=${nf_chain} | nf_nodes=${nf_nodes} +| | END | Initialize L2 bridge domains for multiple chains with Vhost-User | | [Documentation] @@ -182,24 +187,25 @@ | | ... | Vhost-User interface into L2 bridge domains with learning enabled | | ... | with physical inteface or Vhost-User interface of another VM. | | ... | Put all interfaces in path up. -| | ... +| | | | ... | *Arguments:* | | ... | - nf_chains - Number of chains of NFs. Type: integer | | ... | - nf_nodes - Number of NFs nodes per chain. Type: integer | | ... | - start - Id of first chain, allows to add chains during test. | | ... | Type: integer -| | ... +| | | | ... | *Example:* -| | ... +| | | | ... | \| Initialize L2 bridge domains for multiple chains with Vhost-User \ | | ... | \| 3 \| 1 \| 2 \| -| | ... +| | | | [Arguments] | ${nf_chains}=${1} | ${nf_nodes}=${1} | ${start}=${1} -| | ... +| | | | Set interfaces in path up -| | :FOR | ${nf_chain} | IN RANGE | ${start} | ${nf_chains} + 1 +| | FOR | ${nf_chain} | IN RANGE | ${start} | ${nf_chains} + 1 | | | Initialize L2 bridge domains with Vhost-User | | | ... | nf_chain=${nf_chain} | nf_nodes=${nf_nodes} +| | END | Initialize L2 bridge domain with VXLANoIPv4 in 3-node circular topology | | [Documentation] @@ -208,7 +214,7 @@ | | ... | up. IPv4 addresses with prefix /24 are configured on interfaces | | ... | between DUTs. VXLAN sub-interfaces has same IPv4 address as | | ... | interfaces. -| | ... +| | | | Set interfaces in path up | | VPP Interface Set IP Address | ${dut1} | ${dut1_if2} | 172.16.0.1 | | ... | 24 @@ -232,26 +238,26 @@ | | ... | domain on each DUT. All interfaces are brought up. IPv4 addresses | | ... | with prefix /32 are configured on interfaces between DUTs. VXLAN | | ... | sub-interfaces has same IPv4 address as interfaces. -| | ... +| | | | ... | *Arguments:* | | ... | - vxlan_count - VXLAN count. Type: integer -| | ... +| | | | ... | *Example:* -| | ... +| | | | ... | \| Initialize L2 bridge domain with VLAN and VXLANoIPv4 in 3-node \ | | ... | \| circular topology \| ${1} \| -| | ... +| | | | [Arguments] | ${vxlan_count}=${1} -| | ... +| | | | Set interfaces in path up -| | ... +| | | | ${bd_id_start}= | Set Variable | ${1} | | ${vni_start} = | Set Variable | ${20} -| | ... +| | | | ${ip_step} = | Set Variable | ${2} | | ${dut1_ip_start}= | Set Variable | 172.16.0.1 | | ${dut2_ip_start}= | Set Variable | 172.16.0.2 -| | ... +| | | | Vpp create multiple VXLAN IPv4 tunnels | node=${dut1} | | ... | node_vxlan_if=${dut1_if2} | node_vlan_if=${dut1_if1} | | ... | op_node=${dut2} | op_node_if=${dut2_if1} | n_tunnels=${vxlan_count} @@ -274,18 +280,18 @@ | | ... | interfaces on each DUT. All interfaces are brought up. | | ... | IPv4 addresses with prefix /24 are configured on interfaces between | | ... | DUTs. VXLAN sub-interfaces has same IPv4 address as interfaces. -| | ... +| | | | ... | *Arguments:* | | ... | - bd_id1 - Bridge domain ID. Type: integer | | ... | - bd_id2 - Bridge domain ID. Type: integer -| | ... +| | | | ... | *Example:* -| | ... +| | | | ... | \| L2 bridge domains with Vhost-User and VXLANoIPv4 initialized in a\ | | ... | 3-node circular topology \| 1 \| 2 \| -| | ... +| | | | [Arguments] | ${bd_id1} | ${bd_id2} -| | ... +| | | | VPP Interface Set IP Address | ${dut1} | ${dut1_if2} | 172.16.0.1 | | ... | 24 | | VPP Interface Set IP Address | ${dut2} | ${dut2_if1} | 172.16.0.2 @@ -317,38 +323,38 @@ | | ... | interfaces on the DUT. All interfaces are brought up. | | ... | IPv4 addresses with prefix /24 are configured on interfaces between | | ... | DUT and TG. -| | ... +| | | | ... | *Arguments:* | | ... | - dut1_address - Address of physical interface on DUT1. Type: string | | ... | - dut1_address_subnet - Subnet of the address of physical interface on -| | ... | DUT1. Type: string +| | ... | DUT1. Type: string | | ... | - dut2_address - Address of physical interface on DUT2. Type: string | | ... | - dut2_address_subnet - Subnet of the address of physical interface on -| | ... | DUT2. Type: string +| | ... | DUT2. Type: string | | ... | - dut1_gw - Address of the _gateway_ to which the traffic will be -| | ... | forwarded on DUT1. Type: string +| | ... | forwarded on DUT1. Type: string | | ... | - dut2_gw - Address of the _gateway_ to which the traffic will be -| | ... | forwarded on DUT2. Type: string +| | ... | forwarded on DUT2. Type: string | | ... | - dut1_vxlans - List of VXLAN params to be configured on DUT1. -| | ... | Type: list of dicts, dict params vni, vtep +| | ... | Type: list of dicts, dict params vni, vtep | | ... | - dut2_vxlans - List of VXLAN params to be configured on DUT2. -| | ... | Type: list of dicts, dict params vni, vtep -| | ... | - dut1_route_subnet - Subnet address to forward to _gateway_ on DUT1. -| | ... | Type: string -| | ... | - dut1_route_mask - Subnet address mask to forward to _gateway_ -| | ... | on DUT1. Type: string -| | ... | - dut2_route_subnet - Subnet address to forward to _gateway_ on DUT2. -| | ... | Type: string -| | ... | - dut2_route_mask - Subnet address mask to forward to _gateway_ -| | ... | on DUT2. Type: string -| | ... +| | ... | Type: list of dicts, dict params vni, vtep +| | ... | - dut1_route_subnet - Subnet address to forward to _gateway_ on DUT1. +| | ... | Type: string +| | ... | - dut1_route_mask - Subnet address mask to forward to _gateway_ +| | ... | on DUT1. Type: string +| | ... | - dut2_route_subnet - Subnet address to forward to _gateway_ on DUT2. +| | ... | Type: string +| | ... | - dut2_route_mask - Subnet address mask to forward to _gateway_ +| | ... | on DUT2. Type: string +| | | | ... | *Example:* -| | ... +| | | | [Arguments] | ${dut1_address} | ${dut1_address_subnet} | | | ... | ${dut2_address} | ${dut2_address_subnet} | ${dut1_gw} | ${dut2_gw} | | | ... | ${dut1_vxlans} | ${dut2_vxlans} | ${dut1_route_subnet} | | | ... | ${dut1_route_mask} | ${dut2_route_subnet} | ${dut2_route_mask} -| | ... +| | | | Configure vhost interfaces | ${dut1} | | ... | /var/run/vpp/sock-1-${dut1_bd_id1} | | ... | /var/run/vpp/sock-1-${dut1_bd_id2} @@ -359,14 +365,16 @@ | | ${dut1_bd_id1}= | Set Variable | 1 | | ${dut1_bd_id2}= | Set Variable | 2 | | ${dut2_bd_id1}= | Set Variable | 1 -| | :FOR | ${vxlan} | IN | @{dut1_vxlans} +| | FOR | ${vxlan} | IN | @{dut1_vxlans} | | | ${dut1s_vxlan}= | Create VXLAN interface | ${dut1} | ${vxlan.vni} | | | ... | ${dut1_address} | ${vxlan.vtep} | | | Add interface to bridge domain | ${dut1} | ${dut1s_vxlan} | ${dut1_bd_id1} -| | :FOR | ${vxlan} | IN | @{dut2_vxlans} +| | END +| | FOR | ${vxlan} | IN | @{dut2_vxlans} | | | ${dut2s_vxlan}= | Create VXLAN interface | ${dut2} | ${vxlan.vni} | | | ... | ${dut2_address} | ${vxlan.vtep} | | | Add interface to bridge domain | ${dut2} | ${dut2s_vxlan} | ${dut2_bd_id1} +| | END | | VPP Add IP Neighbor | ${dut1} | ${dut1_if1} | ${dut1_gw} | ${tg_if1_mac} | | VPP Add IP Neighbor | ${dut2} | ${dut2_if2} | ${dut2_gw} | ${tg_if2_mac} | | Vpp Route Add | ${dut1} | ${dut1_route_subnet} | ${dut1_route_mask} @@ -385,31 +393,31 @@ | | ... | topology create VLAN sub-interfaces between DUTs. In case of 2-node | | ... | topology create VLAN sub-interface on dut1-if2 interface. All | | ... | interfaces are brought up. -| | ... +| | | | ... | *Arguments:* | | ... | - bd_id1 - Bridge domain ID. Type: integer | | ... | - bd_id2 - Bridge domain ID. Type: integer | | ... | - subid - ID of the sub-interface to be created. Type: string | | ... | - tag_rewrite - Method of tag rewrite. Type: string -| | ... +| | | | ... | _NOTE:_ This KW uses following test case variables: | | ... | - dut1 - DUT1 node. | | ... | - dut2 - DUT2 node. | | ... | - dut1_if2 - DUT1 interface towards DUT2. | | ... | - dut2_if1 - DUT2 interface towards DUT1. -| | ... +| | | | ... | *Example:* -| | ... +| | | | ... | \| Initialize L2 bridge domains with VLAN dot1q sub-interfaces | | ... | in a 3-node circular topology \| 1 \| 2 \| 10 \| pop-1 \| -| | ... +| | | | [Arguments] | ${bd_id1} | ${bd_id2} | ${subid} | ${tag_rewrite} -| | ... +| | | | ${dut2_status} | ${value}= | Run Keyword And Ignore Error | | ... | Variable Should Exist | ${dut2} -| | ... +| | | | Set interfaces in path up -| | ... +| | | | Run Keyword If | '${dut2_status}' == 'PASS' | | ... | Initialize VLAN dot1q sub-interfaces in circular topology | | ... | ${dut1} | ${dut1_if2} | ${dut2} | ${dut2_if1} | ${subid} @@ -420,7 +428,7 @@ | | ... | ${subif_index_1} | ${dut2} | ${subif_index_2} | ${tag_rewrite} | | ... | ELSE | Configure L2 tag rewrite method on interfaces | | ... | ${dut1} | ${subif_index_1} | TAG_REWRITE_METHOD=${tag_rewrite} -| | ... +| | | | Add interface to bridge domain | ${dut1} | ${dut1_if1} | ${bd_id1} | | Add interface to bridge domain | ${dut1} | ${subif_index_1} | ${bd_id1} | | Run Keyword If | '${dut2_status}' == 'PASS' @@ -437,25 +445,25 @@ | | ... | with physical inteface. In case of 3-node topology create VLAN | | ... | sub-interfaces between DUTs. In case of 2-node topology create VLAN | | ... | sub-interface on dut1-if2 interface. All interfaces are brought up. -| | ... +| | | | ... | *Arguments:* | | ... | - bd_id1 - Bridge domain ID. Type: integer | | ... | - bd_id2 - Bridge domain ID. Type: integer | | ... | - subid - ID of the sub-interface to be created. Type: string | | ... | - tag_rewrite - Method of tag rewrite. Type: string -| | ... +| | | | ... | *Example:* -| | ... +| | | | ... | \| L2 bridge domains with Vhost-User and VLAN initialized in circular\ | | ... | topology \| 1 \| 2 \| 10 \| pop-1 \| -| | ... +| | | | [Arguments] | ${bd_id1} | ${bd_id2} | ${subid} | ${tag_rewrite} -| | ... +| | | | ${dut2_status} | ${value}= | Run Keyword And Ignore Error | | ... | Variable Should Exist | ${dut2} -| | ... +| | | | Set interfaces in path up -| | ... +| | | | Run Keyword If | '${dut2_status}' == 'PASS' | | ... | Initialize VLAN dot1q sub-interfaces in circular topology | | ... | ${dut1} | ${dut1_if2} | ${dut2} | ${dut2_if1} | ${subid} @@ -466,7 +474,7 @@ | | ... | ${subif_index_1} | ${dut2} | ${subif_index_2} | ${tag_rewrite} | | ... | ELSE | Configure L2 tag rewrite method on interfaces | | ... | ${dut1} | ${subif_index_1} | TAG_REWRITE_METHOD=${tag_rewrite} -| | ... +| | | | Configure vhost interfaces | ${dut1} | | ... | /var/run/vpp/sock-1-${bd_id1} | /var/run/vpp/sock-1-${bd_id2} | | Add interface to bridge domain | ${dut1} | ${dut1_if1} | ${bd_id1} @@ -496,7 +504,7 @@ | | ... | interface towards TG and other Vhost-User interface into L2 bridge | | ... | domains with learning enabled with VLAN sub-interface. All interfaces | | ... | are brought up. -| | ... +| | | | ... | *Arguments:* | | ... | - bd_id1 - Bridge domain ID. Type: integer | | ... | - bd_id2 - Bridge domain ID. Type: integer @@ -504,16 +512,16 @@ | | ... | - tag_rewrite - Method of tag rewrite. Type: string | | ... | - bond_mode - Link bonding mode. Type: string | | ... | - lb_mode - Load balance mode. Type: string -| | ... +| | | | ... | *Example:* -| | ... +| | | | ... | \| Initialize L2 bridge domains with Vhost-User and VLAN with VPP\ | | ... | link bonding in a 3-node circular topology \| 1 \| 2 \ | | ... | \| 10 \| pop-1 \| xor \| l34 \| -| | ... +| | | | [Arguments] | ${bd_id1} | ${bd_id2} | ${subid} | ${tag_rewrite} | | ... | ${bond_mode} | ${lb_mode} -| | ... +| | | | Set interfaces in path up | | ${dut1_eth_bond_if1}= | VPP Create Bond Interface | ${dut1} | ${bond_mode} | | ... | ${lb_mode} @@ -570,26 +578,26 @@ | | ... | Create pairs of Memif interfaces on DUT node. Put each Memif interface | | ... | to separate L2 bridge domain with one physical or memif interface | | ... | to create a chain accross DUT node. -| | ... +| | | | ... | *Arguments:* | | ... | - dut - DUT node. Type: dictionary | | ... | - nf_chain - NF chain. Type: integer | | ... | - nf_nodes - Number of NFs nodes per chain. Type: integer | | ... | - auto_scale - Whether to use same amount of RXQs for memif interface | | ... | in containers as vswitch, otherwise use single RXQ. Type: boolean -| | ... +| | | | ... | *Note:* | | ... | Socket paths for Memif are defined in following format: | | ... | - /tmp/memif-\${dut}_CNF\${nf_id}-\${sid} -| | ... +| | | | ... | *Example:* -| | ... +| | | | ... | \| Initialize L2 Bridge Domain with memif pairs on DUT node \ | | ... | \| ${dut} \| 1 \| 1 \| -| | ... +| | | | [Arguments] | ${dut} | ${nf_chain}=${1} | ${nf_nodes}=${1} | | ... | ${auto_scale}=${True} -| | ... +| | | | ${rxq}= | Run Keyword If | ${auto_scale} == ${True} | | ... | Set Variable | ${rxq_count_int} | | ... | ELSE | Set Variable | ${1} @@ -602,7 +610,7 @@ | | Add interface to bridge domain | | ... | ${nodes['${dut}']} | ${${dut_str}_${prev_layer}_${nf_chain}_2} | | ... | ${bd_id2} -| | :FOR | ${nf_node} | IN RANGE | 1 | ${nf_nodes}+1 +| | FOR | ${nf_node} | IN RANGE | 1 | ${nf_nodes}+1 | | | ${nf_id}= | Evaluate | (${nf_chain} - ${1}) * ${nf_nodes} + ${nf_node} | | | ${sock1}= | Set Variable | memif-${dut}_CNF | | | ${sock2}= | Set Variable | memif-${dut}_CNF @@ -615,29 +623,31 @@ | | | ... | ${nodes['${dut}']} | ${${dut}-memif-${nf_id}-if1} | ${bd_id1} | | | Add interface to bridge domain | | | ... | ${nodes['${dut}']} | ${${dut}-memif-${nf_id}-if2} | ${bd_id2} +| | END | Initialize L2 Bridge Domain with memif pairs | | [Documentation] | | ... | Create pairs of Memif interfaces on all defined VPP nodes. Put each | | ... | Memif interface to separate L2 bridge domain with one physical or | | ... | virtual interface to create a chain accross DUT node. -| | ... +| | | | ... | *Arguments:* | | ... | - nf_chain - NF chain. Type: integer | | ... | - nf_nodes - Number of NFs nodes per chain. Type: integer | | ... | - auto_scale - Whether to use same amount of RXQs for memif interface | | ... | in containers as vswitch, otherwise use single RXQ. Type: boolean -| | ... +| | | | ... | *Example:* -| | ... +| | | | ... | \| Initialize L2 Bridge Domain with memif pairs \| 1 \| 1 \| -| | ... +| | | | [Arguments] | ${nf_chain}=${1} | ${nf_nodes}=${1} | ${auto_scale}=${True} -| | ... -| | :FOR | ${dut} | IN | @{duts} +| | +| | FOR | ${dut} | IN | @{duts} | | | Initialize L2 Bridge Domain with memif pairs on DUT node | ${dut} | | | ... | nf_chain=${nf_chain} | nf_nodes=${nf_nodes} | | | ... | auto_scale=${auto_scale} +| | END | Initialize L2 Bridge Domain for multiple chains with memif pairs | | [Documentation] @@ -645,23 +655,24 @@ | | ... | with defined number of NF nodes on all defined VPP nodes. Add each | | ... | Memif interface into L2 bridge domains with learning enabled | | ... | with physical inteface or Memif interface of another NF. -| | ... +| | | | ... | *Arguments:* | | ... | - nf_chains - Number of chains of NFs. Type: integer | | ... | - nf_nodes - Number of NFs nodes per chain. Type: integer | | ... | - auto_scale - Whether to use same amount of RXQs for memif interface | | ... | in containers as vswitch, otherwise use single RXQ. Type: boolean -| | ... +| | | | ... | *Example:* -| | ... +| | | | ... | \| Initialize L2 Bridge Domain for multiple chains with memif pairs \ | | ... | \| 1 \| 1 \| -| | ... +| | | | [Arguments] | ${nf_chains}=${1} | ${nf_nodes}=${1} | ${auto_scale}=${True} -| | ... -| | :FOR | ${nf_chain} | IN RANGE | 1 | ${nf_chains}+1 +| | +| | FOR | ${nf_chain} | IN RANGE | 1 | ${nf_chains}+1 | | | Initialize L2 Bridge Domain with memif pairs | nf_chain=${nf_chain} | | | ... | nf_nodes=${nf_nodes} | auto_scale=${auto_scale} +| | END | | Set interfaces in path up | | Show Memif on all DUTs | ${nodes} | | VPP round robin RX placement on all DUTs | ${nodes} | prefix=memif @@ -671,26 +682,26 @@ | | ... | Create pairs of Memif interfaces on all defined VPP nodes. Put each | | ... | Memif interface to separate L2 bridge domain with one physical or | | ... | virtual interface to create a service pipeline on DUT node. -| | ... +| | | | ... | *Arguments:* | | ... | - nf_chain - NF pipe. Type: integer | | ... | - nf_nodes - Number of NFs nodes per pipeline. Type: integer | | ... | - auto_scale - Whether to use same amount of RXQs for memif interface | | ... | in containers as vswitch, otherwise use single RXQ. Type: boolean -| | ... +| | | | ... | *Example:* -| | ... +| | | | ... | \| Initialize L2 Bridge Domain for pipeline with memif pairs \ | | ... | \| 1 \| 1 \| -| | ... +| | | | [Arguments] | ${nf_chain}=${1} | ${nf_nodes}=${1} | ${auto_scale}=${True} -| | ... +| | | | ${rxq}= | Run Keyword If | ${auto_scale} == ${True} | | ... | Set Variable | ${rxq_count_int} | | ... | ELSE | Set Variable | ${1} | | ${bd_id1}= | Evaluate | ${nf_nodes} * (${nf_chain} - 1) + ${nf_chain} | | ${bd_id2}= | Evaluate | ${nf_nodes} * ${nf_chain} + ${nf_chain} -| | :FOR | ${dut} | IN | @{duts} +| | FOR | ${dut} | IN | @{duts} | | | ${dut_str}= | Convert To Lowercase | ${dut} | | | Add interface to bridge domain | | | ... | ${nodes['${dut}']} | ${${dut_str}_${prev_layer}_${nf_chain}_1} @@ -714,6 +725,7 @@ | | | ... | ${nodes['${dut}']} | ${${dut}-memif-${nf_id_frst}-if1} | ${bd_id1} | | | Add interface to bridge domain | | | ... | ${nodes['${dut}']} | ${${dut}-memif-${nf_id_last}-if2} | ${bd_id2} +| | END | Initialize L2 Bridge Domain for multiple pipelines with memif pairs | | [Documentation] @@ -721,24 +733,25 @@ | | ... | with defined number of NF nodes on all defined VPP nodes. Add each | | ... | Memif interface into L2 bridge domains with learning enabled | | ... | with physical inteface or Memif interface of another NF. -| | ... +| | | | ... | *Arguments:* | | ... | - nf_chains - Number of pipelines of NFs. Type: integer | | ... | - nf_nodes - Number of NFs nodes per pipeline. Type: integer | | ... | - auto_scale - Whether to use same amount of RXQs for memif interface | | ... | in containers as vswitch, otherwise use single RXQ. Type: boolean -| | ... +| | | | ... | *Example:* -| | ... +| | | | ... | \| Initialize L2 Bridge Domain for multiple pipelines with memif \ | | ... | pairs \| 1 \| 1 \| -| | ... +| | | | [Arguments] | ${nf_chains}=${1} | ${nf_nodes}=${1} | ${auto_scale}=${True} -| | ... -| | :FOR | ${nf_chain} | IN RANGE | 1 | ${nf_chains}+1 +| | +| | FOR | ${nf_chain} | IN RANGE | 1 | ${nf_chains}+1 | | | Initialize L2 Bridge Domain for pipeline with memif pairs | | | ... | nf_chain=${nf_chain} | nf_nodes=${nf_nodes} | | | ... | auto_scale=${auto_scale} +| | END | | Set interfaces in path up | | Show Memif on all DUTs | ${nodes} | | VPP round robin RX placement on all DUTs | ${nodes} | prefix=memif @@ -751,25 +764,25 @@ | | ... | 3-node topology create VLAN sub-interfaces between DUTs. In case of | | ... | 2-node topology create VLAN sub-interface on dut1-if2 interface. All | | ... | interfaces are brought up. -| | ... +| | | | ... | *Arguments:* | | ... | - bd_id1 - Bridge domain ID. Type: integer | | ... | - bd_id2 - Bridge domain ID. Type: integer | | ... | - subid - ID of the sub-interface to be created. Type: string | | ... | - tag_rewrite - Method of tag rewrite. Type: string -| | ... +| | | | ... | *Example:* -| | ... +| | | | ... | \| Initialize L2 Bridge Domain with memif pairs and VLAN in circular\ | | ... | topology \| 1 \| 2 \| 10 \| pop-1 \| -| | ... +| | | | [Arguments] | ${bd_id1} | ${bd_id2} | ${subid} | ${tag_rewrite} -| | ... +| | | | ${dut2_status} | ${value}= | Run Keyword And Ignore Error | | ... | Variable Should Exist | ${dut2} -| | ... +| | | | Set interfaces in path up -| | ... +| | | | Run Keyword If | '${dut2_status}' == 'PASS' | | ... | Initialize VLAN dot1q sub-interfaces in circular topology | | ... | ${dut1} | ${dut1_if2} | ${dut2} | ${dut2_if1} | ${subid} @@ -780,7 +793,7 @@ | | ... | ${subif_index_1} | ${dut2} | ${subif_index_2} | ${tag_rewrite} | | ... | ELSE | Configure L2 tag rewrite method on interfaces | | ... | ${dut1} | ${subif_index_1} | TAG_REWRITE_METHOD=${tag_rewrite} -| | ... +| | | | ${number}= | Set Variable | ${1} | | ${sock1}= | Set Variable | memif-DUT1_CNF | | ${sock2}= | Set Variable | memif-DUT1_CNF @@ -816,7 +829,7 @@ | | ... | ${bd_id2} | | Run Keyword If | '${dut2_status}' == 'PASS' | | ... | Add interface to bridge domain | ${dut2} | ${dut2_if2} | ${bd_id2} -| | ... +| | | | Show Memif on all DUTs | ${nodes} | | VPP round robin RX placement on all DUTs | ${nodes} | prefix=memif @@ -824,24 +837,24 @@ | | [Documentation] | | ... | Create single Memif interface on all defined VPP nodes. Put Memif | | ... | interface to separate L2 bridge domain with one physical interface. -| | ... +| | | | ... | *Arguments:* | | ... | - number - Memif ID. Type: integer -| | ... +| | | | ... | *Note:* | | ... | Socket paths for Memif are defined in following format: | | ... | - /tmp/memif-DUT1_CNF\${number}-\${sid} -| | ... +| | | | ... | KW uses test variable ${rxq_count_int} set by KW Add worker threads | | ... | and rxqueues to all DUTs -| | ... +| | | | ... | *Example:* -| | ... +| | | | ... | \| Initialize L2 Bridge Domain for single memif \| 1 \| -| | ... +| | | | [Arguments] | ${number}=${1} -| | ... -| | :FOR | ${dut} | IN | @{duts} +| | +| | FOR | ${dut} | IN | @{duts} | | | ${sock}= | Set Variable | memif-${dut}_CNF | | | ${sid}= | Evaluate | (${number} * ${2}) - ${1} | | | Set up single memif interface on DUT node | ${nodes['${dut}']} | ${sock} @@ -851,6 +864,7 @@ | | | ... | ${number} | | | Add interface to bridge domain | ${nodes['${dut}']} | | | ... | ${${dut}-memif-${number}-if1} | ${number} +| | END | | Set single interfaces in path up | | Show Memif on all DUTs | ${nodes} @@ -860,7 +874,7 @@ | | ... | domain that is created automatically with index 1. Learning is | | ... | enabled. Interfaces are brought up. Apply required MACIP ACL rules to | | ... | DUT1 interfaces. -| | ... +| | | | Set interfaces in path up | | VPP Add L2 Bridge Domain | ${dut1} | ${1} | ${dut1_if1} | ${dut1_if2} | | Configure L2XC | ${dut2} | ${dut2_if1} | ${dut2_if2} @@ -872,7 +886,7 @@ | | ... | domain that is created automatically with index 1. Learning is | | ... | enabled. Interfaces are brought up. Apply required ACL rules to DUT1 | | ... | interfaces. -| | ... +| | | | Set interfaces in path up | | VPP Add L2 Bridge Domain | ${dut1} | ${1} | ${dut1_if1} | ${dut1_if2} | | Configure L2XC | ${dut2} | ${dut2_if1} | ${dut2_if2} diff --git a/resources/libraries/robot/l2/l2_patch.robot b/resources/libraries/robot/l2/l2_patch.robot index 196d9e5d7e..836e281758 100644 --- a/resources/libraries/robot/l2/l2_patch.robot +++ b/resources/libraries/robot/l2/l2_patch.robot @@ -20,7 +20,7 @@ | | [Documentation] | | ... | Setup L2 patch topology by cross connecting two interfaces on | | ... | each DUT. Interfaces are brought up. -| | ... +| | | | Set interfaces in path up | | :FOR | ${dut} | IN | @{duts} | | | VPP Setup Bidirectional L2 patch diff --git a/resources/libraries/robot/l2/l2_traffic.robot b/resources/libraries/robot/l2/l2_traffic.robot index 93506d585e..eac0be446b 100644 --- a/resources/libraries/robot/l2/l2_traffic.robot +++ b/resources/libraries/robot/l2/l2_traffic.robot @@ -22,9 +22,9 @@ | | [Documentation] | Send IPv4/IPv6 packet from source interface to \ | | ... | destination interface. Packet can be set with Dot1q or | | ... | Dot1ad tag(s) when required. -| | ... +| | | | ... | *Arguments:* -| | ... +| | | | ... | - tg_node - TG node. Type: dictionary | | ... | - src_int - Source interface. Type: string | | ... | - dst_int - Destination interface. Type: string @@ -37,15 +37,15 @@ | | ... | (Optional). Type: string | | ... | - vlan1_rx - VLAN (outer) tag on RX side (Optional). Type: integer | | ... | - vlan2_rx - VLAN inner tag on RX side (Optional). Type: integer -| | ... +| | | | ... | *Return:* -| | ... +| | | | ... | - No value returned -| | ... +| | | | ... | *Example:* -| | ... +| | | | ... | _NOTE:_ Default IP is IPv4 -| | ... +| | | | ... | \| Send IP packet and verify received packet \| ${nodes['TG']} \ | | ... | \| ${tg_to_dut_if1} \| ${tg_to_dut_if2} \| | | ... | \| Send IP packet and verify received packet \| ${nodes['TG']} \ @@ -59,12 +59,12 @@ | | ... | \| Send IP packet and verify received packet \| ${nodes['TG']} \ | | ... | \| ${tg_to_dut1} \| ${tg_to_dut2} \| encaps=Dot1q \| vlan1=110 \ | | ... | \| encaps_rx=Dot1q \| vlan1_rx=120 \| -| | ... +| | | | [Arguments] | ${tg_node} | ${tx_src_port} | ${rx_dst_port} | | ... | ${src_ip}=192.168.100.1 | ${dst_ip}=192.168.100.2 | | ... | ${encaps}=${EMPTY} | ${vlan1}=${EMPTY} | ${vlan2}=${EMPTY} | | ... | ${encaps_rx}=${EMPTY} | ${vlan1_rx}=${EMPTY} | ${vlan2_rx}=${EMPTY} -| | ... +| | | | ${tx_src_mac}= | Get Interface Mac | ${tg_node} | ${tx_src_port} | | ${rx_dst_mac}= | Get Interface Mac | ${tg_node} | ${rx_dst_port} | | Then Send packet and verify headers @@ -75,66 +75,30 @@ | | ... | encaps_rx=${encaps_rx} | vlan_rx=${vlan1_rx} | | ... | vlan_outer_rx=${vlan2_rx} -| ICMP packet transmission should fail -| | [Documentation] | Send ICMPv4/ICMPv6 echo request from source interface to -| | ... | destination interface and expect failure with -| | ... | ICMP echo Rx timeout error message. -| | ... -| | ... | *Arguments:* -| | ... -| | ... | - tg_node - TG node. Type: dictionary -| | ... | - src_int - Source interface. Type: string -| | ... | - dst_int - Destination interface. Type: string -| | ... | - src_ip - Source IP address (Optional). Type: string -| | ... | - dst_ip - Destination IP address (Optional). Type: string -| | ... -| | ... | *Return:* -| | ... -| | ... | - No value returned -| | ... -| | ... | *Example:* -| | ... -| | ... | _NOTE:_ Default IP is IPv4 -| | ... -| | ... | \| ICMP packet transmission should fail\| ${nodes['TG']} \ -| | ... | \| ${tg_to_dut_if1} \| ${tg_to_dut_if2} \| -| | ... -| | [Arguments] | ${tg_node} | ${src_int} | ${dst_int} | -| | ... | ${src_ip}=192.168.100.1 | ${dst_ip}=192.168.100.2 -| | ... -| | ${src_mac}= | Get Interface Mac | ${tg_node} | ${src_int} -| | ${dst_mac}= | Get Interface Mac | ${tg_node} | ${dst_int} -| | ${src_int_name}= | Get interface name | ${tg_node} | ${src_int} -| | ${dst_int_name}= | Get interface name | ${tg_node} | ${dst_int} -| | ${args}= | Traffic Script Gen Arg | ${dst_int_name} | ${src_int_name} -| | ... | ${src_mac} | ${dst_mac} | ${src_ip} | ${dst_ip} -| | Run Keyword And Expect Error | IP echo Rx timeout | -| | ... | Run Traffic Script On Node | send_ip_icmp.py | ${tg_node} | ${args} - | Send IPv4 bidirectionally and verify received packets | | [Documentation] | Send IPv4 packets from both directions, | | ... | from interface1 to interface2 and from interface2 to interface1. -| | ... +| | | | ... | *Arguments:* -| | ... +| | | | ... | - tg_node - TG node. Type: dictionary | | ... | - src_int - Source interface. Type: string | | ... | - dst_int - Destination interface. Type: string | | ... | - src_ip - Source IP address (Optional). Type: string | | ... | - dst_ip - Destination IP address (Optional). Type: string -| | ... +| | | | ... | *Return:* -| | ... +| | | | ... | - No value returned -| | ... +| | | | ... | *Example:* -| | ... +| | | | ... | \| Send IPv4 bidirectionally and verify received packets \ | | ... | \| ${nodes['TG']} \| ${tg_to_dut_if1} \| ${tg_to_dut_if2} \| -| | ... +| | | | [Arguments] | ${tg_node} | ${int1} | ${int2} | ${src_ip}=192.168.100.1 | | | ... | ${dst_ip}=192.168.100.2 -| | ... +| | | | Send IP packet and verify received packet | | ... | ${tg_node} | ${int1} | ${int2} | ${src_ip} | ${dst_ip} | | Send IP packet and verify received packet @@ -143,27 +107,27 @@ | Send IPv6 bidirectionally and verify received packets | | [Documentation] | Send IPv6 packets from both directions, | | ... | from interface1 to interface2 and from interface2 to interface1. -| | ... +| | | | ... | *Arguments:* -| | ... +| | | | ... | - tg_node - TG node. Type: dictionary | | ... | - src_int - Source interface. Type: string | | ... | - dst_int - Destination interface. Type: string | | ... | - src_ip - Source IP address (Optional). Type: string | | ... | - dst_ip - Destination IP address (Optional). Type: string -| | ... +| | | | ... | *Return:* -| | ... +| | | | ... | - No value returned -| | ... +| | | | ... | *Example:* -| | ... +| | | | ... | \| Send IPv6 bidirectionally and verify received packets \ | | ... | \| ${nodes['TG']} \| ${tg_to_dut_if1} \| ${tg_to_dut_if2} \| -| | ... +| | | | [Arguments] | ${tg_node} | ${int1} | ${int2} | ${src_ip}=3ffe:63::1 | | | ... | ${dst_ip}=3ffe:63::2 -| | ... +| | | | Send IP packet and verify received packet | | ... | ${tg_node} | ${int1} | ${int2} | ${src_ip} | ${dst_ip} | | Send IP packet and verify received packet diff --git a/resources/libraries/robot/l2/l2_xconnect.robot b/resources/libraries/robot/l2/l2_xconnect.robot index 42fe837676..a0c1c24a5d 100644 --- a/resources/libraries/robot/l2/l2_xconnect.robot +++ b/resources/libraries/robot/l2/l2_xconnect.robot @@ -27,45 +27,47 @@ | | [Documentation] | | ... | Setup L2 cross connect topology by connecting RX/TX of two interfaces | | ... | on each DUT. Interfaces are brought up. -| | ... +| | | | ... | *Arguments:* | | ... | - dut - DUT node. Type: string | | ... | - count - Number of interfaces pairs to connect. Type: integer -| | ... +| | | | ... | *Example:* -| | ... +| | | | ... | \| Initialize L2 cross connect on node \| DUT1 \| 1 \| -| | ... +| | | | [Arguments] | ${dut} | ${count}=${1} -| | ... -| | :FOR | ${id} | IN RANGE | 1 | ${count} + 1 +| | +| | FOR | ${id} | IN RANGE | 1 | ${count} + 1 | | | ${dut_str}= | Convert To Lowercase | ${dut} | | | VPP Setup Bidirectional Cross Connect | ${nodes['${dut}']} | | | ... | ${${dut_str}_${prev_layer}_${id}_1} | | | ... | ${${dut_str}_${prev_layer}_${id}_2} +| | END | Initialize L2 cross connect | | [Documentation] | | ... | Setup L2 cross connect topology by connecting RX/TX of two interfaces | | ... | on each DUT. Interfaces are brought up. -| | ... +| | | | ... | *Arguments:* | | ... | - count - Number of interfaces pairs to connect. Type: integer -| | ... +| | | | ... | *Example:* -| | ... +| | | | ... | \| Initialize L2 cross connect \| 1 \| -| | ... +| | | | [Arguments] | ${count}=${1} -| | ... -| | :FOR | ${dut} | IN | @{duts} +| | +| | FOR | ${dut} | IN | @{duts} | | | Initialize L2 cross connect on node | ${dut} | count=${count} +| | END | Initialize L2 xconnect in 2-node circular topology | | [Documentation] | | ... | Setup L2 xconnect topology by cross connecting two interfaces on | | ... | each DUT. Interfaces are brought up. -| | ... +| | | | Set interfaces in path up | | VPP Setup Bidirectional Cross Connect | ${dut1} | ${dut1_if1} | ${dut1_if2} @@ -85,7 +87,7 @@ | | ... | up. IPv4 addresses with prefix /24 are configured on interfaces | | ... | between DUTs. VXLAN sub-interfaces has same IPv4 address as | | ... | interfaces. -| | ... +| | | | Set interfaces in path up | | VPP Interface Set IP Address | ${dut1} | ${dut1_if2} | 172.16.0.1 | 24 | | VPP Interface Set IP Address | ${dut2} | ${dut2_if1} | 172.16.0.2 | 24 @@ -103,23 +105,23 @@ | | ... | Create pairs of Vhost-User interfaces for defined number of VMs on | | ... | defined VPP node. Add each Vhost-User interface into L2 cross-connect | | ... | with with physical inteface or Vhost-User interface of another VM. -| | ... +| | | | ... | *Arguments:* | | ... | - dut - DUT node. Type: string | | ... | - nf_nodes - VM count. Type: integer -| | ... +| | | | ... | *Note:* | | ... | Socket paths for VM are defined in following format: | | ... | - /tmp/sock-\${VM_ID}-1 | | ... | - /tmp/sock-\${VM_ID}-2 -| | ... +| | | | ... | *Example:* -| | ... +| | | | ... | \| Initialize L2 xconnect with Vhost-User on node \| DUT1 \| 1 \| -| | ... +| | | | [Arguments] | ${dut} | ${nf_nodes}=${1} -| | ... -| | :FOR | ${number} | IN RANGE | 1 | ${nf_nodes}+1 +| | +| | FOR | ${number} | IN RANGE | 1 | ${nf_nodes}+1 | | | ${sock1}= | Set Variable | /var/run/vpp/sock-${number}-1 | | | ${sock2}= | Set Variable | /var/run/vpp/sock-${number}-2 | | | ${prev_index}= | Evaluate | ${number}-1 @@ -132,43 +134,45 @@ | | | ... | ${${dut}-vhost-${number}-if1} | | | Run Keyword If | ${number}==${nf_nodes} | Configure L2XC | | | ... | ${nodes['${dut}']} | ${${dut}-vhost-${number}-if2} | ${${dut}_if2} +| | END | Initialize L2 xconnect with Vhost-User | | [Documentation] | | ... | Create pairs of Vhost-User interfaces for defined number of VMs on | | ... | all VPP nodes. Add each Vhost-User interface into L2 cross-connect | | ... | with with physical inteface or Vhost-User interface of another VM. -| | ... +| | | | ... | *Arguments:* | | ... | - nf_nodes - VM count. Type: integer -| | ... +| | | | ... | *Example:* -| | ... +| | | | ... | \| Initialize L2 xconnect with Vhost-User \| 1 \| -| | ... +| | | | [Arguments] | ${nf_nodes}=${1} -| | ... -| | :FOR | ${dut} | IN | @{duts} +| | +| | FOR | ${dut} | IN | @{duts} | | | Initialize L2 xconnect with Vhost-User on node | ${dut} | | | ... | nf_nodes=${nf_nodes} +| | END | Initialize L2 xconnect with Vhost-User and VLAN in 3-node circular topology | | [Documentation] | | ... | Create two Vhost-User interfaces on all defined VPP nodes. Cross | | ... | connect each Vhost interface with one physical interface. | | ... | Setup VLAN between DUTs. All interfaces are brought up. -| | ... +| | | | ... | *Arguments:* | | ... | - subid - ID of the sub-interface to be created. Type: string | | ... | - tag_rewrite - Method of tag rewrite. Type: string -| | ... +| | | | ... | *Example:* -| | ... +| | | | ... | \| L2 xconnect with Vhost-User and VLAN initialized in a 3-node\ | | ... | circular topology \| 10 \| pop-1 \| -| | ... +| | | | [Arguments] | ${subid} | ${tag_rewrite} -| | ... +| | | | Set interfaces in path up | | Initialize VLAN dot1q sub-interfaces in circular topology | | ... | ${dut1} | ${dut1_if2} | ${dut2} | ${dut2_if1} | ${subid} @@ -192,20 +196,20 @@ | | ... | VLAN on BondEthernet interfaces between DUTs. Cross connect one Vhost | | ... | interface with physical interface towards TG and other Vhost interface | | ... | with VLAN sub-interface. All interfaces are brought up. -| | ... +| | | | ... | *Arguments:* | | ... | - subid - ID of the sub-interface to be created. Type: string | | ... | - tag_rewrite - Method of tag rewrite. Type: string | | ... | - bond_mode - Link bonding mode. Type: string | | ... | - lb_mode - Load balance mode. Type: string -| | ... +| | | | ... | *Example:* -| | ... +| | | | ... | \| Initialize L2 xconnect with Vhost-User and VLAN with VPP link\ | | ... | bonding in 3-node circular topology \| 10 \| pop-1 \| xor \| l34 \| -| | ... +| | | | [Arguments] | ${subid} | ${tag_rewrite} | ${bond_mode} | ${lb_mode} -| | ... +| | | | Set interfaces in path up | | ${dut1_eth_bond_if1}= | VPP Create Bond Interface | ${dut1} | ${bond_mode} | | ... | ${lb_mode} @@ -258,26 +262,26 @@ | | ... | Create pairs of Memif interfaces on DUT node. Cross connect each Memif | | ... | interface with one physical interface or virtual interface to create | | ... | a chain accross DUT node. -| | ... +| | | | ... | *Arguments:* | | ... | - dut - DUT node. Type: dictionary | | ... | - count - Number of memif pairs (containers). Type: integer -| | ... +| | | | ... | *Note:* | | ... | Socket paths for Memif are defined in following format: | | ... | - /tmp/memif-\${dut}_CNF\${number}-\${sid} -| | ... +| | | | ... | KW uses test variable \${rxq_count_int} set by KW Add worker threads | | ... | and rxqueues to all DUTs -| | ... +| | | | ... | *Example:* -| | ... +| | | | ... | \| Initialize L2 xconnect with memif pairs on DUT node \| ${dut} \ | | ... | \| ${1} \| -| | ... +| | | | [Arguments] | ${dut} | ${count} -| | ... -| | :FOR | ${number} | IN RANGE | 1 | ${count}+1 +| | +| | FOR | ${number} | IN RANGE | 1 | ${count}+1 | | | ${sock1}= | Set Variable | memif-${dut}_CNF | | | ${sock2}= | Set Variable | memif-${dut}_CNF | | | ${prev_index}= | Evaluate | ${number}-1 @@ -290,24 +294,26 @@ | | | ... | ${${dut}-memif-${number}-if1} | | | Run Keyword If | ${number}==${count} | Configure L2XC | | | ... | ${nodes['${dut}']} | ${${dut}-memif-${number}-if2} | ${${dut}_if2} +| | END | Initialize L2 xconnect with memif pairs | | [Documentation] | | ... | Create pairs of Memif interfaces on all defined VPP nodes. Cross | | ... | connect each Memif interface with one physical interface or virtual | | ... | interface to create a chain accross DUT node. -| | ... +| | | | ... | *Arguments:* | | ... | - count - Number of memif pairs (containers). Type: integer -| | ... +| | | | ... | *Example:* -| | ... +| | | | ... | \| Initialize L2 xconnect with memif pairs \| ${1} \| -| | ... +| | | | [Arguments] | ${count}=${1} -| | ... -| | :FOR | ${dut} | IN | @{duts} +| | +| | FOR | ${dut} | IN | @{duts} | | | Initialize L2 xconnect with memif pairs on DUT node | ${dut} | ${count} +| | END | | Set interfaces in path up | | Show Memif on all DUTs | ${nodes} | | VPP round robin RX placement on all DUTs | ${nodes} | prefix=memif @@ -316,24 +322,24 @@ | | [Documentation] | | ... | Create single Memif interface on all defined VPP nodes. Cross | | ... | connect Memif interface with one physical interface. -| | ... +| | | | ... | *Arguments:* | | ... | - number - Memif ID. Type: integer -| | ... +| | | | ... | *Note:* | | ... | Socket paths for Memif are defined in following format: | | ... | - /tmp/memif-DUT1_CNF\${number}-\${sid} -| | ... +| | | | ... | KW uses test variable ${rxq_count_int} set by KW Add worker threads | | ... | and rxqueues to all DUTs -| | ... +| | | | ... | *Example:* -| | ... +| | | | ... | \| Initialize L2 xconnect for single memif \| 1 \| -| | ... +| | | | [Arguments] | ${number}=${1} -| | ... -| | :FOR | ${dut} | IN | @{duts} +| | +| | FOR | ${dut} | IN | @{duts} | | | ${sock}= | Set Variable | memif-${dut}_CNF | | | ${sid}= | Evaluate | (${number} * ${2}) - ${1} | | | Set up single memif interface on DUT node | ${nodes['${dut}']} | ${sock} @@ -341,6 +347,7 @@ | | | ... | rxq=${rxq_count_int} | txq=${rxq_count_int} | | | Configure L2XC | ${nodes['${dut}']} | ${${dut}_if1} | | | ... | ${${dut}-memif-${number}-if1} +| | END | | Set single interfaces in path up | | Show Memif on all DUTs | ${nodes} | | VPP round robin RX placement on all DUTs | ${nodes} | prefix=memif diff --git a/resources/libraries/robot/l2/tagging.robot b/resources/libraries/robot/l2/tagging.robot index a48e10c427..273384c5cc 100644 --- a/resources/libraries/robot/l2/tagging.robot +++ b/resources/libraries/robot/l2/tagging.robot @@ -15,7 +15,7 @@ | Library | resources.libraries.python.L2Util | Library | resources.libraries.python.InterfaceUtil | Library | resources.libraries.python.NodePath -| ... +| | Documentation | Keywords for VLAN tests *** Keywords *** @@ -23,7 +23,7 @@ | | [Arguments] | ${DUT1} | ${INT1} | ${DUT2} | ${INT2} | ${SUB_ID} | | ... | ${OUTER_VLAN_ID} | ${INNER_VLAN_ID} | ${TYPE_SUBIF} | | [Documentation] | Create two subinterfaces on DUTs. -| | ... +| | | | ... | *Arguments:* | | ... | - DUT1 - Node to add sub-interface. | | ... | - INT1 - Interface key on which create sub-interface. @@ -33,13 +33,13 @@ | | ... | - OUTER_VLAN_ID - Outer VLAN ID. | | ... | - INNER_VLAN_ID - Inner VLAN ID. | | ... | - TYPE_SUBIF - Type of sub-interface. -| | ... +| | | | ... | _Set testcase variables with name and index of created interfaces:_ | | ... | - subif_name_1 | | ... | - subif_index_1 | | ... | - subif_name_2 | | ... | - subif_index_2 -| | ... +| | | | Set Interface State | ${DUT1} | ${INT1} | up | | Set Interface State | ${DUT2} | ${INT2} | up | | ${INT1_name}= | Get interface name | ${DUT1} | ${INT1} @@ -61,26 +61,26 @@ | | [Arguments] | ${DUT1} | ${INT1} | ${DUT2}=${None} | ${INT2}=${None} | | ... | ${SUB_ID}=10 | | [Documentation] | Create two dot1q subinterfaces on DUTs. -| | ... +| | | | ... | *Arguments:* | | ... | - DUT1 - Node to add sub-interface. | | ... | - INT1 - Interface key on which create VLAN sub-interface. | | ... | - DUT2 - Node to add sub-interface. | | ... | - INT2 - Interface key on which create VLAN sub-interface. | | ... | - SUB_ID - ID of the sub-interface to be created. -| | ... +| | | | ... | _Set testcase variables with name and index of created interfaces:_ | | ... | - subif_name_1 | | ... | - subif_index_1 | | ... | - subif_name_2 | | ... | - subif_index_2 -| | ... +| | | | ... | *Example:* -| | ... +| | | | ... | \| Initialize VLAN dot1q sub-interfaces in circular topology \ | | ... | \| ${nodes['DUT1']} \| ${dut1_if2} \| ${nodes['DUT2']} \ | | ... | \| ${dut1_if2} \| 10 \| -| | ... +| | | | Set Interface State | ${DUT1} | ${INT1} | up | | Run Keyword Unless | ${DUT2} == ${None} | | ... | Set Interface State | ${DUT2} | ${INT2} | up @@ -106,21 +106,21 @@ | | [Arguments] | ${DUT1} | ${SUB_INT1} | ${DUT2}=${None} | ${SUB_INT2}=${None} | | ... | ${TAG_REWRITE_METHOD}=${None} | | [Documentation] | Setup tag rewrite on sub-interfaces on DUTs. -| | ... +| | | | ... | *Arguments:* | | ... | - DUT1 - Node to rewrite tags. | | ... | - SUB_INT1 - Interface on which rewrite tags. | | ... | - DUT2 - Node to rewrite tags. | | ... | - SUB_INT2 - Interface on which rewrite tags. | | ... | - TAG_REWRITE_METHOD - Method of tag rewrite. -| | ... +| | | | L2 Vlan tag rewrite | ${DUT1} | ${SUB_INT1} | ${TAG_REWRITE_METHOD} | | Run Keyword Unless | ${DUT2} == ${None} | | ... | L2 Vlan tag rewrite | ${DUT2} | ${SUB_INT2} | ${TAG_REWRITE_METHOD} | Configure L2 tag rewrite method on interface | | [Documentation] | Set L2 tag rewrite on (sub-)interface on DUT -| | ... +| | | | ... | *Arguments:* | | ... | - dut_node - Node to set L2 tag rewrite method. Type: dictionary | | ... | - interface - (Sub-)interface name or SW index to set L2 tag rewrite @@ -130,22 +130,22 @@ | | ... | Dot1ad (Optional). Type: boolean | | ... | - tag1_id - VLAN tag1 ID (Optional). Type: integer | | ... | - tag2_id - VLAN tag2 ID (Optional). Type: integer -| | ... +| | | | ... | *Return:* -| | ... +| | | | ... | - No value returned -| | ... +| | | | ... | *Example:* -| | ... +| | | | ... | \| Configure L2 tag rewrite method on interface \| ${nodes['DUT1']} \ | | ... | \| 9 \| pop-1 \| | | ... | \| Configure L2 tag rewrite method on interface \| ${nodes['DUT2']} \ | | ... | \| 10 \| translate-1-2 \| push_dot1q=${False} \| tag1_id=10 \ | | ... | \| tag1_id=20 \| -| | ... +| | | | [Arguments] | ${dut_node} | ${interface} | ${tag_rewrite_method} | | ... | ${push_dot1q}=${True} | ${tag1_id}=${None} | ${tag2_id}=${None} -| | ... +| | | | ${result}= | Evaluate | isinstance($interface, int) | | ${interface_name}= | Run Keyword If | ${result} | | ... | Set Variable | ${interface} |