X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=resources%2Flibraries%2Frobot%2Fl2%2Fl2_bridge_domain.robot;h=00044e1253c3713a01c5510050daf1211759c555;hb=6e862ec7b63e177b9b0103612848b3377271729b;hp=bb533e3e0582d373ecc7f24aa7ce4d0cef28d91f;hpb=14a71b74b414df7616ccb5ada3d50ecb90d96bae;p=csit.git

diff --git a/resources/libraries/robot/l2/l2_bridge_domain.robot b/resources/libraries/robot/l2/l2_bridge_domain.robot
index bb533e3e05..00044e1253 100644
--- a/resources/libraries/robot/l2/l2_bridge_domain.robot
+++ b/resources/libraries/robot/l2/l2_bridge_domain.robot
@@ -1,4 +1,5 @@
-# Copyright (c) 2020 Cisco and/or its affiliates.
+# Copyright (c) 2023 Cisco and/or its affiliates.
+# Copyright (c) 2023 PANTHEON.tech and/or its affiliates.
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at:
@@ -100,6 +101,8 @@
 | | ... | - dut - DUT node. Type: string
 | | ... | - nf_chain - NF chain. Type: integer
 | | ... | - nf_nodes - Number of NFs nodes per chain. Type: integer
+| | ... | - virtio_feature_mask - Enabled Virtio features (Optional).
+| | ... | Type: integer
 | |
 | | ... | *Note:*
 | | ... | Socket paths for VM are defined in following format:
@@ -112,6 +115,7 @@
 | | ... | \| 1 \| 1 \|
 | |
 | | [Arguments] | ${dut} | ${nf_chain}=${1} | ${nf_nodes}=${1}
+| | ... | ${virtio_feature_mask}=${None}
 | |
 | | ${bd_id1}= | Evaluate | ${nf_nodes} * (${nf_chain} - 1) + ${nf_chain}
 | | ${bd_id2}= | Evaluate | ${nf_nodes} * ${nf_chain} + ${nf_chain}
@@ -127,6 +131,7 @@
 | | | ... | ${nodes['${dut}']}
 | | | ... | /var/run/vpp/sock-${qemu_id}-1 | /var/run/vpp/sock-${qemu_id}-2
 | | | ... | ${dut}-vhost-${qemu_id}-if1 | ${dut}-vhost-${qemu_id}-if2
+| | | ... | virtio_feature_mask=${virtio_feature_mask}
 | | | ${bd_id1}= | Evaluate | ${qemu_id} + (${nf_chain} - 1)
 | | | ${bd_id2}= | Evaluate | ${bd_id1} + 1
 | | | Add interface to bridge domain
@@ -145,16 +150,20 @@
 | | ... | *Arguments:*
 | | ... | - nf_chain - NF chain. Type: integer
 | | ... | - nf_nodes - Number of NFs nodes per chain. Type: integer
+| | ... | - virtio_feature_mask - Enabled Virtio features (Optional).
+| | ... | Type: integer
 | |
 | | ... | *Example:*
 | |
 | | ... | \| Initialize L2 bridge domains with Vhost-User \| 1 \| 1 \|
 | |
 | | [Arguments] | ${nf_chain}=${1} | ${nf_nodes}=${1}
+| | ... | ${virtio_feature_mask}=${None}
 | |
 | | FOR | ${dut} | IN | @{duts}
 | | | Initialize L2 bridge domains with Vhost-User on node
 | | | ... | ${dut} | nf_chain=${nf_chain} | nf_nodes=${nf_nodes}
+| | | ... | virtio_feature_mask=${virtio_feature_mask}
 | | END
 
 | Initialize L2 bridge domains for multiple chains with Vhost-User
@@ -170,6 +179,8 @@
 | | ... | - nf_nodes - Number of NFs nodes per chain. Type: integer
 | | ... | - start - Id of first chain, allows to add chains during test.
 | | ... |     Type: integer
+| | ... | - virtio_feature_mask - Enabled Virtio features (Optional).
+| | ... | Type: integer
 | |
 | | ... | *Example:*
 | |
@@ -177,11 +188,13 @@
 | | ... | \| 3 \| 1 \| 2 \|
 | |
 | | [Arguments] | ${nf_chains}=${1} | ${nf_nodes}=${1} | ${start}=${1}
+| | ... | ${virtio_feature_mask}=${None}
 | |
 | | Set interfaces in path up
 | | FOR | ${nf_chain} | IN RANGE | ${start} | ${nf_chains} + 1
 | | | Initialize L2 bridge domains with Vhost-User
 | | | ... | nf_chain=${nf_chain} | nf_nodes=${nf_nodes}
+| | | ... | virtio_feature_mask=${virtio_feature_mask}
 | | END
 
 | Initialize L2 bridge domain with VXLANoIPv4 in 3-node circular topology
@@ -281,13 +294,15 @@
 | | ... | *Arguments:*
 | | ... | - bd_id1 - Bridge domain ID. Type: integer
 | | ... | - bd_id2 - Bridge domain ID. Type: integer
+| | ... | - virtio_feature_mask - Enabled Virtio features (Optional).
+| | ... | 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}
+| | [Arguments] | ${bd_id1} | ${bd_id2} | ${virtio_feature_mask}=${None}
 | |
 | | VPP Interface Set IP Address
 | | ... | ${dut1} | ${DUT1_${int}2}[0] | 172.16.0.1 | 24
@@ -300,6 +315,7 @@
 | | ... | ${dut2} | 24 | 172.16.0.2 | 172.16.0.1
 | | Configure vhost interfaces | ${dut1}
 | | ... | /var/run/vpp/sock-1-${bd_id1} | /var/run/vpp/sock-1-${bd_id2}
+| | ... | virtio_feature_mask=${virtio_feature_mask}
 | | Add interface to bridge domain
 | | ... | ${dut1} | ${DUT1_${int}1}[0] | ${bd_id1}
 | | Add interface to bridge domain
@@ -310,6 +326,7 @@
 | | ... | ${dut1} | ${dut1s_vxlan} | ${bd_id2}
 | | Configure vhost interfaces | ${dut2}
 | | ... | /var/run/vpp/sock-1-${bd_id1} | /var/run/vpp/sock-1-${bd_id2}
+| | ... | virtio_feature_mask=${virtio_feature_mask}
 | | Add interface to bridge domain
 | | ... | ${dut2} | ${dut2s_vxlan} | ${bd_id1}
 | | Add interface to bridge domain
@@ -387,6 +404,8 @@
 | | ... | - 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
+| | ... | - virtio_feature_mask - Enabled Virtio features (Optional).
+| | ... | Type: integer
 | |
 | | ... | *Example:*
 | |
@@ -394,6 +413,7 @@
 | | ... | topology \| 1 \| 2 \| 10 \| pop-1 \|
 | |
 | | [Arguments] | ${bd_id1} | ${bd_id2} | ${subid} | ${tag_rewrite}
+| | ... | ${virtio_feature_mask}=${None}
 | |
 | | ${dut2_status} | ${value}= | Run Keyword And Ignore Error
 | | ... | Variable Should Exist | ${dut2}
@@ -414,6 +434,7 @@
 | | ... | ${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}
+| | ... | virtio_feature_mask=${virtio_feature_mask}
 | | Add interface to bridge domain
 | | ... | ${dut1} | ${DUT1_${int}1}[0] | ${bd_id1}
 | | Add interface to bridge domain
@@ -425,6 +446,7 @@
 | | Run Keyword If | '${dut2_status}' == 'PASS'
 | | ... | Configure vhost interfaces | ${dut2}
 | | ... | /var/run/vpp/sock-1-${bd_id1} | /var/run/vpp/sock-1-${bd_id2}
+| | ... | virtio_feature_mask=${virtio_feature_mask}
 | | Run Keyword If | '${dut2_status}' == 'PASS'
 | | ... | Add interface to bridge domain | ${dut2} | ${subif_index_2}
 | | ... | ${bd_id1}
@@ -439,13 +461,13 @@
 | Initialize L2 bridge domains with Vhost-User and VLAN with VPP link bonding in a 3-node circular topology
 | | [Documentation]
 | | ... | Create two Vhost-User interfaces on all defined VPP nodes. Create one
-| | ... | link bonding (BondEthernet) interface on both VPP nodes. Enslave one
-| | ... | physical interface towards next DUT by BondEthernet interface. Setup
-| | ... | VLAN on BondEthernet interfaces between DUTs. Add one Vhost-User
-| | ... | interface into L2 bridge domains with learning enabled with physical
-| | ... | interface towards TG and other Vhost-User interface into L2 bridge
-| | ... | domains with learning enabled with VLAN sub-interface. All interfaces
-| | ... | are brought up.
+| | ... | link bonding (BondEthernet) interface on both VPP nodes. Add one
+| | ... | physical interface towards next DUT as a member of BondEthernet
+| | ... | interface. Setup VLAN on BondEthernet interfaces between DUTs. Add one
+| | ... | Vhost-User interface into L2 bridge domains with learning enabled with
+| | ... | physical 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
@@ -454,6 +476,8 @@
 | | ... | - tag_rewrite - Method of tag rewrite. Type: string
 | | ... | - bond_mode - Link bonding mode. Type: string
 | | ... | - lb_mode - Load balance mode. Type: string
+| | ... | - virtio_feature_mask - Enabled Virtio features (Optional).
+| | ... | Type: integer
 | |
 | | ... | *Example:*
 | |
@@ -462,27 +486,23 @@
 | | ... | \| 10 \| pop-1 \| xor \| l34 \|
 | |
 | | [Arguments] | ${bd_id1} | ${bd_id2} | ${subid} | ${tag_rewrite}
-| | ... | ${bond_mode} | ${lb_mode}
+| | ... | ${bond_mode} | ${lb_mode} | ${virtio_feature_mask}=${None}
 | |
 | | Set interfaces in path up
 | | ${dut1_eth_bond_if1}= | VPP Create Bond Interface
 | | ... | ${dut1} | ${bond_mode} | ${lb_mode}
-| | Set Interface State | ${dut1} | ${dut1_eth_bond_if1} | up
-| | VPP Set interface MTU | ${dut1} | ${dut1_eth_bond_if1}
 | | FOR | ${pf} | IN RANGE | 1 | ${nic_pfs} + 1
 | | | ${_even}= | Evaluate | ${pf} % 2
-| | | Run Keyword Unless | ${even}
-| | | ... | VPP Enslave Physical Interface
+| | | Run Keyword If | not ${even}
+| | | ... | VPP Add Bond Member
 | | | ... | ${dut1} | ${DUT1_${int}${pf}}[0] | ${dut1_eth_bond_if1}
 | | END
 | | ${dut2_eth_bond_if1}= | VPP Create Bond Interface
 | | ... | ${dut2} | ${bond_mode} | ${lb_mode}
-| | Set Interface State | ${dut2} | ${dut2_eth_bond_if1} | up
-| | VPP Set interface MTU | ${dut2} | ${dut2_eth_bond_if1}
 | | FOR | ${pf} | IN RANGE | 1 | ${nic_pfs} + 1
 | | | ${_even}= | Evaluate | ${pf} % 2
 | | | Run Keyword If | ${even}
-| | | ... | VPP Enslave Physical Interface
+| | | ... | VPP Add Bond Member
 | | | ... | ${dut2} | ${DUT2_${int}${pf}}[0] | ${dut2_eth_bond_if1}
 | | END
 | | VPP Show Bond Data On All Nodes | ${nodes} | verbose=${TRUE}
@@ -494,6 +514,7 @@
 | | ... | ${dut2} | ${subif_index_2} | ${tag_rewrite}
 | | Configure vhost interfaces | ${dut1}
 | | ... | /var/run/vpp/sock-1-${bd_id1} | /var/run/vpp/sock-1-${bd_id2}
+| | ... | virtio_feature_mask=${virtio_feature_mask}
 | | Add interface to bridge domain
 | | ... | ${dut1} | ${DUT1_${int}1}[0] | ${bd_id1}
 | | Add interface to bridge domain
@@ -504,6 +525,7 @@
 | | ... | ${dut1} | ${subif_index_1} | ${bd_id2}
 | | Configure vhost interfaces | ${dut2}
 | | ... | /var/run/vpp/sock-1-${bd_id1} | /var/run/vpp/sock-1-${bd_id2}
+| | ... | virtio_feature_mask=${virtio_feature_mask}
 | | Add interface to bridge domain
 | | ... | ${dut2} | ${subif_index_2} | ${bd_id1}
 | | Add interface to bridge domain
@@ -570,6 +592,9 @@
 | | ... | Memif interface to separate L2 bridge domain with one physical or
 | | ... | virtual interface to create a chain accross DUT node.
 | |
+| | ... | This keyword does not wait for memifs to go up.
+| | ... | Use the "for multiple chains" keyword for that functionality.
+| |
 | | ... | *Arguments:*
 | | ... | - nf_chain - NF chain. Type: integer
 | | ... | - nf_nodes - Number of NFs nodes per chain. Type: integer
@@ -775,6 +800,7 @@
 | | ... | Add interface to bridge domain
 | | ... | ${dut2} | ${DUT2_${int}2}[0] | ${bd_id2}
 | |
+| | Set interfaces in path up
 | | Show Memif on all DUTs | ${nodes}
 | | VPP round robin RX placement on all DUTs | ${nodes} | prefix=memif
 
@@ -813,7 +839,7 @@
 | | Set single interfaces in path up
 | | Show Memif on all DUTs | ${nodes}
 
-| Initialize L2 bridge domain with MACIP ACLs on DUT1 in 3-node circular topology
+| Initialize L2 bridge domain with MACIP ACLs in circular topology
 | | [Documentation]
 | | ... | Setup L2BD topology by adding two interfaces on DUT1 into bridge
 | | ... | domain that is created automatically with index 1. Learning is
@@ -821,14 +847,16 @@
 | | ... | DUT1 interfaces.
 | |
 | | Set interfaces in path up
+| |
 | | VPP Add L2 Bridge Domain
 | | ... | ${dut1} | ${1} | ${DUT1_${int}1}[0] | ${DUT1_${int}2}[0]
-| | Configure L2XC
-| | ... | ${dut2} | ${DUT2_${int}1}[0] | ${DUT2_${int}2}[0]
 | | Configure MACIP ACLs
 | | ... | ${dut1} | ${DUT1_${int}1}[0] | ${DUT1_${int}2}[0]
+| |
+| | Run Keyword If | ${duts_count} == 2
+| | ... | Configure L2XC | ${dut2} | ${DUT2_${int}1}[0] | ${DUT2_${int}2}[0]
 
-| Initialize L2 bridge domain with IPv4 ACLs on DUT1 in 3-node circular topology
+| Initialize L2 bridge domain with IPv4 ACLs in circular topology
 | | [Documentation]
 | | ... | Setup L2BD topology by adding two interfaces on DUT1 into bridge
 | | ... | domain that is created automatically with index 1. Learning is
@@ -836,9 +864,11 @@
 | | ... | interfaces.
 | |
 | | Set interfaces in path up
+| |
 | | VPP Add L2 Bridge Domain
 | | ... | ${dut1} | ${1} | ${DUT1_${int}1}[0] | ${DUT1_${int}2}[0]
-| | Configure L2XC
-| | ... | ${dut2} | ${DUT2_${int}1}[0] | ${DUT2_${int}2}[0]
 | | Configure IPv4 ACLs
 | | ... | ${dut1} | ${DUT1_${int}1}[0] | ${DUT1_${int}2}[0]
+| |
+| | Run Keyword If | ${duts_count} == 2
+| | ... | Configure L2XC | ${dut2} | ${DUT2_${int}1}[0] | ${DUT2_${int}2}[0]